Merge lp:~yrke/tapaal/fix-1887770-and-1887771-ContextMenuForArcs into lp:tapaal

[Kenneth Yrke Jørgensen]

[Jiri Srba (srba)]

Seems to work but rightclicking on output arc and selecting properties raises an exception on moc:

Exception in thread "AWT-EventQueue-0" java.lang.ClassCastException: class pipe.gui.graphicElements.tapn.TimedOutputArcComponent cannot be cast to class pipe.gui.graphicElements.tapn.TimedInputArcComponent (pipe.gui.graphicElements.tapn.TimedOutputArcComponent and pipe.gui.graphicElements.tapn.TimedInputArcComponent are in unnamed module of loader 'app')
        at pipe.gui.handler.TimedArcHandler.lambda$getPopup$0(TimedArcHandler.java:27)
        at java.desktop/javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:1967)
        at java.desktop/javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2308)
        at java.desktop/javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:405)
        at java.desktop/javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:262)
        at java.desktop/javax.swing.AbstractButton.doClick(AbstractButton.java:369)
        at java.desktop/javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:1020)

review: Needs Fixing

[lp:~yrke/tapaal/fix-1887770-and-1887771-ContextMenuForArcs]

1072. By Kenneth Yrke Jørgensen on 2020-08-04

Fixed wrong cast in TimedArcHandler for output arcs

[Kenneth Yrke Jørgensen (yrke)]

Good catch, its fixed, was a wrong cast.

review: Needs Resubmitting

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/dk/aau/cs/gui/TabContent.java'
--- src/dk/aau/cs/gui/TabContent.java	2020-08-03 11:14:55 +0000
+++ src/dk/aau/cs/gui/TabContent.java	2020-08-04 07:42:41 +0000
@@ -2457,6 +2457,10 @@
                 e->e.pno instanceof Arc && e.a == MouseAction.doubleClicked && e.e.isControlDown(),
                 e->arcDoubleClickedWithContrl(((Arc) e.pno), e.e)
             );
+            registerEvent(
+                e->e.pno instanceof TimedOutputArcComponent && e.a == MouseAction.doubleClicked && !e.e.isControlDown(),
+                e -> ((TimedOutputArcComponent) e.pno).showTimeIntervalEditor()
+            );
 
         }
 

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java	2020-06-23 07:22:17 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java	2020-08-04 07:42:41 +0000
@@ -14,6 +14,7 @@
 import pipe.gui.graphicElements.ArcPath;
 import pipe.gui.graphicElements.PlaceTransitionObject;
 import pipe.gui.handler.ArcHandler;
+import pipe.gui.handler.TimedArcHandler;
 import pipe.gui.undo.ArcTimeIntervalEdit;
 import pipe.gui.widgets.EscapableDialog;
 import pipe.gui.widgets.GuardDialogue;
@@ -67,7 +68,7 @@
 	protected void addMouseHandler() {
 		//XXX: kyrke 2018-09-06, this is bad as we leak "this", think its ok for now, as it alwas constructed when
 		//XXX: handler is called. Make static constructor and add handler from there, to make it safe.
-		mouseHandler = new ArcHandler(this);
+		mouseHandler = new TimedArcHandler(this);
 	}
 
 

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java	2020-06-23 09:02:28 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java	2020-08-04 07:42:41 +0000
@@ -3,11 +3,10 @@
 import java.awt.Polygon;
 import java.util.Hashtable;
 
-import com.sun.jdi.connect.Transport;
 import pipe.gui.CreateGui;
 import pipe.gui.Pipe;
 import pipe.gui.graphicElements.PlaceTransitionObject;
-import pipe.gui.handler.TransportArcHandler;
+import pipe.gui.handler.TimedArcHandler;
 import pipe.gui.undo.ArcTimeIntervalEdit;
 import dk.aau.cs.gui.undo.Command;
 import dk.aau.cs.model.tapn.ConstantBound;
@@ -68,7 +67,7 @@
 	protected void addMouseHandler() {
 		//XXX: kyrke 2018-09-06, this is bad as we leak "this", think its ok for now, as it alwas constructed when
 		//XXX: handler is called. Make static constructor and add handler from there, to make it safe.
-		mouseHandler = new TransportArcHandler(this);
+		mouseHandler = new TimedArcHandler(this);
 	}
 
 	public void setUnderlyingArc(TransportArc arc) {

=== modified file 'src/pipe/gui/handler/TimedArcHandler.java'
--- src/pipe/gui/handler/TimedArcHandler.java	2020-07-03 06:46:54 +0000
+++ src/pipe/gui/handler/TimedArcHandler.java	2020-08-04 07:42:41 +0000
@@ -5,10 +5,12 @@
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 
+import dk.aau.cs.model.tapn.TimedOutputArc;
 import pipe.gui.action.SplitArcAction;
 import pipe.gui.graphicElements.Arc;
 import pipe.gui.graphicElements.tapn.TimedInhibitorArcComponent;
 import pipe.gui.graphicElements.tapn.TimedInputArcComponent;
+import pipe.gui.graphicElements.tapn.TimedOutputArcComponent;
 import pipe.gui.graphicElements.tapn.TimedTransportArcComponent;
 
 public class TimedArcHandler extends ArcHandler {
@@ -23,16 +25,12 @@
 		JMenuItem menuItem;
 		JPopupMenu popup = super.getPopup(e);
 
-		if (myObject instanceof TimedInputArcComponent && !(myObject instanceof TimedTransportArcComponent)) {
-
-		    if (!(myObject instanceof TimedInhibitorArcComponent)) {
-				menuItem = new JMenuItem("Properties");
-				menuItem.addActionListener(e1 -> ((TimedInputArcComponent) myObject).showTimeIntervalEditor());
-				popup.insert(menuItem, popupIndex++);
-			}
-
-			popup.insert(new JPopupMenu.Separator(), popupIndex);
-		}
+		menuItem = new JMenuItem("Properties");
+		menuItem.addActionListener(e1 -> ((TimedOutputArcComponent) myObject).showTimeIntervalEditor());
+		popup.insert(menuItem, popupIndex++);
+
+		popup.insert(new JPopupMenu.Separator(), popupIndex);
+
 		return popup;
 	}
 }

=== removed file 'src/pipe/gui/handler/TransportArcHandler.java'