Skip to content

Commit dc80db3

Browse files
committed
fix update i18n error.
1 parent 8b98e4d commit dc80db3

File tree

3 files changed

+29
-14
lines changed

3 files changed

+29
-14
lines changed

src/main/java/models/CommandLineTableModel.java

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@
88
import java.util.ArrayList;
99
import java.util.List;
1010

11-
import static utils.GlobalStaticVariables.COMMANDLINE_TABLE_MODEL_COLUMNS_NAME;
11+
import static utils.GlobalStaticVariables.EX_MSG;
1212

1313
public class CommandLineTableModel extends AbstractTableModel {
1414
List<OptionsCommandLine> optionsCommandLineList = new ArrayList<>();
1515
static final int STATIC_COLUMN_COUNT = 4;
1616

17+
private static String[] commandlineColumnsName = new String[]{EX_MSG.getMsg("index"),
18+
EX_MSG.getMsg("wasDefault"), EX_MSG.getMsg("tag"),
19+
EX_MSG.getMsg("commandLine")};
20+
1721
public void setScanTaskArgsList(List<OptionsCommandLine> optionsCommandLineList) {
1822
this.optionsCommandLineList = optionsCommandLineList;
1923
}
@@ -55,7 +59,7 @@ public String getColumnName(int column) {
5559
return null;
5660
}
5761

58-
return COMMANDLINE_TABLE_MODEL_COLUMNS_NAME[column];
62+
return commandlineColumnsName[column];
5963
}
6064

6165
@Override
@@ -201,4 +205,16 @@ public boolean isTagExist(String tagStr) {
201205
}
202206

203207

208+
public void updateI18n() {
209+
commandlineColumnsName = new String[]{
210+
EX_MSG.getMsg("index"),
211+
EX_MSG.getMsg("wasDefault"),
212+
EX_MSG.getMsg("tag"),
213+
EX_MSG.getMsg("commandLine")};
214+
215+
SwingUtilities.invokeLater(() -> {
216+
fireTableStructureChanged();
217+
});
218+
}
219+
204220
}

src/main/java/ui/panel/subPanel/CommandLineManagerPanel.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,15 @@ public void mouseClicked(MouseEvent e) {
307307
}
308308

309309

310+
if (null == optionsCommandLine0) {
311+
return;
312+
}
313+
314+
Boolean tmp = optionsCommandLine0.getWasDefault();
315+
if (null == tmp) {
316+
return;
317+
}
318+
310319
if (Boolean.FALSE.equals(optionsCommandLine0.getWasDefault())) {
311320
int cnt = 0;
312321
for (int i = 0; i < tableModel.getRowCount(); i++) {
@@ -403,13 +412,7 @@ private void actionPerformed(ActionEvent e) {
403412

404413
public void updateI18n(MessageUtil messageUtil) {
405414
// todo reset table columns name or we say headers name
406-
GlobalStaticVariables.COMMANDLINE_TABLE_MODEL_COLUMNS_NAME = new String[]{EX_MSG.getMsg("index"),
407-
EX_MSG.getMsg("wasDefault"), EX_MSG.getMsg("tag"),
408-
EX_MSG.getMsg("commandLine")};
409-
410-
SwingUtilities.invokeLater(() -> {
411-
tableModel.fireTableStructureChanged();
412-
});
415+
tableModel.updateI18n();
413416

414417

415418
tagLabel.setText(messageUtil.getMsg("tag"));

src/main/java/utils/GlobalStaticVariables.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,14 @@ public class GlobalStaticVariables {
4646
public static String DEFAULT_COMMAND_LINE_STR = "-threads 5"; // default_command_line_str
4747
public static MessageUtil EX_MSG = new MessageUtil();
4848

49-
public static String[] COMMANDLINE_TABLE_MODEL_COLUMNS_NAME = new String[]{EX_MSG.getMsg("index"),
50-
EX_MSG.getMsg("wasDefault"), EX_MSG.getMsg("tag"),
51-
EX_MSG.getMsg("commandLine")};
52-
5349
static {
5450
STR_TO_SCAN_TASK_STATUS_MAP.put("not running", ScanTaskStatus.NOT_STARTED);
5551
STR_TO_SCAN_TASK_STATUS_MAP.put("running", ScanTaskStatus.RUNNING);
5652
STR_TO_SCAN_TASK_STATUS_MAP.put("terminated", ScanTaskStatus.FINISHED);
5753

5854
STR_TO_SCAN_TASK_STATUS_MAP.put("stopped", ScanTaskStatus.STOPPED);
5955
STR_TO_SCAN_TASK_STATUS_MAP.put("killed", ScanTaskStatus.KILLED);
60-
STR_TO_SCAN_TASK_STATUS_MAP.put("unkonwError", ScanTaskStatus.ERROR);
56+
STR_TO_SCAN_TASK_STATUS_MAP.put("unknownError", ScanTaskStatus.ERROR);
6157

6258
// SCAN_OPTIONS = new Options();
6359

0 commit comments

Comments
 (0)