Merge lp:~danilovesky/workcraft/trunk-bug-1291931 into lp:workcraft

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/VisualDfs.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/VisualDfs.java	2013-12-16 12:01:22 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/VisualDfs.java	2014-04-08 09:35:34 +0000
@@ -227,4 +227,5 @@
 		}
 		return null;
 	}
+	
 }
\ No newline at end of file

=== removed file 'STGPlugin/src/org/workcraft/plugins/stg/ReadArcsComplexityReduction.java'
--- STGPlugin/src/org/workcraft/plugins/stg/ReadArcsComplexityReduction.java	2013-09-16 17:03:15 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/ReadArcsComplexityReduction.java	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-package org.workcraft.plugins.stg;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-
-import org.workcraft.dom.Connection;
-import org.workcraft.plugins.petri.Place;
-
-/*
- *  This class is obsolete as punf has -r option now to replicate the Petri net places sensed by read-arcs.
- *  
- *  @deprecated use -r option of punf instead. 
- */
-@Deprecated
-public class ReadArcsComplexityReduction {
-
-	public static STG reduce (STG source) {
-		STG net = new STG();
-		try
-		{
-			// TODO: doesn't work with multiple instances of the same type  -- unfinished!
-			
-			HashMap<SignalTransition, SignalTransition> oldNewTran = new HashMap<SignalTransition, SignalTransition>();
-
-			for(SignalTransition t : source.getSignalTransitions())
-			{
-				SignalTransition newt = net.createSignalTransition(t.getSignalName());
-				newt.setDirection(t.getDirection());
-				newt.setSignalType(t.getSignalType());
-				oldNewTran.put(t, newt);
-			}
-			
-			// for each place in the original STG ...
-			for (Place p: source.getPlaces()) {
-				// count incoming and outgoing connections for each transition
-				HashMap<SignalTransition, Integer> ins = new HashMap<SignalTransition,Integer>();
-				HashMap<SignalTransition, Integer> outs = new HashMap<SignalTransition,Integer>();
-				
-				for (Connection c: source.getConnections(p)) {
-					if (p==c.getFirst())  {
-						if (!outs.containsKey(c.getSecond()))
-							outs.put((SignalTransition)c.getSecond(),0);
-						outs.put((SignalTransition)c.getSecond(), outs.get((SignalTransition)c.getSecond())+1);
-					}
-					if (p==c.getSecond())  {
-						if (!ins.containsKey(c.getFirst()))
-							ins.put((SignalTransition)c.getFirst(),0);
-						ins.put((SignalTransition)c.getFirst(), ins.get((SignalTransition)c.getFirst())+1);
-					}
-				}
-				
-				HashSet<SignalTransition> trans = new HashSet<SignalTransition>();
-				trans.addAll(ins.keySet());
-				trans.addAll(outs.keySet());
-				
-				HashSet<SignalTransition> readATrans = new HashSet<SignalTransition>();
-				
-				// determine transitions connected as read-arcs
-				for (SignalTransition t: trans) {
-					
-					Integer inc = ins.get(t);
-					Integer outc = outs.get(t);
-					if (inc!=null&&outc!=null&&inc==1&&outc==1) {
-						// this is a read arc
-						readATrans.add(t);
-					}
-				}
-				
-				LinkedList<Connection> cons = new LinkedList<Connection>();
-				
-				// find all connections which are not read-arcs
-				for (Connection c: source.getConnections(p)) {
-					if (!readATrans.contains(c.getFirst())
-						&&!readATrans.contains(c.getSecond()))  {
-						cons.add(c);
-					}
-				}
-				
-				//
-				if (readATrans.size()==0) {
-					// if there are no read-arcs, simply copy all the connections
-					Place newP = net.createPlace();
-					for(Connection c: cons) {
-						if (c.getFirst()==p)
-							net.connect(newP, oldNewTran.get(c.getSecond()));
-						if (c.getSecond()==p)
-							net.connect(oldNewTran.get(c.getFirst()), newP);
-					}
-				} else {
-					// for each read-arc create a place, connect it correspondingly
-					for (SignalTransition t: readATrans) {
-						Place newP = net.createPlace();
-						newP.setTokens(p.getTokens());
-						net.connect(newP, oldNewTran.get(t));
-						net.connect(oldNewTran.get(t), newP);
-						for(Connection c: cons) {
-							if (c.getFirst()==p)
-								net.connect(newP, oldNewTran.get(c.getSecond()));
-							if (c.getSecond()==p)
-								net.connect(oldNewTran.get(c.getFirst()), newP);
-						}
-						
-					}
-				}
-				
-			}
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-		return net;		
-	}
-
-}

=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/VisualSTG.java'
--- STGPlugin/src/org/workcraft/plugins/stg/VisualSTG.java	2014-04-03 15:39:57 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/VisualSTG.java	2014-04-08 09:35:34 +0000
@@ -71,34 +71,38 @@
 
 	@Override
 	public void validateConnection(Node first, Node second)	throws InvalidConnectionException {
-		if (first==second) {
+		if (first == second) {
 			throw new InvalidConnectionException ("Connections are only valid between different objects");
 		}
 		
 		if (first instanceof VisualPlace) {
-			if (second instanceof VisualPlace)
-				throw new InvalidConnectionException ("Arcs between places are not allowed");
-			if (second instanceof VisualConnection)
-				throw new InvalidConnectionException ("Arcs between places and implicit places are not allowed");
+			if (second instanceof VisualPlace) {
+				throw new InvalidConnectionException ("Arcs between places are not allowed");
+			}
+			if (second instanceof VisualConnection) {
+				throw new InvalidConnectionException ("Arcs between places and implicit places are not allowed");
+			}
 		}
 
 		if (first instanceof VisualTransition) {
-			if (second instanceof VisualConnection)
-				if (! (second  instanceof VisualImplicitPlaceArc))
-					throw new InvalidConnectionException ("Only connections with arcs having implicit places are allowed");
+			if ((second instanceof VisualConnection) && !(second  instanceof VisualImplicitPlaceArc)) { 
+				throw new InvalidConnectionException ("Only connections with arcs having implicit places are allowed");
+			}
+			if ((second instanceof VisualTransition) && (getConnection(first, second) != null)) {
+				throw new InvalidConnectionException ("This arc with implicit place already exisits");
+			}
 		}
 
 		if (first instanceof VisualConnection) {
-			if (!(first instanceof VisualImplicitPlaceArc))
-				throw new InvalidConnectionException ("Only connections with arcs having implicit places are allowed");
-			if (second instanceof VisualConnection)
-				throw new InvalidConnectionException ("Arcs between places are not allowed");
-			if (second instanceof VisualPlace)
-				throw new InvalidConnectionException ("Arcs between places are not allowed");
-
-			VisualImplicitPlaceArc con = (VisualImplicitPlaceArc) first;
-			if (con.getFirst() == second || con.getSecond() == second)
-				throw new InvalidConnectionException ("Arc already exists");
+			if (!(first instanceof VisualImplicitPlaceArc)) {
+				throw new InvalidConnectionException ("Only connections with arcs having implicit places are allowed");
+			}
+			if (second instanceof VisualConnection) {
+				throw new InvalidConnectionException ("Arcs between places are not allowed");
+			}
+			if (second instanceof VisualPlace) {
+				throw new InvalidConnectionException ("Arcs between places are not allowed");
+			}
 		}
 	}
 
@@ -182,26 +186,19 @@
 	private void maybeMakeImplicit (VisualPlace place) {
 		final STGPlace stgPlace = (STGPlace)place.getReferencedPlace();
 		if ( stgPlace.isImplicit() ) {
-
 			MathConnection refCon1 = null, refCon2 = null;
-
 			VisualComponent first = (VisualComponent) getPreset(place).iterator().next();
 			VisualComponent second = (VisualComponent) getPostset(place).iterator().next();
-
 			Collection<Connection> connections = new ArrayList<Connection> (getConnections(place));
-			for (Connection con: connections)
-				if (con.getFirst() == place)
+			for (Connection con: connections) {
+				if (con.getFirst() == place) {
 					refCon2 = ((VisualConnection)con).getReferencedConnection();
-				else if (con.getSecond() == place)
+				} else if (con.getSecond() == place) {
 					refCon1 = ((VisualConnection)con).getReferencedConnection();
-
-
+				}
+			}
 			VisualImplicitPlaceArc con = new VisualImplicitPlaceArc(first, second, refCon1, refCon2, (STGPlace)place.getReferencedPlace());
-
-			Hierarchy.getNearestAncestor(
-					Hierarchy.getCommonParent(first, second), Container.class)
-					.add(con);
-
+			Hierarchy.getNearestAncestor(Hierarchy.getCommonParent(first, second), Container.class)	.add(con);
 			remove(place);
 			// connections will get removed automatically by the hanging connection remover
 		}
@@ -243,4 +240,12 @@
 		return null;
 	}
 
+	
+	public Connection getConnection(Node first, Node second) {
+		for(Connection connection : getConnections(first)) {
+			if (connection.getSecond() == second) return connection;
+		}
+		return null;
+	}
+
 }