|
@@ -922,9 +922,10 @@ public class GUI<E> implements CategoryListener {
|
|
((HolonSwitch) getActualCps()).setManualState(bTemp);
|
|
((HolonSwitch) getActualCps()).setManualState(bTemp);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }// else if (getActualCps() instanceof AbstractCpsObject) {
|
|
|
|
- getActualCps().setName(temp.toString());
|
|
|
|
- //}
|
|
|
|
|
|
+ } // else if (getActualCps() instanceof
|
|
|
|
+ // AbstractCpsObject) {
|
|
|
|
+ getActualCps().setName(temp.toString());
|
|
|
|
+ // }
|
|
} else {
|
|
} else {
|
|
temp = tableModelProperties.getValueAt(selValueY, selValueX);
|
|
temp = tableModelProperties.getValueAt(selValueY, selValueX);
|
|
btemp = tableModelProperties.getValueAt(mousePos.y / tableProperties.getRowHeight(),
|
|
btemp = tableModelProperties.getValueAt(mousePos.y / tableProperties.getRowHeight(),
|
|
@@ -2058,13 +2059,14 @@ public class GUI<E> implements CategoryListener {
|
|
*/
|
|
*/
|
|
private void openNewUpperNodeTab() {
|
|
private void openNewUpperNodeTab() {
|
|
UpperNodeCanvas unc;
|
|
UpperNodeCanvas unc;
|
|
- if(((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
|
|
|
|
- .getComponent(0) instanceof MyCanvas){
|
|
|
|
- unc = new UpperNodeCanvas(model, controller, (CpsUpperNode) temp, "" );
|
|
|
|
|
|
+ if (((JScrollPane) tabbedPane.getSelectedComponent()).getViewport().getComponent(0) instanceof MyCanvas) {
|
|
|
|
+ unc = new UpperNodeCanvas(model, controller, (CpsUpperNode) temp, "");
|
|
} else {
|
|
} else {
|
|
- unc = new UpperNodeCanvas(model, controller, (CpsUpperNode) temp, ((UpperNodeCanvas)((JScrollPane) tabbedPane.getSelectedComponent()).getViewport().getComponent(0)).path+" -> " );
|
|
|
|
|
|
+ unc = new UpperNodeCanvas(model, controller, (CpsUpperNode) temp,
|
|
|
|
+ ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
|
|
|
|
+ .getComponent(0)).path + " -> ");
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
unc.setBorder(null);
|
|
unc.setBorder(null);
|
|
unc.setBackground(Color.WHITE);
|
|
unc.setBackground(Color.WHITE);
|
|
unc.setPreferredSize(new Dimension(model.getCanvasX(), model.getCanvasY()));
|
|
unc.setPreferredSize(new Dimension(model.getCanvasX(), model.getCanvasY()));
|