# HG changeset patch # User e095732 # Date 1372676523 -32400 # Node ID b77c2c6db85415f97dedb806b0ee4e5d33858b61 # Parent 04a10249b81348bfc06ffc026e823a3d59f15750 minor change diff -r 04a10249b813 -r b77c2c6db854 .settings/org.eclipse.core.resources.prefs --- a/.settings/org.eclipse.core.resources.prefs Thu Feb 07 22:34:46 2013 +0900 +++ b/.settings/org.eclipse.core.resources.prefs Mon Jul 01 20:02:03 2013 +0900 @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +encoding//src/alice/test/topology/aquarium/fx/TopNode.java=UTF-8 encoding//src/example/HelloFXML.java=UTF-8 encoding//src/example/HelloWorld.java=UTF-8 encoding//src/example/LoginDemo.java=UTF-8 diff -r 04a10249b813 -r b77c2c6db854 src/alice/test/topology/aquarium/fx/AddObject.java --- a/src/alice/test/topology/aquarium/fx/AddObject.java Thu Feb 07 22:34:46 2013 +0900 +++ b/src/alice/test/topology/aquarium/fx/AddObject.java Mon Jul 01 20:02:03 2013 +0900 @@ -1,7 +1,5 @@ package alice.test.topology.aquarium.fx; -import java.util.Random; - import alice.codesegment.CodeSegment; import alice.datasegment.CommandType; import alice.datasegment.Receiver; @@ -31,13 +29,15 @@ int objCnt = data1.asInteger(); int mynum = data2.asInteger(); double size = 75; - Random rnd = new Random(); Image img = new Image("fish.jpg"); for (int i = 1;i <= objCnt; i++){ + int u = i * 75; + if (i > 6) u = 75*(12-i); + System.out.println(u); ImageView iv = ImageViewBuilder.create() .fitWidth(size).fitHeight(size) - .translateX(rnd.nextInt(600)) - .translateY(rnd.nextInt(600)) + .translateX(u) + .translateY(75*i) .translateZ(0) .id("FISH"+i) .build(); diff -r 04a10249b813 -r b77c2c6db854 src/alice/test/topology/aquarium/fx/CheckMyName.java --- a/src/alice/test/topology/aquarium/fx/CheckMyName.java Thu Feb 07 22:34:46 2013 +0900 +++ b/src/alice/test/topology/aquarium/fx/CheckMyName.java Mon Jul 01 20:02:03 2013 +0900 @@ -26,7 +26,7 @@ ods.put("local", "mynum", num); ods.put("local", "width", 800); - ods.put("local", "objCnt", 5); + ods.put("local", "objCnt", 12); if (num==0) { new TopNode(); diff -r 04a10249b813 -r b77c2c6db854 src/alice/test/topology/aquarium/fx/TopNode.java --- a/src/alice/test/topology/aquarium/fx/TopNode.java Thu Feb 07 22:34:46 2013 +0900 +++ b/src/alice/test/topology/aquarium/fx/TopNode.java Mon Jul 01 20:02:03 2013 +0900 @@ -21,7 +21,7 @@ int startX = data1.asInteger() * data2.asInteger(); ods.put("local", "startX", startX); - ods.put("local", "CHILDNUM", 0); + ods.put("local", "CHILDNUM", 0);/* int id must no use */ new CalculateMaxSize(); new CountMessage(); new Share("MAXSIZE"); diff -r 04a10249b813 -r b77c2c6db854 src/aquarium/test/local/StartCodeSegment.java --- a/src/aquarium/test/local/StartCodeSegment.java Thu Feb 07 22:34:46 2013 +0900 +++ b/src/aquarium/test/local/StartCodeSegment.java Mon Jul 01 20:02:03 2013 +0900 @@ -8,7 +8,7 @@ @Override public void run() { - ods.put("local", "objCnt", 5); + ods.put("local", "objCnt", 12); ods.put("local", "startX", 0); ods.put("local", "width", 800); ods.put("local", "mynum" ,0);