|
@@ -11,9 +11,9 @@ import classes.AbstractCpsObject;
|
|
|
import classes.CpsEdge;
|
|
|
import classes.CpsNode;
|
|
|
import classes.CpsUpperNode;
|
|
|
+import classes.IntermediateCalculationCable;
|
|
|
import classes.ExitCable;
|
|
|
-import classes.ExitCableV2;
|
|
|
-import classes.ExitCableV2.ExitCableState;
|
|
|
+import classes.ExitCable.ExitCableState;
|
|
|
|
|
|
public class VisualRepresentationalState {
|
|
|
private ArrayList<Supplier> supplierList = new ArrayList<Supplier>();
|
|
@@ -23,7 +23,7 @@ public class VisualRepresentationalState {
|
|
|
private ArrayList<DecoratedCable> cableList= new ArrayList<DecoratedCable>();
|
|
|
private ArrayList<DecoratedSwitch> switchList= new ArrayList<DecoratedSwitch>();
|
|
|
private ArrayList<DecoratedGroupNode> groupNodeList= new ArrayList<DecoratedGroupNode>();
|
|
|
- private ArrayList<ExitCableV2> exitCableList= new ArrayList<ExitCableV2>();
|
|
|
+ private ArrayList<ExitCable> exitCableList= new ArrayList<ExitCable>();
|
|
|
|
|
|
//ForFastAccessIndividualGroupNodes:
|
|
|
private HashMap<CpsUpperNode, DecoratedGroupNode> createdGroupNodes;
|
|
@@ -62,7 +62,7 @@ public class VisualRepresentationalState {
|
|
|
HashMap<CpsEdge, CpsUpperNode> inGroupEdges = minimumModel.getInGroupEdges();
|
|
|
createdGroupNodes = new HashMap<CpsUpperNode, DecoratedGroupNode>();
|
|
|
|
|
|
- ArrayList<ExitCable> exitCables = new ArrayList<ExitCable>();
|
|
|
+ ArrayList<IntermediateCalculationCable> exitCables = new ArrayList<IntermediateCalculationCable>();
|
|
|
//createThem
|
|
|
for(CpsUpperNode groupNode : minimumModel.getUppderNodeList()) {
|
|
|
createdGroupNodes.put(groupNode, new DecoratedGroupNode(groupNode));
|
|
@@ -127,7 +127,7 @@ public class VisualRepresentationalState {
|
|
|
for(DecoratedGroupNode dGroupNode: getGroupNodeList()) {
|
|
|
addTreeNode(root, dGroupNode, 1, fastaccess);
|
|
|
}
|
|
|
- for(ExitCable cable : exitCables) {
|
|
|
+ for(IntermediateCalculationCable cable : exitCables) {
|
|
|
createExitEdgesV2(root,cable.getCable() , cable.getInsideObject(),cable.getInsideUpperNode(),cable.getOusideObject(),cable.getOutsideUpperNode(), fastaccess);
|
|
|
}
|
|
|
}
|
|
@@ -185,7 +185,7 @@ public class VisualRepresentationalState {
|
|
|
}
|
|
|
for(NodeInfo info: infoList) {
|
|
|
DecoratedGroupNode group = this.createdGroupNodes.get(info.groupNode);
|
|
|
- ArrayList<ExitCableV2> mylist;
|
|
|
+ ArrayList<ExitCable> mylist;
|
|
|
if(group == null) {
|
|
|
mylist = this.getExitCableList();
|
|
|
}else{
|
|
@@ -195,33 +195,33 @@ public class VisualRepresentationalState {
|
|
|
if(info.previous == Info.Nothing) {
|
|
|
if(info.next == Info.Child) {
|
|
|
state = ExitCableState.DOWN;
|
|
|
- mylist.add(new ExitCableV2(state, insideObject, info.nextGroupNode, cable));
|
|
|
+ mylist.add(new ExitCable(state, insideObject, info.nextGroupNode, cable));
|
|
|
}else if(info.next == Info.Parent) {
|
|
|
state = ExitCableState.UP;
|
|
|
- mylist.add(new ExitCableV2(state, insideObject, ousideObject, cable));
|
|
|
+ mylist.add(new ExitCable(state, insideObject, ousideObject, cable));
|
|
|
}else {
|
|
|
System.out.println("Error in VisualState");
|
|
|
}
|
|
|
}else if(info.previous == Info.Child) {
|
|
|
if(info.next == Info.Child) {
|
|
|
state = ExitCableState.DOWNDOWN;
|
|
|
- mylist.add(new ExitCableV2(state, info.previousGroupNode, info.nextGroupNode, cable));
|
|
|
+ mylist.add(new ExitCable(state, info.previousGroupNode, info.nextGroupNode, cable));
|
|
|
}else if(info.next == Info.Parent) {
|
|
|
state = ExitCableState.DOWNUP;
|
|
|
- mylist.add(new ExitCableV2(state, info.previousGroupNode, ousideObject, cable));
|
|
|
+ mylist.add(new ExitCable(state, info.previousGroupNode, ousideObject, cable));
|
|
|
}else {
|
|
|
state = ExitCableState.DOWN;
|
|
|
- mylist.add(new ExitCableV2(state, info.previousGroupNode, ousideObject, cable));
|
|
|
+ mylist.add(new ExitCable(state, info.previousGroupNode, ousideObject, cable));
|
|
|
}
|
|
|
}else {//(info.previous == Info.Parent)
|
|
|
if(info.next == Info.Child) {
|
|
|
state = ExitCableState.DOWNUP;
|
|
|
- mylist.add(new ExitCableV2(state, info.nextGroupNode, insideObject, cable));
|
|
|
+ mylist.add(new ExitCable(state, info.nextGroupNode, insideObject, cable));
|
|
|
}else if(info.next == Info.Parent) {
|
|
|
System.out.println("Error in VisualState");
|
|
|
}else {
|
|
|
state = ExitCableState.UP;
|
|
|
- mylist.add(new ExitCableV2(state, ousideObject, insideObject, cable));
|
|
|
+ mylist.add(new ExitCable(state, ousideObject, insideObject, cable));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -253,7 +253,7 @@ public class VisualRepresentationalState {
|
|
|
|
|
|
|
|
|
private void addCable(HashMap<AbstractCpsObject, CpsUpperNode> inGroupObjects, DecoratedCable cable,
|
|
|
- DecoratedGroupNode groupNodeFromObject,ArrayList<ExitCable> exitCables) {
|
|
|
+ DecoratedGroupNode groupNodeFromObject,ArrayList<IntermediateCalculationCable> exitCables) {
|
|
|
if(groupNodeFromObject != null) {
|
|
|
boolean isIntern = inGroupObjects.get(cable.getModel().getA()) == inGroupObjects.get(cable.getModel().getB()); //Case null == null is not possible trough before Filtering MinimumModel#addUpperObjects(CpsUpperNode)
|
|
|
if(isIntern) {
|
|
@@ -261,10 +261,10 @@ public class VisualRepresentationalState {
|
|
|
}else {
|
|
|
if(inGroupObjects.get(cable.getModel().getA()) == groupNodeFromObject.getModel() && inGroupObjects.get(cable.getModel().getB()) != groupNodeFromObject.getModel()) {
|
|
|
//addToGroupNode(new ExitCable(cable, groupNodeFromObject.getModel(),inGroupObjects.get(cable.getModel().getB()), cable.getModel().getA(), cable.getModel().getB()), groupNodeFromObject.getExitCableList());
|
|
|
- exitCables.add(new ExitCable(cable, groupNodeFromObject.getModel(),inGroupObjects.get(cable.getModel().getB()), cable.getModel().getA(), cable.getModel().getB()));
|
|
|
+ exitCables.add(new IntermediateCalculationCable(cable, groupNodeFromObject.getModel(),inGroupObjects.get(cable.getModel().getB()), cable.getModel().getA(), cable.getModel().getB()));
|
|
|
}else if(inGroupObjects.get(cable.getModel().getA()) != groupNodeFromObject.getModel() && inGroupObjects.get(cable.getModel().getB()) == groupNodeFromObject.getModel()) {
|
|
|
//addToGroupNode(new ExitCable(cable, groupNodeFromObject.getModel(),inGroupObjects.get(cable.getModel().getA()), cable.getModel().getB(), cable.getModel().getA()), groupNodeFromObject.getExitCableList());
|
|
|
- exitCables.add(new ExitCable(cable, groupNodeFromObject.getModel(),inGroupObjects.get(cable.getModel().getA()), cable.getModel().getB(), cable.getModel().getA()));
|
|
|
+ exitCables.add(new IntermediateCalculationCable(cable, groupNodeFromObject.getModel(),inGroupObjects.get(cable.getModel().getA()), cable.getModel().getB(), cable.getModel().getA()));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -352,7 +352,7 @@ public class VisualRepresentationalState {
|
|
|
}
|
|
|
|
|
|
|
|
|
- public ArrayList<ExitCableV2> getExitCableList() {
|
|
|
+ public ArrayList<ExitCable> getExitCableList() {
|
|
|
return exitCableList;
|
|
|
}
|
|
|
}
|