|
@@ -100,6 +100,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
|
|
|
private final SimulationMenu simMenu;
|
|
|
|
|
|
+ private JTabbedPane tabTemp;
|
|
|
private final JMenuBar menuBar = new JMenuBar();
|
|
|
private final JMenu mnNewMenu = new JMenu("File");
|
|
|
private final JMenu mnNewMenuEdit = new JMenu("Edit");
|
|
@@ -1273,9 +1274,14 @@ public class GUI<E> implements CategoryListener {
|
|
|
public void mouseReleased(MouseEvent e) {
|
|
|
try {
|
|
|
if (dragging) {
|
|
|
- if (((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
|
|
|
+ if (tabbedPane.getMousePosition() != null) {
|
|
|
+ tabTemp = tabbedPane;
|
|
|
+ } else {
|
|
|
+ tabTemp = tabbedPane2;
|
|
|
+ }
|
|
|
+ if (((JScrollPane) tabTemp.getSelectedComponent()).getViewport()
|
|
|
.getComponent(0) instanceof UpperNodeCanvas) {
|
|
|
- UpperNodeCanvas unc = ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent())
|
|
|
+ UpperNodeCanvas unc = ((UpperNodeCanvas) ((JScrollPane) tabTemp.getSelectedComponent())
|
|
|
.getViewport().getComponent(0));
|
|
|
|
|
|
int x = (int) unc.getMousePosition().getX();
|
|
@@ -2102,7 +2108,6 @@ public class GUI<E> implements CategoryListener {
|
|
|
*/
|
|
|
private void openNewUpperNodeTab() {
|
|
|
|
|
|
- JTabbedPane tabTemp;
|
|
|
if (tabbedPane.getMousePosition() != null) {
|
|
|
tabTemp = tabbedPane;
|
|
|
} else {
|
|
@@ -2143,7 +2148,6 @@ public class GUI<E> implements CategoryListener {
|
|
|
unitGraph.empty();
|
|
|
holonEleNamesDisplayed = Languages.getLanguage()[25];
|
|
|
elementGraph.setText(holonEleNamesDisplayed);
|
|
|
- JTabbedPane tabTemp;
|
|
|
if (tabbedPane.getMousePosition() != null) {
|
|
|
tabTemp = tabbedPane;
|
|
|
} else {
|