# HG changeset patch # User one # Date 1359200053 -32400 # Node ID 4930f8daf49d816c9926c3f4841b2ec07f93bb0c # Parent 611b5be7f58ce9513b7a92517c39628ff6f1e2eb add object register CS diff -r 611b5be7f58c -r 4930f8daf49d src/alice/test/topology/aquarium/fx/AddObject.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/alice/test/topology/aquarium/fx/AddObject.java Sat Jan 26 20:34:13 2013 +0900 @@ -0,0 +1,53 @@ +package alice.test.topology.aquarium.fx; + +import example.SetTranslation; + +import alice.codesegment.CodeSegment; +import alice.datasegment.CommandType; +import alice.datasegment.Receiver; +import javafx.collections.ObservableList; +import javafx.scene.Node; +import javafx.scene.paint.Color; +import javafx.scene.shape.Rectangle; + +public class AddObject extends CodeSegment{ + + private Receiver data = ids.create(CommandType.PEEK); + private ObservableList list; + + public AddObject(Aquarium aqua){ + list = aqua.getList(); + data.setKey("local", "objlist"); + } + + @Override + public void run() { + ObjectList objlist = data.asClass(ObjectList.class); + list.addAll(objlist.list); + + } + + public void test(Aquarium aqua){ + ObservableList list = aqua.getList(); + final Rectangle rect = new Rectangle(0, 0, 50, 50); + rect.setArcHeight(20); + rect.setArcWidth(20); + rect.setFill(Color.DODGERBLUE); + + final Rectangle rect1 = new Rectangle(0, 0, 50, 50); + rect1.setArcHeight(20); + rect1.setArcWidth(20); + rect1.setFill(Color.GREEN); + + rect1.setTranslateX(500); + rect1.setTranslateY(500); + new SetTranslation(rect, "image2"); // set + ObjectList objlist = new ObjectList(); + objlist.list.add(rect); + objlist.list.add(rect1); + + list.addAll(objlist.list); + System.out.println(list); + } +} + diff -r 611b5be7f58c -r 4930f8daf49d src/alice/test/topology/aquarium/fx/Aquarium.java --- a/src/alice/test/topology/aquarium/fx/Aquarium.java Sat Jan 26 18:30:34 2013 +0900 +++ b/src/alice/test/topology/aquarium/fx/Aquarium.java Sat Jan 26 20:34:13 2013 +0900 @@ -2,7 +2,6 @@ import java.io.IOException; -import example.AddObject; import example.SetTranslation; import javafx.application.Application; @@ -35,6 +34,8 @@ new SetTranslation(iv, "image1"); Scene scene = new Scene(root); + new AddObject(this); + primaryStage.setScene(scene); primaryStage.setResizable(false); primaryStage.show(); @@ -43,8 +44,6 @@ System.exit(0); } }); - new AddObject(this); - } public static void main(String[] args) { diff -r 611b5be7f58c -r 4930f8daf49d src/alice/test/topology/aquarium/fx/AquariumController.java --- a/src/alice/test/topology/aquarium/fx/AquariumController.java Sat Jan 26 18:30:34 2013 +0900 +++ b/src/alice/test/topology/aquarium/fx/AquariumController.java Sat Jan 26 20:34:13 2013 +0900 @@ -34,18 +34,22 @@ switch (ke.getCode()){ case RIGHT: new UpdateData("image1", new FishData(image.getTranslateX()+10,image.getTranslateY(),image.getTranslateZ())).execute(); + new UpdateData("image2", new FishData(image.getTranslateX()+10,image.getTranslateY(),image.getTranslateZ())).execute(); // rect1.setTranslateX(rect1.getTranslateX()+10.0); break; case LEFT: new UpdateData("image1", new FishData(image.getTranslateX()-10,image.getTranslateY(),image.getTranslateZ())).execute(); + new UpdateData("image2", new FishData(image.getTranslateX()-10,image.getTranslateY(),image.getTranslateZ())).execute(); // rect1.setTranslateX(rect1.getTranslateX()-10.0); break; case UP: new UpdateData("image1", new FishData(image.getTranslateX(),image.getTranslateY()-10,image.getTranslateZ())).execute(); + new UpdateData("image2", new FishData(image.getTranslateX(),image.getTranslateY()-10,image.getTranslateZ())).execute(); // rect1.setTranslateY(rect1.getTranslateY()-10.0); break; case DOWN: new UpdateData("image1", new FishData(image.getTranslateX(),image.getTranslateY()+10,image.getTranslateZ())).execute(); + new UpdateData("image2", new FishData(image.getTranslateX(),image.getTranslateY()+10,image.getTranslateZ())).execute(); // rect1.setTranslateY(rect1.getTranslateY()+10.0); break; default: diff -r 611b5be7f58c -r 4930f8daf49d src/alice/test/topology/aquarium/fx/ObjectList.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/alice/test/topology/aquarium/fx/ObjectList.java Sat Jan 26 20:34:13 2013 +0900 @@ -0,0 +1,11 @@ +package alice.test.topology.aquarium.fx; + +import java.util.ArrayList; +import javafx.scene.shape.Rectangle; +import org.msgpack.annotation.Message; + +@Message +public class ObjectList { + public ArrayList list = new ArrayList(); + public ObjectList(){} +}