Merge lp:~tapaal-contributor/tapaal/fix-is-enabled-transition-query into lp:tapaal

[Lena Ernstsen]

When net is untimed, the predicate for transitions are now shown as "is enabled" instead of " = 0".
When net is game, it is not possible to select any transitions.

[Jiri Srba (srba)]

Open untimed game and make a query; the text "is enabled" is prited next to predicate - it should only show if you select transition from the list.

review: Needs Fixing

[lp:~tapaal-contributor/tapaal/fix-is-enabled-transition-query]

1118. By Lena Ernstsen on 2020-11-06

Removed extra 'is enabled' when net is untimed and game

[Jiri Srba (srba)]

Tested and fixes the problem.

review: Approve

[Kenneth Yrke Jørgensen (yrke)]

review: Approve

=== modified file 'src/pipe/gui/widgets/QueryDialog.java'
--- src/pipe/gui/widgets/QueryDialog.java	2020-10-30 21:14:42 +0000
+++ src/pipe/gui/widgets/QueryDialog.java	2020-11-06 13:15:27 +0000
@@ -127,7 +127,7 @@
 	private JPanel predicatePanel;
 	private JButton addPredicateButton;
 	private JComboBox templateBox;
-	private JComboBox<String> placesBox;
+	private JComboBox<String> placeTransitionBox;
 	private JComboBox<String> relationalOperatorBox;
     private JLabel transitionIsEnabledLabel;
     private CustomJSpinner placeMarking;
@@ -703,10 +703,10 @@
             } else {
                 templateBox.setSelectedItem(tapnNetwork.getTAPNByName(transitionNode.getTemplate()));
             }
-            placesBox.setSelectedItem(transitionNode.getTransition());
+            placeTransitionBox.setSelectedItem(transitionNode.getTransition());
             userChangedAtomicPropSelection = true;
         }
-        if (!lens.isTimed()) {
+        if (!lens.isTimed() && !lens.isGame()) {
             setEnablednessOfOperatorAndMarkingBoxes();
         }
 	}
@@ -718,7 +718,7 @@
         TCTLPlaceNode placeNode = (TCTLPlaceNode) node.getLeft();
         TCTLConstNode placeMarkingNode = (TCTLConstNode) node.getRight();
 
-        placesBox.setSelectedItem(placeNode.getPlace());
+        placeTransitionBox.setSelectedItem(placeNode.getPlace());
         relationalOperatorBox.setSelectedItem(node.getOp());
         placeMarking.setValue(placeMarkingNode.getConstant());
         userChangedAtomicPropSelection = true;
