fix imported file tab name

tronprotocol · Oct 8, 2018 · b8801ee · b8801ee
1 parent e3ee5af
commit b8801ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/org/tron/studio/MainController.java b/src/main/java/org/tron/studio/MainController.java
@@ -99,8 +99,10 @@ public void initialize() throws IOException {
             boolean alreadyOpen = false;
             for (Tab tab : codeAreaTabPane.getTabs()) {
                 if (StringUtils.equals(tab.getText(), currentContractName)) {
+                    System.out.println(tab.getText());
                     codeAreaTabPane.getSelectionModel().select(tab);
                     alreadyOpen = true;
+                    break;
                 }
             }
             if (!alreadyOpen) {
@@ -115,11 +117,11 @@ public void initialize() throws IOException {
         ShareData.openContractFileName.addListener((observable, oldValue, newValue) ->{
             String filePath = ShareData.openContractFileName.get();
             File newFile = new File(filePath);
-
+            System.out.println(filePath);
             Tab newTab = setTab(newFile);
             newTab.setClosable(true);
-            ShareData.currentContractName.set(newFile.getName());
-            ShareData.allContractFileName.add(newFile.getName());
+//            ShareData.currentContractName.set(filePath);
+//            ShareData.allContractFileName.add(filePath);
             codeAreaTabPane.getSelectionModel().select(newTab);
         });
 
@@ -152,7 +154,7 @@ private Tab setTab(File file) {
         AutoCompletion autoCompletion = new AutoCompletion(codeArea);
         autoCompletion.autoComplete(codeArea);
 
-        codeTab.setText(file.getName());
+        codeTab.setText(file.getPath());
         //Just not allow to close the default tab
         codeTab.setClosable(true);
 
@@ -171,8 +173,8 @@ private Tab setTab(File file) {
 
         new FormatCode(codeArea);
 
-        ShareData.allContractFileName.add(file.getName());
-        ShareData.currentContractName.set(file.getName());
+        ShareData.allContractFileName.add(file.getPath());
+        ShareData.currentContractName.set(file.getPath());
         ShareData.currentContractTab = codeTab;
 
         return codeTab;

diff --git a/src/main/java/org/tron/studio/ui/LeftCodeListController.java b/src/main/java/org/tron/studio/ui/LeftCodeListController.java
@@ -215,7 +215,7 @@ private void saveContractContent() {
 
     private void openFile(File file) {
         try {
-            ShareData.newContractFileName.set(file.getPath());
+            ShareData.openContractFileName.set(file.getPath());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -230,7 +230,7 @@ public void openContract(MouseEvent mouseEvent) {
 //            fileName = SolidityFileUtil.formatFileName(fileName);
 //            SolidityFileUtil.createNewFile(fileName);
 //            ShareData.newContractFileName.set(fileName);
-            ShareData.allContractFileName.get().add(file.getPath());
+//            ShareData.allContractFileName.get().add(file.getPath());
 //            ShareData.currentContractName.set(file.getPath());
         }
     }