Pārlūkot izejas kodu

ObjectControl init

Edgardo Palza 8 gadi atpakaļ
vecāks
revīzija
a52ebcfe67

+ 0 - 6
bin/.gitignore

@@ -1,6 +0,0 @@
-/Images/
-/Interfaces/
-/classes/
-/exceptions/
-/tests/
-/ui/

BIN
bin/Interfaces/CategoryListener.class


BIN
bin/Interfaces/ComparableObject.class


BIN
bin/classes/Category.class


BIN
bin/classes/CpsObject.class


BIN
bin/classes/HolonElement.class


BIN
bin/classes/HolonObject.class


BIN
bin/classes/HolonSwitch.class


BIN
bin/classes/HolonTransformer.class


BIN
bin/classes/Position.class


BIN
bin/exceptions/newException1.class


BIN
bin/tests/Tests1.class


BIN
bin/tests/praktikumHolonsTestMinimal.class


BIN
bin/ui/controller/CategoryController.class


BIN
bin/ui/controller/Control$command.class


BIN
bin/ui/controller/Control.class


BIN
bin/ui/controller/ObjectControl.class


BIN
bin/ui/model/IdCounter.class


BIN
bin/ui/model/Model.class


BIN
bin/ui/model/tests.class


BIN
bin/ui/view/AddElementPopUp.class


BIN
bin/ui/view/AddObjectPopUp.class


BIN
bin/ui/view/GUI$1.class


BIN
bin/ui/view/GUI$2.class


BIN
bin/ui/view/GUI$3.class


BIN
bin/ui/view/GUI$4.class


BIN
bin/ui/view/GUI$5.class


BIN
bin/ui/view/GUI$6.class


BIN
bin/ui/view/GUI.class


BIN
bin/ui/view/Main$1.class


BIN
bin/ui/view/Main.class


+ 2 - 0
src/classes/CpsObject.java

@@ -3,6 +3,7 @@ package classes;
 import java.util.ArrayList;
 
 import Interfaces.ComparableObject;
+import ui.model.IdCounter;
 
 public class CpsObject implements ComparableObject {
 	/* Type of the Object */
@@ -28,6 +29,7 @@ public class CpsObject implements ComparableObject {
 		this.objName = objName;
 		connectedTo = new ArrayList<CpsObject>();
 		position = new Position();
+		id = IdCounter.nextId();
 	}
 	
 	/* Obj type */

+ 10 - 0
src/ui/controller/ObjectControl.java

@@ -1,5 +1,15 @@
 package ui.controller;
 
+import ui.model.*;
+
 public class ObjectControl {
 
+	private Model M;
+	private int ID;
+
+	public ObjectControl(Model model) {
+		this.M = model;
+		ID = IdCounter.nextId();
+	}
+
 }

+ 1 - 0
src/ui/model/Model.java

@@ -55,6 +55,7 @@ public class Model {
 	 *            the objectsOnCanvas to set
 	 */
 	public void setObjectsOnCanvas(ArrayList<CpsObject> objectsOnCanvas) {
+		System.out.println(objectsOnCanvas);
 		this.objectsOnCanvas = objectsOnCanvas;
 	}
 

+ 2 - 0
src/ui/view/GUI.java

@@ -218,6 +218,8 @@ public class GUI implements CategoryListener {
                 			h.setPos((int)canvas.getMousePosition().getX(),(int)canvas.getMousePosition().getY());
                 			canvas.choords.add(h);
                 			canvas.repaint();
+                			
+                			System.out.println(model.getObjectsOnCanvas());
                 			dragging = false;
                 		}
 					} catch (Exception e2) {}