Merge lp:~tapaal-contributor/tapaal/fix-product-display-1971421 into lp:~tapaal-contributor/tapaal/cpn-gui-dev

[Lena Ernstsen]

Product colours are updated correctly when using product colours in guard expressions.

Also, fixed null exception when trying to switch between color types while currently selecting a > or >= expression.

[Jiri Srba (srba)]

fixes the issue

review: Approve

=== modified file 'src/main/java/dk/aau/cs/approximation/ApproximationWorker.java'
--- src/main/java/dk/aau/cs/approximation/ApproximationWorker.java	2022-02-20 15:02:33 +0000
+++ src/main/java/dk/aau/cs/approximation/ApproximationWorker.java	2022-05-18 07:39:20 +0000
@@ -106,8 +106,6 @@
                             false,
                             approxResult.getUnfoldedModel());
                         toReturn.setNameMapping(nameMapping);
-
-
 						
 						OverApproximation overaprx = new OverApproximation();
 			

=== modified file 'src/main/java/dk/aau/cs/model/CPN/Expressions/GreaterThanEqExpression.java'
--- src/main/java/dk/aau/cs/model/CPN/Expressions/GreaterThanEqExpression.java	2021-06-24 10:15:01 +0000
+++ src/main/java/dk/aau/cs/model/CPN/Expressions/GreaterThanEqExpression.java	2022-05-18 07:39:20 +0000
@@ -77,7 +77,7 @@
 
     @Override
     public GuardExpression copy() {
-        return null;
+        return new GreaterThanEqExpression(left, right);
     }
 
     @Override

=== modified file 'src/main/java/dk/aau/cs/model/CPN/Expressions/GreaterThanExpression.java'
--- src/main/java/dk/aau/cs/model/CPN/Expressions/GreaterThanExpression.java	2021-06-24 10:15:01 +0000
+++ src/main/java/dk/aau/cs/model/CPN/Expressions/GreaterThanExpression.java	2022-05-18 07:39:20 +0000
@@ -84,7 +84,7 @@
 
     @Override
     public GuardExpression copy() {
-        return null;
+        return new GreaterThanExpression(left, right);
     }
 
     @Override

=== modified file 'src/main/java/net/tapaal/gui/petrinet/editor/ColoredTransitionGuardPanel.java'
--- src/main/java/net/tapaal/gui/petrinet/editor/ColoredTransitionGuardPanel.java	2022-03-23 16:24:25 +0000
+++ src/main/java/net/tapaal/gui/petrinet/editor/ColoredTransitionGuardPanel.java	2022-05-18 07:39:20 +0000
@@ -1,6 +1,5 @@
 package net.tapaal.gui.petrinet.editor;
 
-import dk.aau.cs.util.Tuple;
 import net.tapaal.gui.petrinet.Context;
 import net.tapaal.gui.petrinet.undo.Colored.SetTransitionExpressionCommand;
 import net.tapaal.gui.petrinet.undo.Command;
@@ -374,7 +373,7 @@
     private Pair<ColorExpression, ColorExpression> getLeftRightExpression(Expression currentSelection) {
         if (currentSelection instanceof PlaceHolderGuardExpression) {
             if (colorTypeCombobox.getItemAt(colorTypeCombobox.getSelectedIndex()) instanceof ProductType) {
-                int size = colorCombobox.getColorType().size();
+                int size = ((ProductType) colorTypeCombobox.getItemAt(colorTypeCombobox.getSelectedIndex())).size();
                 Vector<ColorExpression> tempVec1 = createPlaceholderVectors(size);
                 Vector<ColorExpression> tempVec2 = createPlaceholderVectors(size);
                 return new Pair<>(new TupleExpression(tempVec1), new TupleExpression(tempVec2));
@@ -666,10 +665,14 @@
             greaterThanEqButton.setEnabled(true);
             lessThanEqButton.setEnabled(true);
             lessThanButton.setEnabled(true);
-            colorTypeCombobox.setEnabled(true);
             succButton.setEnabled(false);
             predButton.setEnabled(false);
             colorCombobox.setEnabled(false);
+            if (currentSelection.getObject() instanceof PlaceHolderGuardExpression) {
+                colorTypeCombobox.setEnabled(false);
+            } else {
+                colorTypeCombobox.setEnabled(true);
+            }
         }
         if (colorTypeCombobox.getItemAt(colorTypeCombobox.getSelectedIndex()) instanceof ProductType) {
             greaterThanButton.setEnabled(false);
@@ -720,7 +723,12 @@
         if (currentSelection.getObject() instanceof ColorExpression) {
             ColorType ct = colorTypeCombobox.getItemAt(colorTypeCombobox.getSelectedIndex());
             if (ct instanceof ProductType && !(currentSelection.getObject() instanceof TupleExpression)) {
-                ColorType newColorType = ((ProductType) ct).getConstituents().get(((ColorExpression) currentSelection.getObject()).getIndex());
+                int currentIndex = ((ColorExpression) currentSelection.getObject()).getIndex();
+                ColorType newColorType;
+                if (currentIndex == -1)
+                    newColorType = ((ProductType) ct).getConstituents().firstElement();
+                else
+                    newColorType = ((ProductType) ct).getConstituents().get(((ColorExpression) currentSelection.getObject()).getIndex());
                 colorCombobox.updateColorType(newColorType, context, true);
             }
             ColorExpression exprToCheck = ((ColorExpression) currentSelection.getObject()).getBottomColorExpression();
@@ -876,11 +884,22 @@
 
     private void updateExpression() {
         ColorType ct = colorTypeCombobox.getItemAt(colorTypeCombobox.getSelectedIndex());
-        ExprStringPosition[] children = newProperty.getChildren();
-        GuardExpression oldProperty = newProperty.copy();
+        ExprStringPosition[] children = currentSelection.getObject().getChildren();
+        Expression oldProperty = currentSelection.getObject().copy();
 
         if (ct == getColorType(newProperty)) return;
 
+        updateChildren(ct, currentSelection.getObject(), children);
+
+        if (doColorTypeUndo) {
+            replaceAndAddToUndo(oldProperty, newProperty);
+        } else {
+            newProperty = newProperty.replace(oldProperty, newProperty);
+            updateSelection(newProperty);
+        }
+    }
+
+    private void updateChildren(ColorType ct, Expression parent, ExprStringPosition[] children) {
         for (ExprStringPosition child : children) {
             if (child.getObject() instanceof ColorExpression) {
                 Expression expr;
@@ -890,14 +909,10 @@
                     expr = new PlaceHolderColorExpression();
                 }
                 newProperty = newProperty.replace(child.getObject(), expr);
+            } else if (parent instanceof NotExpression && child.getObject() instanceof LeftRightGuardExpression) {
+                updateChildren(ct, child.getObject(), child.getObject().getChildren());
             }
         }
-        if (doColorTypeUndo) {
-            replaceAndAddToUndo(oldProperty, newProperty);
-        } else {
-            newProperty = newProperty.replace(oldProperty, newProperty);
-            updateSelection(newProperty);
-        }
     }
 
     // /////////////////////////////////////////////////////////////////////