Commit 029e26bb authored by Claes Sjofors's avatar Claes Sjofors

Java flow updated with new attributes

parent a92df731
...@@ -119,6 +119,7 @@ public class Flow { ...@@ -119,6 +119,7 @@ public class Flow {
public static final int eSave_NodeClass_nc_name = 300; public static final int eSave_NodeClass_nc_name = 300;
public static final int eSave_NodeClass_a = 301; public static final int eSave_NodeClass_a = 301;
public static final int eSave_NodeClass_group = 302; public static final int eSave_NodeClass_group = 302;
public static final int eSave_NodeClass_no_con_obstacle = 303;
public static final int eSave_ConClass_cc_name = 400; public static final int eSave_ConClass_cc_name = 400;
public static final int eSave_ConClass_con_type = 401; public static final int eSave_ConClass_con_type = 401;
public static final int eSave_ConClass_corner = 402; public static final int eSave_ConClass_corner = 402;
...@@ -166,6 +167,7 @@ public class Flow { ...@@ -166,6 +167,7 @@ public class Flow {
public static final int eSave_Node_obst_x_left = 1014; public static final int eSave_Node_obst_x_left = 1014;
public static final int eSave_Node_obst_y_high = 1015; public static final int eSave_Node_obst_y_high = 1015;
public static final int eSave_Node_obst_y_low = 1016; public static final int eSave_Node_obst_y_low = 1016;
public static final int eSave_Node_trace_inverted = 1017;
public static final int eSave_Con_x_right = 1100; public static final int eSave_Con_x_right = 1100;
public static final int eSave_Con_x_left = 1101; public static final int eSave_Con_x_left = 1101;
public static final int eSave_Con_y_high = 1102; public static final int eSave_Con_y_high = 1102;
......
...@@ -319,9 +319,11 @@ public class FlowFrame extends JFrame implements JopUtilityIfc { ...@@ -319,9 +319,11 @@ public class FlowFrame extends JFrame implements JopUtilityIfc {
} }
public void closeFlow() { public void closeFlow() {
for ( int i = 0; i < ctx.cmn.a.size(); i++) { if ( ctx != null) {
Object o = ctx.cmn.a.get(i); for ( int i = 0; i < ctx.cmn.a.size(); i++) {
engine.remove( o); Object o = ctx.cmn.a.get(i);
engine.remove( o);
}
} }
session.removeUtility( this); session.removeUtility( this);
} }
......
...@@ -182,6 +182,7 @@ public class FlowNode extends JComponent implements FlowComponent, JopDynamic { ...@@ -182,6 +182,7 @@ public class FlowNode extends JComponent implements FlowComponent, JopDynamic {
case Flow.eSave_Node_obst_x_left: case Flow.eSave_Node_obst_x_left:
case Flow.eSave_Node_obst_y_high: case Flow.eSave_Node_obst_y_high:
case Flow.eSave_Node_obst_y_low: case Flow.eSave_Node_obst_y_low:
case Flow.eSave_Node_trace_inverted:
break; break;
case Flow.eSave_End: case Flow.eSave_End:
end = true; end = true;
......
...@@ -57,6 +57,8 @@ public class FlowNodeClass { ...@@ -57,6 +57,8 @@ public class FlowNodeClass {
case Flow.eSave_NodeClass_group: case Flow.eSave_NodeClass_group:
group = new Integer(token.nextToken()).intValue(); group = new Integer(token.nextToken()).intValue();
break; break;
case Flow.eSave_NodeClass_no_con_obstacle:
break;
case Flow.eSave_End: case Flow.eSave_End:
end = true; end = true;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment