fixes user loading

MillersvilleCS · Mar 31, 2015 · 3b1336c · 3b1336c
1 parent de23708
commit 3b1336c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/src/edu/millersville/cs/bitsplease/model/UMLUserSymbol.java b/src/edu/millersville/cs/bitsplease/model/UMLUserSymbol.java
@@ -104,8 +104,7 @@ public void readExternal(ObjectInput in) throws IOException,
 			ClassNotFoundException {
 		try {
 			identifier.setValue((String) in.readObject());
-			setLayoutX(in.readDouble());
-			setLayoutY(in.readDouble());
+			setOrigin(new Point2D(in.readDouble(),in.readDouble()));
 		} catch (Exception x) {
 			System.err.println("Invalid UML File format");
 		}
@@ -119,7 +118,7 @@ public void readExternal(ObjectInput in) throws IOException,
 	@Override
 	public void writeExternal(ObjectOutput out) throws IOException {
 		out.writeObject(identifier.getValue());
-		out.writeDouble(getLayoutX());
-		out.writeDouble(getLayoutY());
+		out.writeDouble(getX());
+		out.writeDouble(getY());
 	}
 }
diff --git a/src/edu/millersville/cs/bitsplease/view/DocumentViewPane.java b/src/edu/millersville/cs/bitsplease/view/DocumentViewPane.java
@@ -15,7 +15,6 @@
 import javafx.scene.Node;
 import javafx.scene.layout.Pane;
 import edu.millersville.cs.bitsplease.model.UMLClassSymbol;
-import edu.millersville.cs.bitsplease.model.UMLInterfaceSymbol;
 import edu.millersville.cs.bitsplease.model.UMLObjectSymbol;
 import edu.millersville.cs.bitsplease.model.UMLRelationSymbol;
 import edu.millersville.cs.bitsplease.model.UMLSymbol;
@@ -86,16 +85,7 @@ public ArrayList<UMLSymbol> getEntities(){
 	 * @param _entityList List of entities to set on the Document.
 	 */
 	public void setEntities(ArrayList<UMLSymbol> _entityList){
-		_entityList.forEach( uml -> {
-
-			if (uml instanceof UMLClassSymbol){
-				addUMLSymbol((UMLClassSymbol)uml);
-			}else if(uml instanceof UMLRelationSymbol){
-				addUMLSymbol((UMLRelationSymbol)uml);
-			}else if(uml instanceof UMLInterfaceSymbol){
-				addUMLSymbol((UMLInterfaceSymbol)uml);
-			}
-		});
+		_entityList.forEach( uml -> addUMLSymbol(uml));
 	}
 
 	/**