Merge lp:~tapaal-contributor/tapaal/fix1953355 into lp:~tapaal-contributor/tapaal/cpn-gui-dev

[Kenneth Yrke Jørgensen]

[Jiri Srba (srba)]

Add also a check against constants please - now I can declare e.g. constant c and also color type c.

review: Needs Fixing

[Jiri Srba (srba)]

It is possible to make an enumeartion color type with element a1 and then created a colortype called a1 - this should be forbidden.

Example what should not be allowed:
c is [a1,a2,a3]
a1 is [2,3]

review: Needs Fixing

[lp:~tapaal-contributor/tapaal/fix1953355]

1488. By Kenneth Yrke Jørgensen on 2021-12-21

Added extra check to distinct color, colortype,variable and constants

1489. By Kenneth Yrke Jørgensen on 2021-12-22

Fixed Enum Color not checking variable named and added check when adding enum type

1490. By Kenneth Yrke Jørgensen on 2021-12-23

ColorTypes, Colors, Variables and Constant named must be unique ignored case

Also fixes and bug where you could add several Colors of the same name to an color type

Unmerged revisions

=== modified file 'src/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java'
--- src/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java	2021-08-27 08:42:36 +0000
+++ src/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java	2021-12-21 13:25:09 +0000
@@ -5,7 +5,6 @@
 import dk.aau.cs.gui.undo.Colored.*;
 import dk.aau.cs.model.CPN.*;
 import dk.aau.cs.model.CPN.Expressions.*;
-import org.jetbrains.annotations.NotNull;
 import pipe.gui.MessengerImpl;
 import dk.aau.cs.gui.undo.Command;
 import dk.aau.cs.model.tapn.event.ConstantChangedEvent;
@@ -708,10 +707,23 @@
         }
         return false;
     }