@@ -728,10 +728,10 @@
         userChangedAtomicPropSelection = false;
         if (node.getLeft() instanceof TCTLPlaceNode) {
             TCTLPlaceNode placeNode = (TCTLPlaceNode) node.getLeft();
-            placesBox.setSelectedItem(placeNode.getPlace());
+            placeTransitionBox.setSelectedItem(placeNode.getPlace());
         } else {
-            if (placesBox.getItemCount() > 0) {
-                placesBox.setSelectedIndex(0);
+            if (placeTransitionBox.getItemCount() > 0) {
+                placeTransitionBox.setSelectedIndex(0);
             }
         }
         relationalOperatorBox.setSelectedItem(node.getOp());
@@ -756,7 +756,7 @@
     }
 
     private boolean transitionIsSelected() {
-        String itemName = (String) placesBox.getSelectedItem();
+        String itemName = (String) placeTransitionBox.getSelectedItem();
         if (itemName == null) return false;
         boolean transitionSelected = false;
         boolean sharedTransitionSelected = false;
@@ -980,7 +980,7 @@
 		disjunctionButton.setEnabled(false);
 		negationButton.setEnabled(false);
 		templateBox.setEnabled(false);
-		placesBox.setEnabled(false);
+		placeTransitionBox.setEnabled(false);
 		relationalOperatorBox.setEnabled(false);
 		placeMarking.setEnabled(false);
 		addPredicateButton.setEnabled(false);
@@ -1005,7 +1005,7 @@
 		disjunctionButton.setEnabled(false);
 		negationButton.setEnabled(false);
 		templateBox.setEnabled(false);
-		placesBox.setEnabled(false);
+		placeTransitionBox.setEnabled(false);
 		relationalOperatorBox.setEnabled(false);
 		placeMarking.setEnabled(false);
 		addPredicateButton.setEnabled(false);
@@ -1028,7 +1028,7 @@
 		disjunctionButton.setEnabled(true);
 		negationButton.setEnabled(true);
 		templateBox.setEnabled(true);
-		placesBox.setEnabled(true);
+		placeTransitionBox.setEnabled(true);
 		relationalOperatorBox.setEnabled(true);
 		placeMarking.setEnabled(true);
 		truePredicateButton.setEnabled(true);
@@ -1051,7 +1051,7 @@
         disjunctionButton.setEnabled(true);
         negationButton.setEnabled(true);
         templateBox.setEnabled(true);
-        placesBox.setEnabled(true);
+        placeTransitionBox.setEnabled(true);
         relationalOperatorBox.setEnabled(true);
         placeMarking.setEnabled(true);
         truePredicateButton.setEnabled(true);
@@ -1076,7 +1076,7 @@
         disjunctionButton.setEnabled(false);
         negationButton.setEnabled(false);
         templateBox.setEnabled(false);
-        placesBox.setEnabled(false);
+        placeTransitionBox.setEnabled(false);
         relationalOperatorBox.setEnabled(false);
         placeMarking.setEnabled(false);
         addPredicateButton.setEnabled(false);
@@ -1086,7 +1086,7 @@
     }
 
 	private void setEnablednessOfAddPredicateButton() {
-		if (placesBox.getSelectedItem() == null)
+		if (placeTransitionBox.getSelectedItem() == null)
 			addPredicateButton.setEnabled(false);
 		else
 			addPredicateButton.setEnabled(true);
@@ -1145,10 +1145,10 @@
 			TCTLAbstractStateProperty property;
 
             if (!lens.isTimed() && transitionIsSelected()) {
-                property = new TCTLTransitionNode(template, (String) placesBox.getSelectedItem());
+                property = new TCTLTransitionNode(template, (String) placeTransitionBox.getSelectedItem());
             } else {
                 property = new TCTLAtomicPropositionNode(
-                    new TCTLPlaceNode(template, (String) placesBox.getSelectedItem()),
+                    new TCTLPlaceNode(template, (String) placeTransitionBox.getSelectedItem()),
                     (String) relationalOperatorBox.getSelectedItem(),
                     new TCTLConstNode((Integer) placeMarking.getValue()));
             }
@@ -2002,10 +2002,10 @@
 		predicatePanel = new JPanel(new GridBagLayout());
 		predicatePanel.setBorder(BorderFactory.createTitledBorder("Predicates"));
 
-		placesBox = new JComboBox();
+		placeTransitionBox = new JComboBox();
 		Dimension d = new Dimension(125, 27);
-		placesBox.setMaximumSize(d);
-		placesBox.setPreferredSize(d);
+		placeTransitionBox.setMaximumSize(d);
+		placeTransitionBox.setPreferredSize(d);
 
 		Vector<Object> items = new Vector<Object>(tapnNetwork.activeTemplates().size()+1);
 		items.addAll(tapnNetwork.activeTemplates());
@@ -2025,7 +2025,7 @@
 								placeNames.add(place.name());
 							}
 						}
