|
@@ -5,6 +5,7 @@ import java.awt.Color;
|
|
import java.awt.Component;
|
|
import java.awt.Component;
|
|
import java.awt.Cursor;
|
|
import java.awt.Cursor;
|
|
import java.awt.Dimension;
|
|
import java.awt.Dimension;
|
|
|
|
+import java.awt.Graphics;
|
|
import java.awt.Image;
|
|
import java.awt.Image;
|
|
import java.awt.Point;
|
|
import java.awt.Point;
|
|
import java.awt.Toolkit;
|
|
import java.awt.Toolkit;
|
|
@@ -24,6 +25,7 @@ import javax.swing.AbstractAction;
|
|
import javax.swing.ActionMap;
|
|
import javax.swing.ActionMap;
|
|
import javax.swing.BoxLayout;
|
|
import javax.swing.BoxLayout;
|
|
import javax.swing.DefaultComboBoxModel;
|
|
import javax.swing.DefaultComboBoxModel;
|
|
|
|
+import javax.swing.Icon;
|
|
import javax.swing.ImageIcon;
|
|
import javax.swing.ImageIcon;
|
|
import javax.swing.InputMap;
|
|
import javax.swing.InputMap;
|
|
import javax.swing.JButton;
|
|
import javax.swing.JButton;
|
|
@@ -200,7 +202,7 @@ public class GUI<E> implements CategoryListener {
|
|
private final JToolBar toolBarHolonEl = new JToolBar();
|
|
private final JToolBar toolBarHolonEl = new JToolBar();
|
|
private final JToolBar toolBarGraph = new JToolBar();
|
|
private final JToolBar toolBarGraph = new JToolBar();
|
|
|
|
|
|
- private final Languages languages = new Languages();
|
|
|
|
|
|
+ // private final Languages languages = new Languages();
|
|
|
|
|
|
// Languages
|
|
// Languages
|
|
private final JMenuItem englishBtn = new JMenuItem("EN");
|
|
private final JMenuItem englishBtn = new JMenuItem("EN");
|
|
@@ -245,6 +247,11 @@ public class GUI<E> implements CategoryListener {
|
|
private String[] columnNamesMulti = { "Object", "Nr.", "Device", "Energy", "Quantity", "Activated" };
|
|
private String[] columnNamesMulti = { "Object", "Nr.", "Device", "Energy", "Quantity", "Activated" };
|
|
private String[] columnNamesSingle = { "Nr.", "Device", "Energy", "Quantity", "Activated" };
|
|
private String[] columnNamesSingle = { "Nr.", "Device", "Energy", "Quantity", "Activated" };
|
|
private String[] colNames = { "Field", "Information" };
|
|
private String[] colNames = { "Field", "Information" };
|
|
|
|
+ private String[] comboBoxCat = { "Category", "Object", "Switch" };
|
|
|
|
+ private String warningText = "Warning";
|
|
|
|
+ private String saveBeforeNew = "Do you want to save your current data?";
|
|
|
|
+ private String eraseCategory = "Do you really want to delete the Category ";
|
|
|
|
+ private String selectObjBeforeErase = "Please select a Category or an Object in order to delete something.";
|
|
|
|
|
|
/**
|
|
/**
|
|
* Create the application.
|
|
* Create the application.
|
|
@@ -472,10 +479,13 @@ public class GUI<E> implements CategoryListener {
|
|
mnNewMenuEdit.add(mntmUndo);
|
|
mnNewMenuEdit.add(mntmUndo);
|
|
|
|
|
|
mnNewMenuEdit.add(mntmRedo);
|
|
mnNewMenuEdit.add(mntmRedo);
|
|
|
|
+
|
|
mnLanguage.add(englishBtn);
|
|
mnLanguage.add(englishBtn);
|
|
mnLanguage.add(spanishBtn);
|
|
mnLanguage.add(spanishBtn);
|
|
mnLanguage.add(germanBtn);
|
|
mnLanguage.add(germanBtn);
|
|
mnLanguage.add(czechBtn);
|
|
mnLanguage.add(czechBtn);
|
|
|
|
+ mnLanguage.add(chineseBtn);
|
|
|
|
+
|
|
mntmFindReplace.addActionListener(new ActionListener() {
|
|
mntmFindReplace.addActionListener(new ActionListener() {
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
try {
|
|
try {
|
|
@@ -722,7 +732,7 @@ public class GUI<E> implements CategoryListener {
|
|
unitGraph.repaintWithNewElement(selectedElements);
|
|
unitGraph.repaintWithNewElement(selectedElements);
|
|
} // If any empty space is clicked
|
|
} // If any empty space is clicked
|
|
else {
|
|
else {
|
|
- elementGraph.setText("None ");
|
|
|
|
|
|
+ elementGraph.setText(Languages.getLanguage()[25]);
|
|
unitGraph.empty();
|
|
unitGraph.empty();
|
|
}
|
|
}
|
|
// if any HolonElement is double-clicked --> Edit-Mode started
|
|
// if any HolonElement is double-clicked --> Edit-Mode started
|
|
@@ -734,7 +744,7 @@ public class GUI<E> implements CategoryListener {
|
|
// for single click and empty slot
|
|
// for single click and empty slot
|
|
if (e.getClickCount() == 1 && ele == null) {
|
|
if (e.getClickCount() == 1 && ele == null) {
|
|
selectedElements.clear();
|
|
selectedElements.clear();
|
|
- holonEleNamesDisplayed = "None ";
|
|
|
|
|
|
+ holonEleNamesDisplayed = Languages.getLanguage()[25];
|
|
}
|
|
}
|
|
elementGraph.setText(holonEleNamesDisplayed);
|
|
elementGraph.setText(holonEleNamesDisplayed);
|
|
yBTis = e.getY();
|
|
yBTis = e.getY();
|
|
@@ -1077,8 +1087,8 @@ public class GUI<E> implements CategoryListener {
|
|
|
|
|
|
panel.add(toolBar);
|
|
panel.add(toolBar);
|
|
toolBar.add(comboBox);
|
|
toolBar.add(comboBox);
|
|
- comboBox.setModel(new DefaultComboBoxModel(new String[] { "Category", "Object", "Switch" }));
|
|
|
|
- // Add Button
|
|
|
|
|
|
+ comboBox.setModel(new DefaultComboBoxModel(comboBoxCat));
|
|
|
|
+ // Add Buttonnew DefaultComboBoxModel(comboBoxCat)
|
|
btnAdd.addActionListener(new ActionListener() {
|
|
btnAdd.addActionListener(new ActionListener() {
|
|
public void actionPerformed(ActionEvent arg0) {
|
|
public void actionPerformed(ActionEvent arg0) {
|
|
|
|
|
|
@@ -1090,7 +1100,7 @@ public class GUI<E> implements CategoryListener {
|
|
switch (selectedOption) {
|
|
switch (selectedOption) {
|
|
|
|
|
|
case "Category":
|
|
case "Category":
|
|
- String catName = JOptionPane.showInputDialog("Please enter a Name for Category ");
|
|
|
|
|
|
+ String catName = JOptionPane.showInputDialog(Languages.getLanguage()[56]);
|
|
if (catName.length() != 0) {
|
|
if (catName.length() != 0) {
|
|
controller.addCategory(catName);
|
|
controller.addCategory(catName);
|
|
}
|
|
}
|
|
@@ -1098,7 +1108,7 @@ public class GUI<E> implements CategoryListener {
|
|
case "Object":
|
|
case "Object":
|
|
if (selectedNode == null) {
|
|
if (selectedNode == null) {
|
|
JOptionPane.showMessageDialog(new JFrame(),
|
|
JOptionPane.showMessageDialog(new JFrame(),
|
|
- "Please select a Category first before adding " + selectedOption + ".");
|
|
|
|
|
|
+ Languages.getLanguage()[57] + selectedOption + ".");
|
|
}
|
|
}
|
|
if (selectedNode.getLevel() == 1) {
|
|
if (selectedNode.getLevel() == 1) {
|
|
AbstractCpsObject tmp = new HolonObject("");
|
|
AbstractCpsObject tmp = new HolonObject("");
|
|
@@ -1142,11 +1152,11 @@ public class GUI<E> implements CategoryListener {
|
|
@Override
|
|
@Override
|
|
public void mousePressed(MouseEvent e) {
|
|
public void mousePressed(MouseEvent e) {
|
|
selectedElements.clear();
|
|
selectedElements.clear();
|
|
- holonEleNamesDisplayed = "None ";
|
|
|
|
|
|
+ holonEleNamesDisplayed = Languages.getLanguage()[25];
|
|
// If any empty space is clicked
|
|
// If any empty space is clicked
|
|
if (temp == null || temp.getID() != model.getSelectedObjectID()) {
|
|
if (temp == null || temp.getID() != model.getSelectedObjectID()) {
|
|
unitGraph.empty();
|
|
unitGraph.empty();
|
|
- elementGraph.setText("None ");
|
|
|
|
|
|
+ elementGraph.setText(Languages.getLanguage()[25]);
|
|
}
|
|
}
|
|
temp = getActualCps();
|
|
temp = getActualCps();
|
|
// Erase old data in the PropertyTable
|
|
// Erase old data in the PropertyTable
|
|
@@ -1165,7 +1175,7 @@ public class GUI<E> implements CategoryListener {
|
|
// Write new data in the PropertyTable
|
|
// Write new data in the PropertyTable
|
|
if (temp != null) {
|
|
if (temp != null) {
|
|
// Name of the CpsObject
|
|
// Name of the CpsObject
|
|
- Object[] tempName = { "Name", temp.getName() };
|
|
|
|
|
|
+ Object[] tempName = { Languages.getLanguage()[72], temp.getName() };
|
|
tableModelProperties.addRow(tempName);
|
|
tableModelProperties.addRow(tempName);
|
|
// Id of the CpsObject
|
|
// Id of the CpsObject
|
|
Object[] tempId = { "ID", temp.getID() };
|
|
Object[] tempId = { "ID", temp.getID() };
|
|
@@ -1174,7 +1184,7 @@ public class GUI<E> implements CategoryListener {
|
|
// consumption) is calculated
|
|
// consumption) is calculated
|
|
if (temp instanceof HolonObject) {
|
|
if (temp instanceof HolonObject) {
|
|
refreshTableHolonElement();
|
|
refreshTableHolonElement();
|
|
- Object[] tempEnergy = { "Total Energy", ((HolonObject) temp).getCurrentEnergy() };
|
|
|
|
|
|
+ Object[] tempEnergy = { Languages.getLanguage()[73], ((HolonObject) temp).getCurrentEnergy() };
|
|
tableModelProperties.addRow(tempEnergy);
|
|
tableModelProperties.addRow(tempEnergy);
|
|
tableModelProperties.setCellEditable(0, 1, true);
|
|
tableModelProperties.setCellEditable(0, 1, true);
|
|
tableModelProperties.setCellEditable(2, 1, false);
|
|
tableModelProperties.setCellEditable(2, 1, false);
|
|
@@ -1184,14 +1194,15 @@ public class GUI<E> implements CategoryListener {
|
|
else if (temp instanceof HolonSwitch) {
|
|
else if (temp instanceof HolonSwitch) {
|
|
deleteRows(tableModelHolonElementSingle);
|
|
deleteRows(tableModelHolonElementSingle);
|
|
deleteRows(tableModelHolonElementMulti);
|
|
deleteRows(tableModelHolonElementMulti);
|
|
- Object[] tempMode = { "Manual", ((HolonSwitch) temp).getManualMode() };
|
|
|
|
|
|
+ Object[] tempMode = { Languages.getLanguage()[74], ((HolonSwitch) temp).getManualMode() };
|
|
tableModelProperties.addRow(tempMode);
|
|
tableModelProperties.addRow(tempMode);
|
|
if (((HolonSwitch) temp).getManualMode()) {
|
|
if (((HolonSwitch) temp).getManualMode()) {
|
|
- Object[] tempActive = { "Active", ((HolonSwitch) temp).getActiveManual() };
|
|
|
|
|
|
+ Object[] tempActive = { Languages.getLanguage()[75],
|
|
|
|
+ ((HolonSwitch) temp).getActiveManual() };
|
|
tableModelProperties.addRow(tempActive);
|
|
tableModelProperties.addRow(tempActive);
|
|
tableModelProperties.setCellEditable(3, 1, true);
|
|
tableModelProperties.setCellEditable(3, 1, true);
|
|
} else {
|
|
} else {
|
|
- Object[] tempActive = { "Active",
|
|
|
|
|
|
+ Object[] tempActive = { Languages.getLanguage()[75],
|
|
((HolonSwitch) temp).getActiveAt()[model.getCurIteration()] };
|
|
((HolonSwitch) temp).getActiveAt()[model.getCurIteration()] };
|
|
tableModelProperties.addRow(tempActive);
|
|
tableModelProperties.addRow(tempActive);
|
|
tableModelProperties.setCellEditable(3, 1, false);
|
|
tableModelProperties.setCellEditable(3, 1, false);
|
|
@@ -1213,22 +1224,24 @@ public class GUI<E> implements CategoryListener {
|
|
if (first) {
|
|
if (first) {
|
|
first = false;
|
|
first = false;
|
|
if (temp.getID() != temp2.getA().getID()) {
|
|
if (temp.getID() != temp2.getA().getID()) {
|
|
- Object[] tempConnection = { temp.getName() + " is connected to",
|
|
|
|
- temp2.getA().getName() + " with ID: " + temp2.getA().getID() };
|
|
|
|
|
|
+ Object[] tempConnection = { temp.getName() + Languages.getLanguage()[76],
|
|
|
|
+ temp2.getA().getName() + Languages.getLanguage()[77]
|
|
|
|
+ + temp2.getA().getID() };
|
|
tableModelProperties.addRow(tempConnection);
|
|
tableModelProperties.addRow(tempConnection);
|
|
} else {
|
|
} else {
|
|
- Object[] tempConnection = { temp.getName() + " is connected to",
|
|
|
|
- temp2.getB().getName() + " with ID: " + temp2.getB().getID() };
|
|
|
|
|
|
+ Object[] tempConnection = { temp.getName() + Languages.getLanguage()[76],
|
|
|
|
+ temp2.getB().getName() + Languages.getLanguage()[77]
|
|
|
|
+ + temp2.getB().getID() };
|
|
tableModelProperties.addRow(tempConnection);
|
|
tableModelProperties.addRow(tempConnection);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if (temp.getID() != temp2.getA().getID()) {
|
|
if (temp.getID() != temp2.getA().getID()) {
|
|
- Object[] tempConnection = { "",
|
|
|
|
- temp2.getA().getName() + " with ID: " + temp2.getA().getID() };
|
|
|
|
|
|
+ Object[] tempConnection = { "", temp2.getA().getName() + Languages.getLanguage()[77]
|
|
|
|
+ + temp2.getA().getID() };
|
|
tableModelProperties.addRow(tempConnection);
|
|
tableModelProperties.addRow(tempConnection);
|
|
} else {
|
|
} else {
|
|
- Object[] tempConnection = { "",
|
|
|
|
- temp2.getB().getName() + " with ID: " + temp2.getB().getID() };
|
|
|
|
|
|
+ Object[] tempConnection = { "", temp2.getB().getName() + Languages.getLanguage()[77]
|
|
|
|
+ + temp2.getB().getID() };
|
|
tableModelProperties.addRow(tempConnection);
|
|
tableModelProperties.addRow(tempConnection);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1237,17 +1250,18 @@ public class GUI<E> implements CategoryListener {
|
|
} // If the clicked Object is an edge
|
|
} // If the clicked Object is an edge
|
|
else if (model.getSelectedEdge() != null) {
|
|
else if (model.getSelectedEdge() != null) {
|
|
// Name displayed
|
|
// Name displayed
|
|
- Object[] tempName = { "Name", "Edge: " + model.getSelectedEdge().getA().getName() + " to "
|
|
|
|
- + model.getSelectedEdge().getB().getName() };
|
|
|
|
|
|
+ Object[] tempName = { Languages.getLanguage()[72],
|
|
|
|
+ Languages.getLanguage()[78] + model.getSelectedEdge().getA().getName()
|
|
|
|
+ + Languages.getLanguage()[79] + model.getSelectedEdge().getB().getName() };
|
|
tableModelProperties.addRow(tempName);
|
|
tableModelProperties.addRow(tempName);
|
|
// Current Flow displayed
|
|
// Current Flow displayed
|
|
- Object[] tempFlow = { "Current flow", model.getSelectedEdge().getFlow() };
|
|
|
|
|
|
+ Object[] tempFlow = { Languages.getLanguage()[80], model.getSelectedEdge().getFlow() };
|
|
tableModelProperties.addRow(tempFlow);
|
|
tableModelProperties.addRow(tempFlow);
|
|
// Max Capacity displayed
|
|
// Max Capacity displayed
|
|
- Object[] tempCapacity = { "Max. Capacity", model.getSelectedEdge().getCapacity() };
|
|
|
|
|
|
+ Object[] tempCapacity = { Languages.getLanguage()[81], model.getSelectedEdge().getCapacity() };
|
|
tableModelProperties.addRow(tempCapacity);
|
|
tableModelProperties.addRow(tempCapacity);
|
|
// Status displayed
|
|
// Status displayed
|
|
- Object[] tempStatus = { "Status", model.getSelectedEdge().getState() };
|
|
|
|
|
|
+ Object[] tempStatus = { Languages.getLanguage()[82], model.getSelectedEdge().getState() };
|
|
tableModelProperties.addRow(tempStatus);
|
|
tableModelProperties.addRow(tempStatus);
|
|
// For edges, the only possible editable cell is the max
|
|
// For edges, the only possible editable cell is the max
|
|
// flow
|
|
// flow
|
|
@@ -1293,9 +1307,8 @@ public class GUI<E> implements CategoryListener {
|
|
|
|
|
|
switch (depthOfNode) {
|
|
switch (depthOfNode) {
|
|
case 1:
|
|
case 1:
|
|
- int dialogResult = JOptionPane.showConfirmDialog(null,
|
|
|
|
- "Do you realy want to delete the Category " + nodeName + "?", "Warning",
|
|
|
|
- JOptionPane.YES_NO_OPTION);
|
|
|
|
|
|
+ int dialogResult = JOptionPane.showConfirmDialog(null, eraseCategory + nodeName + "?",
|
|
|
|
+ warningText, JOptionPane.YES_NO_OPTION);
|
|
if (dialogResult == JOptionPane.YES_OPTION) {
|
|
if (dialogResult == JOptionPane.YES_OPTION) {
|
|
controller.deleteCategory(nodeName);
|
|
controller.deleteCategory(nodeName);
|
|
}
|
|
}
|
|
@@ -1306,12 +1319,10 @@ public class GUI<E> implements CategoryListener {
|
|
break;
|
|
break;
|
|
|
|
|
|
default:
|
|
default:
|
|
- JOptionPane.showMessageDialog(new JFrame(),
|
|
|
|
- "Please select a Category or an Object in order to delete something.");
|
|
|
|
|
|
+ JOptionPane.showMessageDialog(new JFrame(), selectObjBeforeErase);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- JOptionPane.showMessageDialog(new JFrame(),
|
|
|
|
- "Please select a Category or an Object in order to delete something.");
|
|
|
|
|
|
+ JOptionPane.showMessageDialog(new JFrame(), selectObjBeforeErase);
|
|
}
|
|
}
|
|
tree.repaint();
|
|
tree.repaint();
|
|
}
|
|
}
|
|
@@ -1324,13 +1335,22 @@ public class GUI<E> implements CategoryListener {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void actionPerformed(ActionEvent arg0) {
|
|
public void actionPerformed(ActionEvent arg0) {
|
|
|
|
+ if (model.getObjectsOnCanvas().size() != 0) {
|
|
|
|
+ int newWarning = JOptionPane.YES_NO_OPTION;
|
|
|
|
+ int dialogForNewWarning = JOptionPane.showConfirmDialog(null, saveBeforeNew, warningText,
|
|
|
|
+ newWarning);
|
|
|
|
+ if (dialogForNewWarning == JOptionPane.YES_OPTION) {
|
|
|
|
+ mntmSave.doClick();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
model.getEdgesOnCanvas().removeAll(model.getEdgesOnCanvas());
|
|
model.getEdgesOnCanvas().removeAll(model.getEdgesOnCanvas());
|
|
model.getObjectsOnCanvas().removeAll(model.getObjectsOnCanvas());
|
|
model.getObjectsOnCanvas().removeAll(model.getObjectsOnCanvas());
|
|
controller.setSelectedObjectID(0);
|
|
controller.setSelectedObjectID(0);
|
|
controller.setSelecteEdge(null);
|
|
controller.setSelecteEdge(null);
|
|
controller.setCurIteration(0);
|
|
controller.setCurIteration(0);
|
|
unitGraph.empty();
|
|
unitGraph.empty();
|
|
- elementGraph.setText("None ");
|
|
|
|
|
|
+ elementGraph.setText(Languages.getLanguage()[25]);
|
|
canvas.tempCps = null;
|
|
canvas.tempCps = null;
|
|
canvas.repaint();
|
|
canvas.repaint();
|
|
IdCounter.resetCounter();
|
|
IdCounter.resetCounter();
|
|
@@ -1412,42 +1432,48 @@ public class GUI<E> implements CategoryListener {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
- languages.setLanguage(0);
|
|
|
|
|
|
+ Languages.setLanguage(0);
|
|
refreshLanguages();
|
|
refreshLanguages();
|
|
|
|
+ refreshTableProperties();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
spanishBtn.addActionListener(new ActionListener() {
|
|
spanishBtn.addActionListener(new ActionListener() {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
- languages.setLanguage(1);
|
|
|
|
|
|
+ Languages.setLanguage(1);
|
|
refreshLanguages();
|
|
refreshLanguages();
|
|
|
|
+ refreshTableProperties();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
germanBtn.addActionListener(new ActionListener() {
|
|
germanBtn.addActionListener(new ActionListener() {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
- languages.setLanguage(2);
|
|
|
|
|
|
+ Languages.setLanguage(2);
|
|
refreshLanguages();
|
|
refreshLanguages();
|
|
|
|
+ refreshTableProperties();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
czechBtn.addActionListener(new ActionListener() {
|
|
czechBtn.addActionListener(new ActionListener() {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
- languages.setLanguage(3);
|
|
|
|
|
|
+ Languages.setLanguage(3);
|
|
refreshLanguages();
|
|
refreshLanguages();
|
|
|
|
+ refreshTableProperties();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
chineseBtn.addActionListener(new ActionListener() {
|
|
chineseBtn.addActionListener(new ActionListener() {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
- languages.setLanguage(4);
|
|
|
|
|
|
+ Languages.setLanguage(4);
|
|
refreshLanguages();
|
|
refreshLanguages();
|
|
|
|
+ refreshTableProperties();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
+
|
|
mntmUndo.addActionListener(new java.awt.event.ActionListener() {
|
|
mntmUndo.addActionListener(new java.awt.event.ActionListener() {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -1528,7 +1554,7 @@ public class GUI<E> implements CategoryListener {
|
|
public void stateChanged(ChangeEvent e) {
|
|
public void stateChanged(ChangeEvent e) {
|
|
int i = model.getCurIteration();
|
|
int i = model.getCurIteration();
|
|
controller.calculateStateForTimeStep(i);
|
|
controller.calculateStateForTimeStep(i);
|
|
-
|
|
|
|
|
|
+
|
|
unitGraph.repaint();
|
|
unitGraph.repaint();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -1575,7 +1601,7 @@ public class GUI<E> implements CategoryListener {
|
|
if (dest.listFiles().length > 1) {
|
|
if (dest.listFiles().length > 1) {
|
|
int dialogButton = JOptionPane.YES_NO_OPTION;
|
|
int dialogButton = JOptionPane.YES_NO_OPTION;
|
|
int dialogResult = JOptionPane.showConfirmDialog(null, "Old autosave file was found, should it be loaded?",
|
|
int dialogResult = JOptionPane.showConfirmDialog(null, "Old autosave file was found, should it be loaded?",
|
|
- "Warning", dialogButton);
|
|
|
|
|
|
+ warningText, dialogButton);
|
|
if (dialogResult == JOptionPane.YES_OPTION) {
|
|
if (dialogResult == JOptionPane.YES_OPTION) {
|
|
model.setAutoSaveNr(dest.listFiles().length - 1);
|
|
model.setAutoSaveNr(dest.listFiles().length - 1);
|
|
mntmRedo.doClick();
|
|
mntmRedo.doClick();
|
|
@@ -1840,7 +1866,7 @@ public class GUI<E> implements CategoryListener {
|
|
AbstractCpsObject tempCps = getActualCps();
|
|
AbstractCpsObject tempCps = getActualCps();
|
|
if (tempCps != null && tempCps.getClass() == HolonObject.class) {
|
|
if (tempCps != null && tempCps.getClass() == HolonObject.class) {
|
|
tableModelProperties.removeRow(2);
|
|
tableModelProperties.removeRow(2);
|
|
- Object[] tempEnergy = { "Total Energy", ((HolonObject) tempCps).getCurrentEnergy() };
|
|
|
|
|
|
+ Object[] tempEnergy = { Languages.getLanguage()[73], ((HolonObject) tempCps).getCurrentEnergy() };
|
|
tableModelProperties.insertRow(2, tempEnergy);
|
|
tableModelProperties.insertRow(2, tempEnergy);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1876,7 +1902,7 @@ public class GUI<E> implements CategoryListener {
|
|
}
|
|
}
|
|
|
|
|
|
private void refreshLanguages() {
|
|
private void refreshLanguages() {
|
|
- String[] tempArray = languages.getLanguage();
|
|
|
|
|
|
+ String[] tempArray = Languages.getLanguage();
|
|
// ToolBar
|
|
// ToolBar
|
|
mnNewMenu.setText(tempArray[0]);
|
|
mnNewMenu.setText(tempArray[0]);
|
|
mntmNew.setText(tempArray[1]);
|
|
mntmNew.setText(tempArray[1]);
|
|
@@ -1908,6 +1934,15 @@ public class GUI<E> implements CategoryListener {
|
|
colNames[0] = tempArray[23];
|
|
colNames[0] = tempArray[23];
|
|
colNames[1] = tempArray[24];
|
|
colNames[1] = tempArray[24];
|
|
tableModelProperties.setColumnIdentifiers(colNames);
|
|
tableModelProperties.setColumnIdentifiers(colNames);
|
|
|
|
+ // Graph
|
|
|
|
+ elementGraph.setText(tempArray[25]);
|
|
|
|
+ holonEleNamesDisplayed = tempArray[25];
|
|
|
|
+ resetGraphBtn.setText(tempArray[26]);
|
|
|
|
+ // Warning PopUps
|
|
|
|
+ warningText = tempArray[27];
|
|
|
|
+ saveBeforeNew = tempArray[28];
|
|
|
|
+ eraseCategory = tempArray[29];
|
|
|
|
+ selectObjBeforeErase = tempArray[30];
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|