ADD diagrams created before epf 1.0 should not mess-up opening those diagram in  epf 1.0 due to meta-model changes. Should maintain the ADD order as it, without switching to WBS order, unless it is created in 1.0
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/DiagramLayoutEditPolicy.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/DiagramLayoutEditPolicy.java
index 1a492cd..4f406b8 100755
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/DiagramLayoutEditPolicy.java
+++ b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/DiagramLayoutEditPolicy.java
@@ -63,12 +63,14 @@
 		
 		// special for ADD
 		EditPart parent = child.getParent();
-		String autolayout = GraphicalDataHelper.getAutoLayoutFlag((ActivityDetailDiagram)(Node)parent.getModel());
 		
-		if(parent instanceof ActivityDetailDiagramEditPart && autolayout != null){
-			GraphicalDataHelper.createProperty(((Node)parent.getModel()).getGraphNode(),
+		if(parent instanceof ActivityDetailDiagramEditPart){
+			String autolayout = GraphicalDataHelper.getAutoLayoutFlag((ActivityDetailDiagram)(Node)parent.getModel());
+			if(autolayout != null){
+				GraphicalDataHelper.createProperty(((Node)parent.getModel()).getGraphNode(),
 					GraphicalDataHelper.PROP_AUTO_LAYOUT, 
-					GraphicalDataHelper.PROP_AUTO_LAYOUT_VALUE_FALSE); 
+					GraphicalDataHelper.PROP_AUTO_LAYOUT_VALUE_FALSE);
+			}
 		}
 		
 		Node node = (Node) child.getModel();