-                        if (!lens.isTimed()) {
+                        if (!lens.isTimed() && !lens.isGame()) {
                             for (TimedTransition transition : tapn.transitions()) {
                                 if (!transition.isShared()) {
                                     placeNames.add(transition.name());
@@ -2034,7 +2034,7 @@
                         }
 
 						placeNames.sort(String::compareToIgnoreCase);
-						placesBox.setModel(new DefaultComboBoxModel<>(placeNames));
+						placeTransitionBox.setModel(new DefaultComboBoxModel<>(placeNames));
 
 						currentlySelected = tapn;
 						setEnablednessOfAddPredicateButton();
@@ -2053,7 +2053,7 @@
                         }
                     }
 					placeNames.sort(String::compareToIgnoreCase);
-					placesBox.setModel(new DefaultComboBoxModel<>(placeNames));
+					placeTransitionBox.setModel(new DefaultComboBoxModel<>(placeNames));
 
 					currentlySelected = SHARED;
 					setEnablednessOfAddPredicateButton();
@@ -2061,7 +2061,7 @@
                         updateQueryOnAtomicPropositionChange();
                     }
 				}
-                if (!lens.isTimed()) setEnablednessOfOperatorAndMarkingBoxes();
+                if (!lens.isTimed() && !lens.isGame()) setEnablednessOfOperatorAndMarkingBoxes();
 
 			}
 		});
@@ -2085,7 +2085,7 @@
         JPanel placeRow = new JPanel(new FlowLayout(FlowLayout.CENTER));
         gbc.gridy = 1;
         predicatePanel.add(placeRow, gbc);
-        placeRow.add(placesBox);
+        placeRow.add(placeTransitionBox);
 
         String[] relationalSymbols = { "=", "!=", "<=", "<", ">=", ">" };
         relationalOperatorBox = new JComboBox(new DefaultComboBoxModel(relationalSymbols));
@@ -2098,7 +2098,7 @@
 
         transitionIsEnabledLabel = new JLabel(" is enabled");
         transitionIsEnabledLabel.setPreferredSize(new Dimension(165, 27));
-        if (!lens.isTimed()) placeRow.add(transitionIsEnabledLabel);
+        if (!lens.isTimed() && !lens.isGame()) placeRow.add(transitionIsEnabledLabel);
 
         JPanel addPredicateRow = new JPanel(new FlowLayout(FlowLayout.CENTER));
         gbc.gridy = 2;
@@ -2144,7 +2144,7 @@
 		queryPanel.add(predicatePanel, gbc);
 
 		//Add tool tips for predicate panel
-		placesBox.setToolTipText(TOOL_TIP_PLACESBOX);
+		placeTransitionBox.setToolTipText(TOOL_TIP_PLACESBOX);
 		templateBox.setToolTipText(TOOL_TIP_TEMPLATEBOX);
 		relationalOperatorBox.setToolTipText(TOOL_TIP_RELATIONALOPERATORBOX);
 		placeMarking.setToolTipText(TOOL_TIP_PLACEMARKING);
@@ -2160,11 +2160,11 @@
 				String template = templateBox.getSelectedItem().toString();
 				if(template.equals(SHARED)) template = "";
 
-                if ((lens.isTimed() || lens.isGame()) && transitionIsSelected()) {
-                    addPropertyToQuery(new TCTLTransitionNode(template, (String) placesBox.getSelectedItem()));
+                if ((!lens.isTimed() && !lens.isGame()) && transitionIsSelected()) {
+                    addPropertyToQuery(new TCTLTransitionNode(template, (String) placeTransitionBox.getSelectedItem()));
                 } else {
                     TCTLAtomicPropositionNode property = new TCTLAtomicPropositionNode(
-                        new TCTLPlaceNode(template, (String) placesBox.getSelectedItem()),
+                        new TCTLPlaceNode(template, (String) placeTransitionBox.getSelectedItem()),
                         (String) relationalOperatorBox.getSelectedItem(),
                         new TCTLConstNode((Integer) placeMarking.getValue()));
                     addPropertyToQuery(property);
@@ -2193,10 +2193,13 @@
             }
 		});
 
-		placesBox.addActionListener(e -> {
+		placeTransitionBox.addActionListener(e -> {
 			if (userChangedAtomicPropSelection) {
 				updateQueryOnAtomicPropositionChange();
 			}
+			if (!lens.isTimed() && !lens.isGame()) {
+                setEnablednessOfOperatorAndMarkingBoxes();
+            }
 		});
 
 		relationalOperatorBox.addActionListener(e -> {