Skip to content
This repository was archived by the owner on Jun 11, 2019. It is now read-only.

Commit b8801ee

Browse files
committed
fix imported file tab name
1 parent e3ee5af commit b8801ee

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

src/main/java/org/tron/studio/MainController.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ public void initialize() throws IOException {
9999
boolean alreadyOpen = false;
100100
for (Tab tab : codeAreaTabPane.getTabs()) {
101101
if (StringUtils.equals(tab.getText(), currentContractName)) {
102+
System.out.println(tab.getText());
102103
codeAreaTabPane.getSelectionModel().select(tab);
103104
alreadyOpen = true;
105+
break;
104106
}
105107
}
106108
if (!alreadyOpen) {
@@ -115,11 +117,11 @@ public void initialize() throws IOException {
115117
ShareData.openContractFileName.addListener((observable, oldValue, newValue) ->{
116118
String filePath = ShareData.openContractFileName.get();
117119
File newFile = new File(filePath);
118-
120+
System.out.println(filePath);
119121
Tab newTab = setTab(newFile);
120122
newTab.setClosable(true);
121-
ShareData.currentContractName.set(newFile.getName());
122-
ShareData.allContractFileName.add(newFile.getName());
123+
// ShareData.currentContractName.set(filePath);
124+
// ShareData.allContractFileName.add(filePath);
123125
codeAreaTabPane.getSelectionModel().select(newTab);
124126
});
125127

@@ -152,7 +154,7 @@ private Tab setTab(File file) {
152154
AutoCompletion autoCompletion = new AutoCompletion(codeArea);
153155
autoCompletion.autoComplete(codeArea);
154156

155-
codeTab.setText(file.getName());
157+
codeTab.setText(file.getPath());
156158
//Just not allow to close the default tab
157159
codeTab.setClosable(true);
158160

@@ -171,8 +173,8 @@ private Tab setTab(File file) {
171173

172174
new FormatCode(codeArea);
173175

174-
ShareData.allContractFileName.add(file.getName());
175-
ShareData.currentContractName.set(file.getName());
176+
ShareData.allContractFileName.add(file.getPath());
177+
ShareData.currentContractName.set(file.getPath());
176178
ShareData.currentContractTab = codeTab;
177179

178180
return codeTab;

src/main/java/org/tron/studio/ui/LeftCodeListController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ private void saveContractContent() {
215215

216216
private void openFile(File file) {
217217
try {
218-
ShareData.newContractFileName.set(file.getPath());
218+
ShareData.openContractFileName.set(file.getPath());
219219
} catch (Exception e) {
220220
e.printStackTrace();
221221
}
@@ -230,7 +230,7 @@ public void openContract(MouseEvent mouseEvent) {
230230
// fileName = SolidityFileUtil.formatFileName(fileName);
231231
// SolidityFileUtil.createNewFile(fileName);
232232
// ShareData.newContractFileName.set(fileName);
233-
ShareData.allContractFileName.get().add(file.getPath());
233+
// ShareData.allContractFileName.get().add(file.getPath());
234234
// ShareData.currentContractName.set(file.getPath());
235235
}
236236
}

0 commit comments

Comments
 (0)