Merge lp:~tapaal-contributor/tapaal/cpn-disable-.all-transport-arcs-1952522 into lp:~tapaal-contributor/tapaal/cpn-gui-dev

[Kristian Morsing Pedersen]

Removed .all in editing panel for transport arcs

[Jiri Srba (srba)]

Tested and works.

review: Approve

=== modified file 'src/pipe/gui/ColoredComponents/ColoredArcGuardPanel.java'
--- src/pipe/gui/ColoredComponents/ColoredArcGuardPanel.java	2021-08-30 07:11:16 +0000
+++ src/pipe/gui/ColoredComponents/ColoredArcGuardPanel.java	2021-12-02 15:41:28 +0000
@@ -548,12 +548,23 @@
     private void initNumberExpressionsPanel() {
         numberExprPanel = new JPanel(new GridBagLayout());
         numberExprPanel.setBorder(BorderFactory.createTitledBorder("Numerical Expressions"));
-        colorExpressionComboBoxPanel = new ColorComboboxPanel(colorType, true, context) {
-            @Override
-            public void changedColor(JComboBox[] comboBoxes) {
-
-            }
-        };
+
+        if(isTransportArc) {
+            colorExpressionComboBoxPanel = new ColorComboboxPanel(colorType, false, context) {
+                @Override
+                public void changedColor(JComboBox[] comboBoxes) {
+
+                }
+            };
+        } else {
+            colorExpressionComboBoxPanel = new ColorComboboxPanel(colorType, true, context) {
+                @Override
+                public void changedColor(JComboBox[] comboBoxes) {
+
+                }
+            };
+        }
+
         colorExpressionComboBoxPanel.removeScrollPaneBorder();
         Integer current = 1;
         Integer min = 1;