Merge lp:~yrke/tapaal/removeNetType into lp:tapaal

[Kenneth Yrke Jørgensen]

Removed the legacy NetType values, removed before staring reimplementing untimed support.

[Kenneth Yrke Jørgensen (yrke)]

The net type was always TAPN, type UNTIMED was never set any place, so this change should have no effect on features.

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/dk/aau/cs/gui/TabContent.java'
--- src/dk/aau/cs/gui/TabContent.java	2020-04-30 12:51:14 +0000
+++ src/dk/aau/cs/gui/TabContent.java	2020-05-18 07:40:41 +0000
@@ -59,7 +59,7 @@
 	 * Creates a new tab with the selected file, or a new file if filename==null
 	 */
 	public static TabContent createNewTabFromInputStream(InputStream file, String name) throws Exception {
-		TabContent tab = new TabContent(NetType.TAPN);
+		TabContent tab = new TabContent();
 		tab.setInitialName(name);
 
 		try {
@@ -80,8 +80,8 @@
 		return tab;
 	}
 
-	public static TabContent createNewEmptyTab(String name, NetType netType){
-		TabContent tab = new TabContent(NetType.TAPN);
+	public static TabContent createNewEmptyTab(String name){
+		TabContent tab = new TabContent();
 		tab.setInitialName(name);
 
 		//Set Default Template
@@ -97,7 +97,7 @@
 	 */
 
 	public static TabContent createNewTabFromPNMLFile(File file) throws Exception {
-		TabContent tab = new TabContent(NetType.TAPN);
+		TabContent tab = new TabContent();
 
 		String name = null;
 
@@ -225,7 +225,7 @@
 	
 	private WorkflowDialog workflowDialog = null;
 
-	public TabContent(NetType netType) {
+	public TabContent() {
 		for (TimedArcPetriNet net : tapnNetwork.allTemplates()) {
 			guiModels.put(net, new DataLayer());
 			zoomLevels.put(net, new Zoomer());
@@ -256,7 +256,7 @@
 		drawingSurfaceDummy.add(new JLabel("The net is too big to be drawn"), gc);
 		
 		createEditorLeftPane();
-		createAnimatorSplitPane(netType);
+		createAnimatorSplitPane();
 
 		this.setOrientation(HORIZONTAL_SPLIT);
 		this.setLeftComponent(editorSplitPaneScroller);
@@ -279,9 +279,8 @@
 	}
 	
 	public void createEditorLeftPane() {
-		boolean enableAddButton = getModel() == null ? true : !getModel().netType().equals(NetType.UNTIMED);
 
-		constantsPanel = new ConstantsPane(enableAddButton, this);
+		constantsPanel = new ConstantsPane(this);
 		constantsPanel.setPreferredSize(
 				new Dimension(
 						constantsPanel.getPreferredSize().width,
@@ -507,12 +506,12 @@
         );
 	}
 
-	private void createAnimatorSplitPane(NetType netType) {
+	private void createAnimatorSplitPane() {
 		if (animBox == null) {
             createAnimationHistory();
         }
 		if (animControlerBox == null) {
-            createAnimationController(netType);
+            createAnimationController();
         }
 		if (transitionFireing == null) {
             createTransitionFireing();
@@ -696,8 +695,8 @@
 		animatorSplitPane.validate();
 	}
 
-	private void createAnimationController(NetType netType) {
-		animControlerBox = new AnimationController(netType);
+	private void createAnimationController() {
+		animControlerBox = new AnimationController();
 
 		animationControllerScrollPane = new JScrollPane(animControlerBox);
 		animationControllerScrollPane.setBorder(new EmptyBorder(0, 0, 0, 0));

=== modified file 'src/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java'
--- src/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java	2020-04-18 15:50:17 +0000
+++ src/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java	2020-05-18 07:40:41 +0000
@@ -193,13 +193,8 @@
 			NET.setAttributeNode(netAttrActive);
 
 			Attr netAttrType = document.createAttribute("type");
-			switch (guiModel.netType()) {
-			case UNTIMED:
-				netAttrType.setValue("Untimed P/T net");
-				break;
-			default:
-				netAttrType.setValue("P/T net");
-			}
+			netAttrType.setValue("P/T net");
+
 			NET.setAttributeNode(netAttrType);
 
 			appendAnnotationNotes(document, guiModel, NET);

=== modified file 'src/pipe/dataLayer/DataLayer.java'
--- src/pipe/dataLayer/DataLayer.java	2020-04-18 16:13:35 +0000
+++ src/pipe/dataLayer/DataLayer.java	2020-05-18 07:40:41 +0000
@@ -97,8 +97,6 @@
         return result;
     }
 
-	private NetType type = NetType.TAPN;
-
 	/**
 	 * Create empty Petri-Net object
 	 */
@@ -836,15 +834,7 @@
 		return null;
 	}
 
-	public NetType netType() {
-		return type;
-	}
-
-	public void setNetType(NetType type) {
-		this.type = type;
-	}
-
-	public void redrawVisibleTokenLists() {
+    public void redrawVisibleTokenLists() {
 		for (Place place : placesArray) {
 			if (place instanceof TimedPlaceComponent) {
 				TimedPlaceComponent tp = (TimedPlaceComponent) place;

=== removed file 'src/pipe/dataLayer/NetType.java'
=== modified file 'src/pipe/gui/AnimationController.java'
--- src/pipe/gui/AnimationController.java	2020-04-18 14:41:05 +0000
+++ src/pipe/gui/AnimationController.java	2020-05-18 07:40:41 +0000
@@ -21,7 +21,6 @@
 import javax.swing.border.EmptyBorder;
 import javax.swing.text.AbstractDocument;
 
-import pipe.dataLayer.NetType;
 import pipe.gui.action.GuiAction;
 import net.tapaal.swinghelpers.DecimalOnlyDocumentFilter;
 import dk.aau.cs.gui.components.NonsearchableJComboBox;
@@ -53,7 +52,7 @@
 	JComboBox<String> firermodebox = null;
 	private static final String[] FIRINGMODES = { "Random", "Oldest", "Youngest", "Manual" };
 
-	public AnimationController(NetType netType) {
+	public AnimationController() {
 
 		stepbackwardAction = CreateGui.getAppGui().stepbackwardAction;
 		stepforwardAction = CreateGui.getAppGui().stepforwardAction;
@@ -86,23 +85,22 @@
 		c.gridy = 2;
 		add(animationToolBar, c);
 
-		if (!netType.equals(NetType.UNTIMED)) {
-			JPanel firemode = new JPanel(new FlowLayout(FlowLayout.LEFT));
-
-			JLabel label = new JLabel("Token selection: ");
-
-			firemode.add(label);
-			firemode.add(firermodebox);
-
-			c.weightx = 0.5;
-			c.gridx = 0;
-			c.gridy = 0;
-			add(firemode, c);
-
-			initDelayTimePanel(animationToolBar);
-
-			initDelaySlider();
-		}
+        JPanel firemode = new JPanel(new FlowLayout(FlowLayout.LEFT));
+
+        JLabel label = new JLabel("Token selection: ");
+
+        firemode.add(label);
+        firemode.add(firermodebox);
+
+        c.weightx = 0.5;
+        c.gridx = 0;
+        c.gridy = 0;
+        add(firemode, c);
+
+        initDelayTimePanel(animationToolBar);
+
+        initDelaySlider();
+
                 
 		setBorder(BorderFactory.createCompoundBorder(BorderFactory
 				.createTitledBorder("Simulation Control"), BorderFactory

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2020-04-30 12:51:14 +0000
+++ src/pipe/gui/GuiFrame.java	2020-05-18 07:40:41 +0000
@@ -25,7 +25,6 @@
 import net.tapaal.helpers.Reference.Reference;
 import net.tapaal.swinghelpers.ExtendedJTabbedPane;
 import net.tapaal.swinghelpers.ToggleButtonWithoutText;
-import pipe.dataLayer.NetType;
 import pipe.gui.Pipe.ElementType;
 import pipe.gui.action.GuiAction;
 import pipe.gui.graphicElements.PetriNetObject;
@@ -919,11 +918,7 @@
 			timedPlaceAction.setEnabled(true);
 			timedArcAction.setEnabled(true);
 			inhibarcAction.setEnabled(true);
-			if (!CreateGui.getModel().netType().equals(NetType.UNTIMED)) {
-				transportArcAction.setEnabled(true);
-			} else {
-				transportArcAction.setEnabled(false);
-			}
+			transportArcAction.setEnabled(true);
 
 			annotationAction.setEnabled(true);
 			transAction.setEnabled(true);
@@ -982,10 +977,8 @@
 			showConstantsAction.setEnabled(false);
 			showQueriesAction.setEnabled(false);
 
-			// Only enable this if it is not an untimed net.
-			if (CreateGui.getModel().netType() != NetType.UNTIMED) {
-				timeAction.setEnabled(true);
-			}
+			timeAction.setEnabled(true);
+
 			delayFireAction.setEnabled(true);
 			stepbackwardAction.setEnabled(true);
 			stepforwardAction.setEnabled(true);

=== modified file 'src/pipe/gui/TikZExporter.java'
--- src/pipe/gui/TikZExporter.java	2020-04-18 16:13:35 +0000
+++ src/pipe/gui/TikZExporter.java	2020-05-18 07:40:41 +0000
@@ -8,7 +8,6 @@
 import dk.aau.cs.model.tapn.TimedToken;
 
 import pipe.dataLayer.DataLayer;
-import pipe.dataLayer.NetType;
 import pipe.gui.graphicElements.Arc;
 import pipe.gui.graphicElements.ArcPathPoint;
 import pipe.gui.graphicElements.Place;
@@ -132,13 +131,7 @@
 		String arcLabelPositionString = "\\draw (" + RoundCoordinate(arc.getNameLabel().getXPosition())+ "," + (RoundCoordinate(arc.getNameLabel().getYPosition())*(-1)) + ") node {";
 
 		if (arc instanceof TimedInputArcComponent) {
-            if (net.netType().equals(NetType.UNTIMED)) {
-                if (arc.getWeight().value() > 1) {
-                        arcLabel += arcLabelPositionString + "$" + arc.getWeight().value() + "\\times$}\\;\n";
-                }
-                return arcLabel;
-            }    
-			if (!(arc.getSource() instanceof TimedTransitionComponent)) {
+            if (!(arc.getSource() instanceof TimedTransitionComponent)) {
 				arcLabel = arcLabelPositionString;
                 if (arc.getWeight().value() > 1) {
                         arcLabel += "$" + arc.getWeight().value() + "\\times$\\ ";
@@ -264,7 +257,7 @@
 		
 		String tokensInPlace = "";
 		if (tokens.size() > 0) {
-			if (tokens.size() == 1 && !net.netType().equals(NetType.UNTIMED)) {
+            if (tokens.size() == 1) {
 				tokensInPlace = ", structured tokens={" + tokens.get(0).age().setScale(1) + "},";
 			} else {
 				tokensInPlace = exportMultipleTokens(tokens);
@@ -274,8 +267,7 @@
 	}
 
 	protected String getPlaceInvariantString(Place place) {
-		if (net.netType().equals(NetType.UNTIMED)) return "";
-		String invariant = "";
+        String invariant = "";
 
 		if (!((TimedPlaceComponent) place).getInvariantAsString().contains("inf"))
 			invariant = "$\\mathrm{" + replaceWithMathLatex(((TimedPlaceComponent) place).getInvariantAsString()) + "}$};\n";
@@ -289,16 +281,14 @@
 		out.append(tokens.size());
 
 		out.append("},");
-		if (!net.netType().equals(NetType.UNTIMED)) {
-			out.append("pin=above:{\\{");
-			for (int i = 0; i < tokens.size() - 1; i++) {
-				out.append(tokens.get(i).age().setScale(1));
-				out.append(',');
-			}
-			out.append(tokens.get(tokens.size() - 1).age().setScale(1));
-			out.append("\\}},");
-		}
-		return out.toString();
+        out.append("pin=above:{\\{");
+        for (int i = 0; i < tokens.size() - 1; i++) {
+            out.append(tokens.get(i).age().setScale(1));
+            out.append(',');
+        }
+        out.append(tokens.get(tokens.size() - 1).age().setScale(1));
+        out.append("\\}},");
+        return out.toString();
 	}
 
 	private StringBuffer exportTikZstyle() {
@@ -313,7 +303,7 @@
                 out.append("%% This can be adjusted by tuning the coordinates of the label\n");
 		out.append("\\tikzstyle{arc}=[->,>=stealth,thick]\n");
 
-		if (!net.netType().equals(NetType.UNTIMED)) out.append("\\tikzstyle{transportArc}=[->,>=diamond,thick]\n");
+        out.append("\\tikzstyle{transportArc}=[->,>=diamond,thick]\n");
 		out.append("\\tikzstyle{inhibArc}=[->,>=o,thick]\n");
 
 		out.append("\\tikzstyle{every place}=[minimum size=6mm,thick]\n");

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java	2020-04-18 12:27:02 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java	2020-05-18 07:40:41 +0000
@@ -2,7 +2,6 @@
 
 import java.util.Hashtable;
 
-import pipe.dataLayer.NetType;
 import pipe.gui.CreateGui;
 import pipe.gui.Pipe;
 import pipe.gui.graphicElements.PlaceTransitionObject;
@@ -78,63 +77,61 @@
 		if(CreateGui.getModel() == null) {
 			return;
 		}
-		if (!CreateGui.getModel().netType().equals(NetType.UNTIMED)) {
-			if (inputArc == null)
-				getNameLabel().setText("");
-			else {
-				if (!CreateGui.getApp().showZeroToInfinityIntervals()) {
-					if (inputArc.interval().toString(showConstantNames).equals("[0,inf)")){
-						getNameLabel().setText("");
-					}
-					else {
-						getNameLabel().setText(inputArc.interval().toString(showConstantNames));
-					}					
-				}
-				else {
-					getNameLabel().setText(inputArc.interval().toString(showConstantNames));
-				}
-
-				getNameLabel().setText(getWeight().toString(showConstantNames)+" "+getNameLabel().getText());
-				
-				// Handle constant highlighting
-				boolean focusedConstant = false;
-				boolean isvisible = true;
-				if(inputArc.interval().lowerBound() instanceof ConstantBound){
-					if(((ConstantBound) inputArc.interval().lowerBound()).constant().hasFocus()){
-						focusedConstant = true;
-					}
-					
-					if(!((ConstantBound) inputArc.interval().lowerBound()).constant().getVisible()) {
-						isvisible = false;
-					}
-				}
-				if(inputArc.interval().upperBound() instanceof ConstantBound){
-					if(((ConstantBound) inputArc.interval().upperBound()).constant().hasFocus()){
-						focusedConstant = true;
-					}
-					if(!((ConstantBound) inputArc.interval().upperBound()).constant().getVisible()){
-						isvisible = false;
-					}
-				}
-				if(getWeight() instanceof ConstantWeight){
-					if(((ConstantWeight) getWeight()).constant().hasFocus()){
-						focusedConstant = true;
-					}
-					if(((ConstantWeight) getWeight()).constant().getVisible()){
-						isvisible = false;
-					}									
-				}
-				if(focusedConstant){
-					getNameLabel().setForeground(Pipe.SELECTION_TEXT_COLOUR);
-				}else{
-					getNameLabel().setForeground(Pipe.ELEMENT_TEXT_COLOUR);
-				}
-				pnName.setVisible(isvisible);
-				
-			}
-			this.setLabelPosition();
-		}
-	}
+        if (inputArc == null)
+            getNameLabel().setText("");
+        else {
+            if (!CreateGui.getApp().showZeroToInfinityIntervals()) {
+                if (inputArc.interval().toString(showConstantNames).equals("[0,inf)")){
+                    getNameLabel().setText("");
+                }
+                else {
+                    getNameLabel().setText(inputArc.interval().toString(showConstantNames));
+                }
+            }
+            else {
+                getNameLabel().setText(inputArc.interval().toString(showConstantNames));
+            }
+
+            getNameLabel().setText(getWeight().toString(showConstantNames)+" "+getNameLabel().getText());
+
+            // Handle constant highlighting
+            boolean focusedConstant = false;
+            boolean isvisible = true;
+            if(inputArc.interval().lowerBound() instanceof ConstantBound){
+                if(((ConstantBound) inputArc.interval().lowerBound()).constant().hasFocus()){
+                    focusedConstant = true;
+                }
+
+                if(!((ConstantBound) inputArc.interval().lowerBound()).constant().getVisible()) {
+                    isvisible = false;
+                }
+            }
+            if(inputArc.interval().upperBound() instanceof ConstantBound){
+                if(((ConstantBound) inputArc.interval().upperBound()).constant().hasFocus()){
+                    focusedConstant = true;
+                }
+                if(!((ConstantBound) inputArc.interval().upperBound()).constant().getVisible()){
+                    isvisible = false;
+                }
+            }
+            if(getWeight() instanceof ConstantWeight){
+                if(((ConstantWeight) getWeight()).constant().hasFocus()){
+                    focusedConstant = true;
+                }
+                if(((ConstantWeight) getWeight()).constant().getVisible()){
+                    isvisible = false;
+                }
+            }
+            if(focusedConstant){
+                getNameLabel().setForeground(Pipe.SELECTION_TEXT_COLOUR);
+            }else{
+                getNameLabel().setForeground(Pipe.ELEMENT_TEXT_COLOUR);
+            }
+            pnName.setVisible(isvisible);
+
+        }
+        this.setLabelPosition();
+    }
 
 	public dk.aau.cs.model.tapn.TimedInputArc underlyingTimedInputArc() {
 		return inputArc;

=== modified file 'src/pipe/gui/handler/ArcHandler.java'
--- src/pipe/gui/handler/ArcHandler.java	2020-04-02 09:28:14 +0000
+++ src/pipe/gui/handler/ArcHandler.java	2020-05-18 07:40:41 +0000
@@ -4,7 +4,7 @@
 import java.awt.geom.Point2D;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
-import pipe.dataLayer.NetType;
+
 import pipe.gui.CreateGui;
 import pipe.gui.action.SplitArcAction;
 import pipe.gui.graphicElements.Arc;
@@ -65,7 +65,7 @@
 									e.isAltDown()
                             )
                     );
-				} else if (!CreateGui.getModel().netType().equals(NetType.UNTIMED)) {
+				} else  {
 					((TimedOutputArcComponent) myObject).showTimeIntervalEditor();
 				}
 			} else {

=== modified file 'src/pipe/gui/handler/LabelHandler.java'
--- src/pipe/gui/handler/LabelHandler.java	2020-04-02 09:44:05 +0000
+++ src/pipe/gui/handler/LabelHandler.java	2020-05-18 07:40:41 +0000
@@ -6,7 +6,6 @@
 import javax.swing.SwingUtilities;
 
 import dk.aau.cs.gui.undo.UpdateNameLabelOffsetCommand;
-import pipe.dataLayer.NetType;
 import pipe.gui.CreateGui;
 import pipe.gui.graphicElements.Arc;
 import pipe.gui.graphicElements.NameLabel;
@@ -44,9 +43,7 @@
 			if (CreateGui.getApp().isEditionAllowed()) {
 				if (e.getClickCount() == 2) {
 					Arc arc = (Arc) obj;
-					if (!CreateGui.getModel().netType().equals(NetType.UNTIMED)) {
-						((TimedOutputArcComponent) arc).showTimeIntervalEditor();
-					}
+					((TimedOutputArcComponent) arc).showTimeIntervalEditor();
 				}
 			}
 		}

=== modified file 'src/pipe/gui/handler/TimedArcHandler.java'
--- src/pipe/gui/handler/TimedArcHandler.java	2020-04-02 09:44:05 +0000
+++ src/pipe/gui/handler/TimedArcHandler.java	2020-05-18 07:40:41 +0000
@@ -5,8 +5,6 @@
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 
-import pipe.dataLayer.NetType;
-import pipe.gui.CreateGui;
 import pipe.gui.action.SplitArcAction;
 import pipe.gui.graphicElements.Arc;
 import pipe.gui.graphicElements.tapn.TimedInhibitorArcComponent;
@@ -28,7 +26,7 @@
 
 		if (myObject instanceof TimedInputArcComponent && !(myObject instanceof TimedTransportArcComponent)) {
 
-		    if (!CreateGui.getModel().netType().equals(NetType.UNTIMED) && !(myObject instanceof TimedInhibitorArcComponent)) {
+		    if (!(myObject instanceof TimedInhibitorArcComponent)) {
 				menuItem = new JMenuItem("Properties");
 				menuItem.addActionListener(e1 -> ((TimedInputArcComponent) myObject).showTimeIntervalEditor());
 				popup.insert(menuItem, popupIndex++);

=== modified file 'src/pipe/gui/widgets/ConstantsPane.java'
--- src/pipe/gui/widgets/ConstantsPane.java	2020-05-03 11:28:45 +0000
+++ src/pipe/gui/widgets/ConstantsPane.java	2020-05-18 07:40:41 +0000
@@ -73,7 +73,7 @@
 	Timer timer;
 
 
-	public ConstantsPane(boolean enableAddButton, TabContent currentTab) {
+	public ConstantsPane(TabContent currentTab) {
 		parent = currentTab;
 
 		constantsPanel = new JPanel(new GridBagLayout());
@@ -188,7 +188,7 @@
 		});
 		
 		addConstantsComponents();
-		addConstantsButtons(enableAddButton);
+		addConstantsButtons();
 		
 		constantsList.addFocusListener(new FocusAdapter() {
 			@Override
@@ -291,7 +291,7 @@
 		timer.restart();
 	}
 
-	private void addConstantsButtons(boolean enableAddButton) {
+	private void addConstantsButtons() {
 		editBtn = new JButton("Edit");
 		editBtn.setEnabled(false);
 		editBtn.setToolTipText(toolTipEditConstant);
@@ -318,7 +318,7 @@
 
 		JButton addConstantButton = new JButton("New");
 		addConstantButton.setToolTipText(toolTipNewConstant);
-		addConstantButton.setEnabled(enableAddButton);
+		addConstantButton.setEnabled(true);
 		addConstantButton.addActionListener(e -> showEditConstantDialog(null));
 		gbc = new GridBagConstraints();
 		gbc.gridx = 2;

=== modified file 'src/pipe/gui/widgets/NewTAPNPanel.java'
--- src/pipe/gui/widgets/NewTAPNPanel.java	2020-04-18 12:27:02 +0000
+++ src/pipe/gui/widgets/NewTAPNPanel.java	2020-05-18 07:40:41 +0000
@@ -14,7 +14,6 @@
 import javax.swing.JTextField;
 
 import dk.aau.cs.gui.TabContent;
-import pipe.dataLayer.NetType;
 import pipe.gui.CreateGui;
 import pipe.gui.GuiFrame;
 
@@ -65,7 +64,7 @@
 		gbc.anchor = GridBagConstraints.EAST;
 		buttonPanel.add(cancelButton,gbc);		
 
-		okButton.addActionListener(e -> createNewTAPNBasedOnSelection(nameTextBox.getText(), NetType.TAPN));
+		okButton.addActionListener(e -> createNewTAPNBasedOnSelection(nameTextBox.getText()));
 
 		rootPane.setDefaultButton(okButton);
 		
@@ -83,7 +82,7 @@
 		rootPane.getParent().setVisible(false);
 	}
 
-	protected void createNewTAPNBasedOnSelection(String name, NetType type) {
+	protected void createNewTAPNBasedOnSelection(String name) {
 		if (!name.endsWith(".tapn")) {
 			name = name + ".tapn";
 		}
@@ -96,7 +95,7 @@
 		}
 
 		try {
-			TabContent tab = TabContent.createNewEmptyTab(name, type);
+			TabContent tab = TabContent.createNewEmptyTab(name);
 			CreateGui.openNewTabFromStream(tab);
 		} catch (Exception e) {
 			JOptionPane