+    public boolean isNameUsedForColor(String name, ColorType ignored) {
+        for (ColorType e : colorTypes) {
+            if (e != ignored && !e.isIntegerRange() && !e.isProductColorType()){
+                for (Color c : e.getColors()) {
+                    if (c.getName().equals(name)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     public Variable getVariableByName(String name){
-        for (int i = 0; i < variables.size(); i++) {
-            if (variables.get(i).getName().equalsIgnoreCase(name)) {
-                return variables.get(i);
+        for (Variable variable : variables) {
+            if (variable.getName().equalsIgnoreCase(name)) {
+                return variable;
             }
         }
         return null;

=== modified file 'src/pipe/gui/widgets/ColoredWidgets/ColorTypeDialogPanel.java'
--- src/pipe/gui/widgets/ColoredWidgets/ColorTypeDialogPanel.java	2021-08-30 07:07:52 +0000
+++ src/pipe/gui/widgets/ColoredWidgets/ColorTypeDialogPanel.java	2021-12-21 13:25:09 +0000
@@ -877,6 +877,30 @@
                             "Error", JOptionPane.ERROR_MESSAGE);
             return;
         }
+        if (network.isNameUsedForVariable(name)) {
+            JOptionPane.showMessageDialog(
+                CreateGui.getApp(),
+                "There is already variable with the same name.\n\n"
+                    + "Choose a different name for the color type.",
+                "Error", JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        if (network.isConstantNameUsed(name)) {
+            JOptionPane.showMessageDialog(
+                CreateGui.getApp(),
+                "There is already a constant with the same name.\n\n"
+                    + "Choose a different name for the color type.",
+                "Error", JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        if (network.isNameUsedForColor(name, null)) {
+            JOptionPane.showMessageDialog(
+                CreateGui.getApp(),
+                "There is already a color with the same name.\n\n"
+                    + "Choose a different name for the color type.",
+                "Error", JOptionPane.ERROR_MESSAGE);
+            return;
+        }
         if (!oldName.equals("") && !oldName.equalsIgnoreCase(name) && network.isNameUsedForColorType(name)) {
             JOptionPane.showMessageDialog(
                             CreateGui.getApp(),
@@ -953,6 +977,34 @@
 
         //If everything is false add the colortype
         String selectedColorType = colorTypeComboBox.getSelectedItem().toString();
+
+        //Enum named are not allow to overlap with variable names
+        switch (selectedColorType) {
+            case finiteEnumeration: //Fall through
+            case cyclicEnumeration:
+
+                ArrayList<String> overlaps = new ArrayList<>();
+                for (int i = 0; i < enumList.getModel().getSize(); i++) {
+                    String e = enumList.getModel().getElementAt(i).toString();
+                    if (network.isNameUsedForVariable(e) || network.isNameUsedForColor(e, oldColorType) || network.isNameUsedForColorType(e) || name.equals(e)) {
+                        overlaps.add(e);
+                    }
+                }
+                if (overlaps.size() > 0) {
+                    JOptionPane.showMessageDialog(
+                        CreateGui.getApp(),
+                        "Color names must not overlap with variable names or other color names: \n" +
+                        "Remove or rename the following: \n" +
+                            String.join(", ", overlaps),
+                        "Error", JOptionPane.ERROR_MESSAGE);
+                    return;
+                }
+
+                //No overlap between
+
+                break;
+        }
+
         ColorType newColorType = new ColorType(name);
 
         switch (selectedColorType) {

=== modified file 'src/pipe/gui/widgets/ColoredWidgets/VariablesDialogPanel.java'
--- src/pipe/gui/widgets/ColoredWidgets/VariablesDialogPanel.java	2021-07-02 12:10:22 +0000
+++ src/pipe/gui/widgets/ColoredWidgets/VariablesDialogPanel.java	2021-12-21 13:25:09 +0000
@@ -281,6 +281,38 @@
             nameTextField.requestFocusInWindow();
             return;
         }
+
+        if (network.isConstantNameUsed(newName)) {
+            JOptionPane
+                .showMessageDialog(
+                    CreateGui.getApp(),
+                    "There is already a constant with this name.\n\n"
+                        + "Choose a different name for the variable.",
+                    "Error", JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+
+        if (network.isNameUsedForColorType(newName)) {
+            JOptionPane
+                .showMessageDialog(
+                    CreateGui.getApp(),
+                    "There is already a Color Type with this name.\n\n"
+                        + "Choose a different name for the variable.",
+                    "Error", JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+
+        //Variable name is not allow to overlap with enum names
+        if (network.isNameUsedForColor(newName, null)) {
+            JOptionPane
+                .showMessageDialog(
+                    CreateGui.getApp(),
+                    "There is already a Color with this name.\n\n"
+                        + "Choose a different name for the variable.",
+                    "Error", JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+
         Command cmd;
         if (!oldName.equals("")) {
             cmd = new UpdateVariableCommand(variable, nameTextField.getText(), colorTypes.get(colorTypeComboBox.getSelectedIndex()), listModel);

=== modified file 'src/pipe/gui/widgets/ConstantsDialogPanel.java'
--- src/pipe/gui/widgets/ConstantsDialogPanel.java	2021-11-04 13:34:08 +0000
+++ src/pipe/gui/widgets/ConstantsDialogPanel.java	2021-12-21 13:25:09 +0000
@@ -197,6 +197,17 @@
 			return;
 		}
 
+        if (model.isNameUsedForColorType(newName) || model.isNameUsedForVariable(newName) || model.isNameUsedForColor(newName, null)) {
+            JOptionPane
+                .showMessageDialog(
+                    CreateGui.getApp(),
+                    "There is already another Color, Color Type or Variable with the same name.\n\n"
+                        + "Choose a different name for the constant.",
+                    "Error", JOptionPane.ERROR_MESSAGE);
+            nameTextField.requestFocusInWindow();
+            return;
+        }
+
 		if (newName.trim().isEmpty()) {
 			JOptionPane.showMessageDialog(CreateGui.getApp(),
 					"You must specify a name.", "Missing name",
@@ -217,6 +228,7 @@
 					nameTextField.requestFocusInWindow();
 					return;
 				}
+
 				//Kyrke - This is messy, but a quck fix for bug #815487			
 				//Check that the value is within the allowed bounds
 				if (!( lowerBound <= val && val <= upperBound )){