Merge lp:~yrke/tapaal/tapaal-DatalayerClenup into lp:tapaal

[Kenneth Yrke Jørgensen]

Cleanup in the Datalayer code

[Jiri Srba (srba)]

Why is this on hold?

[Kenneth Yrke Jørgensen (yrke)]

Hi, I changed the status to need review, I forget to set the correct status.

[Jiri Srba (srba)]

Is there something to be tested in particular or is it just deadcode removeal?

[Kenneth Yrke Jørgensen (yrke)]

this just removes unused code,

=== modified file 'src/dk/aau/cs/io/PNMLoader.java'
--- src/dk/aau/cs/io/PNMLoader.java	2015-11-24 07:26:42 +0000
+++ src/dk/aau/cs/io/PNMLoader.java	2018-08-05 16:27:59 +0000
@@ -171,8 +171,6 @@
 			node = node.getNextSibling();
 		}
 		
-		template.guiModel().setDrawable(isNetDrawable());
-		
 		node = first;
 		//We parse the places and transitions first
 		while(node != null){

=== modified file 'src/pipe/dataLayer/DataLayer.java'
--- src/pipe/dataLayer/DataLayer.java	2018-05-04 08:01:39 +0000
+++ src/pipe/dataLayer/DataLayer.java	2018-08-05 16:27:59 +0000
@@ -23,7 +23,7 @@
 import dk.aau.cs.util.Require;
 
 
-public class DataLayer extends Observable implements Cloneable {
+public class DataLayer implements Cloneable {
 
 	/** PNML File Name */
 	public String pnmlName = null;
@@ -46,11 +46,6 @@
 	 */
 	private ArrayList<? extends PetriNetObject> changeArrayList = null;
 
-	/** Used to determine whether the matrixes have been modified */
-	static boolean initialMarkingVectorChanged = true;
-
-	static boolean currentMarkingVectorChanged = true;
-
 	/**
 	 * Hashtable which maps PlaceTransitionObjects to their list of connected
 	 * arcs
@@ -65,9 +60,6 @@
 
 	private NetType type = NetType.TAPN;
 
-	//Is the net too big to be drawn
-	private boolean isDrawable= true;
-	
 	/**
 	 * Create empty Petri-Net object
 	 */
@@ -76,7 +68,6 @@
 		transitionsArray = new ArrayList<Transition>();
 		arcsArray = new ArrayList<Arc>();
 
-		// tapnInhibitorsArray = new ArrayList();
 		labelsArray = new ArrayList<AnnotationNote>();
 
 		// may as well do the hashtable here as well
@@ -96,8 +87,6 @@
 		Require.that(placeInput != null, "input place was null");
 
 		placesArray.add(placeInput);
-		setChanged();
-		notifyObservers(placeInput);
 	}
 
 	/**
@@ -109,8 +98,6 @@
 	 */
 	public void addAnnotation(AnnotationNote labelInput) {
 		labelsArray.add(labelInput);
-		setChanged();
-		notifyObservers(labelInput);
 	}
 
 	/**
@@ -124,8 +111,6 @@
 		Require.that(transitionInput != null, "input transition was null");
 		
 		transitionsArray.add(transitionInput);
-		setChanged();
-		notifyObservers(transitionInput);
 	}
 
 	/**
@@ -236,18 +221,12 @@
 			arcsArray.add(arcInput);
 			addArcToArcsMap(arcInput);
 
-			setChanged();
-
-			// notifyObservers(arcInput.getBounds());
-			notifyObservers(arcInput);
 		}
 	}
 
 	public void addTransportArc(TimedTransportArcComponent transportArc) {
 		arcsArray.add(transportArc);
 		addArcToArcsMap(transportArc);
-		setChanged();
-		notifyObservers();
 	}
 
 	public void addArc(TimedInhibitorArcComponent inhibitorArcInput) {
@@ -292,10 +271,6 @@
 			arcsArray.add(inhibitorArcInput);
 			addInhibitorArcToInhibitorsMap(inhibitorArcInput);
 
-			setChanged();
-
-			// notifyObservers(arcInput.getBounds());
-			notifyObservers(inhibitorArcInput);
 		}
 	}
 
@@ -307,20 +282,15 @@
 	 *            New Arc
 	 * */
 	private void addArcToArcsMap(TimedOutputArcComponent arcInput) {
-		// now we want to add the arc to the list of arcs for it's source and
-		// target
+		// now we want to add the arc to the list of arcs for it's source and target
 		PlaceTransitionObject source = arcInput.getSource();
 		PlaceTransitionObject target = arcInput.getTarget();
 		ArrayList<TimedOutputArcComponent> newList = null;
 
 		if (source != null) {
-			// Pete: Place/Transitions now always moveable
-			// source.setMovable(false);
 			if (arcsMap.get(source) != null) {
-				// System.out.println("adding arc to existing list");
 				arcsMap.get(source).add(arcInput);
 			} else {
-				// System.out.println("creating new arc list");
 				newList = new ArrayList<TimedOutputArcComponent>();
 				newList.add(arcInput);
 				arcsMap.put(source, newList);
@@ -328,31 +298,24 @@
 		}
 
 		if (target != null) {
-			// Pete: Place/Transitions now always moveable
-			// target.setMovable(false);
 			if (arcsMap.get(target) != null) {
-				// System.out.println("adding arc to existing list2");
 				arcsMap.get(target).add(arcInput);
 			} else {
-				// System.out.println("creating new arc list2");
 				newList = new ArrayList<TimedOutputArcComponent>();
 				newList.add(arcInput);
 				arcsMap.put(target, newList);
 			}
 		}
-		// System.out.println("arcsMap size: " + arcsMap.size());
 	}
 
 	/**
 	 * Update the inhibitorsMap hashtable to reflect the new inhibitor arc
 	 * 
-	 * @param arcInput
+	 * @param inhibitorArcInput
 	 *            New Arc
 	 */
 	private void addInhibitorArcToInhibitorsMap(TimedInhibitorArcComponent inhibitorArcInput) {
-		// now we want to add the inhibitor arc to the list of inhibitor arcs
-		// for
-		// it's source and target
+		// now we want to add the inhibitor arc to the list of inhibitor arcs for it's source and target
 		PlaceTransitionObject source = inhibitorArcInput.getSource();
 		PlaceTransitionObject target = inhibitorArcInput.getTarget();
 		ArrayList<TimedInhibitorArcComponent> newList = null;
@@ -376,7 +339,6 @@
 				tapnInhibitorsMap.put(target, newList);
 			}
 		}
-		// System.out.println("inhibitorsMap size: " + inhibitorsMap.size());
 	}
 
 
@@ -424,13 +386,10 @@
 				if (pnObject instanceof PlaceTransitionObject) {
 					if (arcsMap.get(pnObject) != null) {
 
-						// get the list of attached arcs for the object we are
-						// removing
+						// get the list of attached arcs for the object we are removing
 						attachedArcs = arcsMap.get(pnObject);
 
-						// iterate over all the attached arcs, removing them all
-						// Pere: in inverse order!
-						// for (int i=0; i < attachedArcs.size(); i++){
+						// iterate over all the attached arcs, removing them all in inverse order!
 						for (int i = attachedArcs.size() - 1; i >= 0; i--) {
 							try {
 								((Arc) attachedArcs.get(i)).delete();
@@ -446,13 +405,10 @@
 
 					if (tapnInhibitorsMap.get(pnObject) != null) {
 
-						// get the list of attached arcs for the object we are
-						// removing
+						// get the list of attached arcs for the object we are removing
 						attachedArcs = tapnInhibitorsMap.get(pnObject);
 
-						// iterate over all the attached arcs, removing them all
-						// Pere: in inverse order!
-						// for (int i=0; i < attachedArcs.size(); i++){
+						// iterate over all the attached arcs, removing them all in inverse order!
 						for (int i = attachedArcs.size() - 1; i >= 0; i--) {
 							((Arc) attachedArcs.get(i)).delete();
 						}
@@ -535,12 +491,6 @@
 					}
 				} 
 
-				if (didSomething) {
-					setChanged();
-
-					// notifyObservers(pnObject.getBounds());
-					notifyObservers(pnObject);
-				}
 			}
 		} catch (NullPointerException npe) {
 			System.out.println("NullPointerException [debug]\n"
@@ -719,29 +669,10 @@
 		return returnTransition;
 	}
 
-	public Transition getTransitionByNameIgnoreGiven(Transition ignore,
-			String transitionName) {
-		Transition returnTransition = null;
-
-		if (transitionsArray != null) {
-			if (transitionName != null) {
-				for (int i = 0; i < transitionsArray.size(); i++) {
-					if (!transitionsArray.get(i).equals(ignore)) {
-						if (transitionName.equalsIgnoreCase((transitionsArray
-								.get(i)).getName())) {
-							returnTransition = transitionsArray.get(i);
-						}
-					}
-				}
-			}
-		}
-		return returnTransition;
-	}
-
 	/**
 	 * Return the Place called placeName from the Petri-Net
-	 * 
-	 * @param placeId
+	 *
+	 * @param placeID
 	 *            ID of Place object to return
 	 * @return The first Place object found with id equal to placeId
 	 */
@@ -783,24 +714,6 @@
 		return returnPlace;
 	}
 
-	public Place getPlaceByNameIgnoreGiven(Place ignore, String placeName) {
-		Place returnPlace = null;
-
-		if (placesArray != null) {
-			if (placeName != null) {
-				for (int i = 0; i < placesArray.size(); i++) {
-					if (!placesArray.get(i).equals(ignore)) {
-						if (placeName.equalsIgnoreCase((placesArray.get(i))
-								.getName())) {
-							returnPlace = placesArray.get(i);
-						}
-					}
-				}
-			}
-		}
-		return returnPlace;
-	}
-
 	/**
 	 * Return the PlaceTransitionObject called ptoName from the Petri-Net
 	 * 
@@ -821,32 +734,6 @@
 		return null;
 	}
 
-	public boolean hasTAPNInhibitorArcs() { // TODO: Fix this to make it faster
-		for (Arc arc : arcsArray) {
-			if (arc instanceof TimedInhibitorArcComponent) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public boolean hasTransportArcs() {
-		for(Arc arc : arcsArray) {
-			if(arc instanceof TimedTransportArcComponent) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public boolean hasInvariants() {
-		for(Place p : placesArray) {
-			if(!((TimedPlaceComponent)p).underlyingPlace().invariant().equals(TimeInvariant.LESS_THAN_INFINITY))
-				return true;
-		}
-		return false;
-	}
-
 	public NetType netType() {
 		return type;
 	}
@@ -944,13 +831,5 @@
 		
 		return guiModel;
 	}
-
-	public void setDrawable(boolean isDrawable) {
-		this.isDrawable = isDrawable;
-	}
-	
-	public boolean getDrawable(){
-		return isDrawable;
-	}
 	
 }

=== modified file 'src/pipe/gui/Animator.java'
--- src/pipe/gui/Animator.java	2018-04-29 08:38:52 +0000
+++ src/pipe/gui/Animator.java	2018-08-05 16:27:59 +0000
@@ -146,7 +146,6 @@
 		while (transitionIterator.hasNext()) {
 			Transition tempTransition = transitionIterator.next();
 			if (tempTransition.isEnabled(true) || (tempTransition.isDelayEnabledTransition(true) && !isUrgentTransitionEnabled)) {
-				current.notifyObservers();
 				tempTransition.repaint();
 			}
 		}
@@ -162,7 +161,6 @@
 		while (transitionIterator.hasNext()) {
 			Transition tempTransition = transitionIterator.next();
 			if (!(tempTransition.isEnabled(true)) || !tempTransition.isDelayEnabledTransition(true) || (tempTransition.isDelayEnabledTransition(true) && isUrgentTransitionEnabled)) {
-				current.notifyObservers();
 				tempTransition.repaint();
 			}
 		}
@@ -209,7 +207,6 @@
 				Transition tempTransition = transitionIterator.next();
 				tempTransition.setEnabledFalse();
 				tempTransition.setDelayEnabledTransitionFalse();
-				activeGuiModel().notifyObservers();
 				tempTransition.repaint();
 			}
 		}