update

src/ui/model/Category.java → src/classes/Category.java

@@ -1,76 +1,76 @@
-package ui.model;
-
-import java.util.ArrayList;
-
-import Interfaces.ComparableObject;
-
-public class Category implements ComparableObject{
-	
-	private int id;
-	private ArrayList<CpsObject> objects;
-	private String name;
-	
-	public Category(String name){
-		this.setObjects(new ArrayList<CpsObject>());
-		this.setName(name);
-		id = -1;
-	}
-
-	/**
-	 * @return the objects
-	 */
-	public ArrayList<CpsObject> getObjects() {
-		return objects;
-	}
-
-	/**
-	 * @param objects the objects to set
-	 */
-	public void setObjects(ArrayList<CpsObject> objects) {
-		this.objects = objects;
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name the name to set
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public String getCompareName() {
-		return getName();
-	}
-
-	@Override
-	public int getID() {
-		return id;
-	}
-	
-//	public void addObject(HolonObject toAdd){
-//		objects.add(toAdd);
-//	}
-//	
-//	public void deleteObject(int idx){
-//		objects.remove(idx);
-//	}
-//	
-//	public ArrayList<HolonObject> getObjects(){
-//		return objects;
-//	}
-//	
-//	public void changeName(String name){
-//		this.name = name;
-//	}
-//	
-//	public String getName(){
-//		return name;
-//	}
-}
+package classes;
+
+import java.util.ArrayList;
+
+import Interfaces.ComparableObject;
+
+public class Category implements ComparableObject{
+	
+	private int id;
+	private ArrayList<CpsObject> objects;
+	private String name;
+	
+	public Category(String name){
+		this.setObjects(new ArrayList<CpsObject>());
+		this.setName(name);
+		id = -1;
+	}
+
+	/**
+	 * @return the objects
+	 */
+	public ArrayList<CpsObject> getObjects() {
+		return objects;
+	}
+
+	/**
+	 * @param objects the objects to set
+	 */
+	public void setObjects(ArrayList<CpsObject> objects) {
+		this.objects = objects;
+	}
+
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @param name the name to set
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String getCompareName() {
+		return getName();
+	}
+
+	@Override
+	public int getID() {
+		return id;
+	}
+	
+//	public void addObject(HolonObject toAdd){
+//		objects.add(toAdd);
+//	}
+//	
+//	public void deleteObject(int idx){
+//		objects.remove(idx);
+//	}
+//	
+//	public ArrayList<HolonObject> getObjects(){
+//		return objects;
+//	}
+//	
+//	public void changeName(String name){
+//		this.name = name;
+//	}
+//	
+//	public String getName(){
+//		return name;
+//	}
+}

src/ui/model/CpsObject.java → src/classes/CpsObject.java

@@ -1,4 +1,4 @@
-package ui.model;
+package classes;
 
 import java.util.ArrayList;
 

src/ui/model/HolonElement.java → src/classes/HolonElement.java

@@ -1,4 +1,4 @@
-package ui.model;
+package classes;
 
 public class HolonElement {
 

src/ui/model/HolonObject.java → src/classes/HolonObject.java

@@ -1,4 +1,4 @@
-package ui.model;
+package classes;
 
 import java.util.ArrayList;
 

src/ui/model/HolonSwitch.java → src/classes/HolonSwitch.java

@@ -1,4 +1,4 @@
-package ui.model;
+package classes;
 
 public class HolonSwitch extends CpsObject {
 	/*True, if this wire is working (capable of carrying electricity), else false*/

src/ui/model/HolonTransformer.java → src/classes/HolonTransformer.java

@@ -1,4 +1,4 @@
-package ui.model;
+package classes;
 
 public class HolonTransformer extends CpsObject {
 

src/ui/model/Position.java → src/classes/Position.java

@@ -1,17 +1,17 @@
-package ui.model;
-
-public class Position {
-	public int x;
-	public int y;
-	
-	public Position(int x, int y){
-		this.x = x;
-		this.y = y;
-	}
-	
-	//default Constructor
-	public Position(){
-		this.x = -1;
-		this.y = -1;
-	}
-}
+package classes;
+
+public class Position {
+	public int x;
+	public int y;
+	
+	public Position(int x, int y){
+		this.x = x;
+		this.y = y;
+	}
+	
+	//default Constructor
+	public Position(){
+		this.x = -1;
+		this.y = -1;
+	}
+}