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

[Jiri Srba (srba)]

There is still one problem, declare a constant called c and the create an enumeration color type and now the element called c can be added there. This should be disabled too.

Finally, it would be nice if the check for enumeration is done at the moment you click "add" the element name and not at the very end once you click "ok".

review: Needs Fixing

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

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

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

[Jiri Srba (srba)]

I just realised that the names are case sensitive,
so if I have color type

Votes is [1,2,3]

I can still create a constant

voters

but if I name it as Voters that I get the warning.

review: Needs Fixing

[Jiri Srba (srba)]

But sometimes it is not case sensitive, if I make a constant c
and try to add it as element to enumearation, I get the warning
both if I try with c and C.

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

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

[Jiri Srba (srba)]

tested and works perfectly fine

review: Approve

=== 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-23 09:04:13 +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;
@@ -195,10 +194,6 @@
 		}
 	}
 
-	public boolean isConstantNameUsed(String newName) {
-		return constants.containsConstantByName(newName);
-	}
-
 	public void buildConstraints() {
 		constants.buildConstraints(this);
 	}
@@ -691,15 +686,15 @@
         }
         return null;
     }
+
     public boolean isNameUsedForColorType(String name) {
         for (ColorType element : colorTypes) {
-            if (element.getName().equals(name)) {
+            if (element.getName().equalsIgnoreCase(name)) {
                 return true;
             }
         }
         return false;
     }
-
     public boolean isNameUsedForVariable(String name) {
         for (Variable element : variables) {
             if (element.getName().equalsIgnoreCase(name)) {
@@ -708,10 +703,26 @@
         }
         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().equalsIgnoreCase(name)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+    public boolean isNameUsedForConstant(String newName) {
+        return constants.containsConstantByName(newName);
+    }
+
     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-23 09:04:13 +0000
@@ -189,7 +189,7 @@
     private JPanel createNameAndTypePanel() {
         JPanel nameAndTypePanel = new JPanel();
         nameAndTypePanel.setLayout(new GridBagLayout());
-        nameAndTypePanel.setBorder(BorderFactory.createTitledBorder("Name and Color Type"));
+        nameAndTypePanel.setBorder(BorderFactory.createTitledBorder("Name of Color Type"));
 
         JLabel nameLabel = new JLabel();
         nameLabel.setText("Name: ");
@@ -451,16 +451,20 @@
                     "The color cannot be named \"" + enumerationName + "\", as the name is reserved",
                     "Error", JOptionPane.ERROR_MESSAGE);
             } else {
-                boolean inList = false;
-                int i = 0;
-                while (!inList && i < cyclicModel.getSize() && cyclicModel.getElementAt(i) != null) {
-                    inList = cyclicModel.getElementAt(i).toString().equals(enumTextField.getText());
-                    i++;
+                boolean nameIsInUse = network.isNameUsedForVariable(enumerationName) || network.isNameUsedForColor(enumerationName, null) || network.isNameUsedForColorType(enumerationName) || network.isNameUsedForConstant(enumerationName) || nameTextField.getText().equalsIgnoreCase(enumerationName);
+                for (int i = 0; i < cyclicModel.getSize(); i++) {
+                    String n = cyclicModel.getElementAt(i).toString();
+
+                    if (n.equalsIgnoreCase(enumerationName)) {
+                        nameIsInUse = true;
+                        break;
+                    }
                 }
-                if (inList) {
+
+                if (nameIsInUse) {
                     JOptionPane.showMessageDialog(
                         CreateGui.getApp(),
-                        "A color with the name \"" + enumerationName + "\" already exists",
+                        "A color, color type, variable or constant with the name \"" + enumerationName + "\" already exists. Please chose an other name.",
                         "Error", JOptionPane.ERROR_MESSAGE);
                 } else {
                     cyclicModel.addElement(enumTextField.getText());
@@ -877,6 +881,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.isNameUsedForConstant(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 +981,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) || network.isNameUsedForConstant(e) || name.equalsIgnoreCase(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-23 09:04:13 +0000
@@ -261,7 +261,7 @@
             return;
         }
         //If we are editing a variable it is allowed to have the same name
-        if (network.isNameUsedForVariable(newName) && (variable == null || !variable.getName().equals(newName))) {
+        if ((variable == null || !variable.getName().equalsIgnoreCase(newName)) && network.isNameUsedForVariable(newName) ) {
             JOptionPane
                     .showMessageDialog(
                             CreateGui.getApp(),
@@ -281,6 +281,38 @@
             nameTextField.requestFocusInWindow();
             return;
         }
+
+        if (network.isNameUsedForConstant(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-23 09:04:13 +0000
@@ -11,7 +11,6 @@
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JRootPane;
 import javax.swing.JSpinner;
 import javax.swing.JTextField;
 
@@ -197,6 +196,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",
@@ -207,7 +217,7 @@
 			int val = (Integer) valueSpinner.getValue();
 			if (!oldName.equals("")) {
 				if (!oldName.equalsIgnoreCase(newName)
-						&& model.isConstantNameUsed(newName)) {
+						&& model.isNameUsedForConstant(newName)) {
 					JOptionPane
 					.showMessageDialog(
 							CreateGui.getApp(),
@@ -217,6 +227,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 )){