Mercurial > hg > Members > sugi > javafx

changeset 23:b77c2c6db854

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor change
author e095732
date Mon, 01 Jul 2013 20:02:03 +0900
parents 04a10249b813
children 712fee3b7090
files .settings/org.eclipse.core.resources.prefs src/alice/test/topology/aquarium/fx/AddObject.java src/alice/test/topology/aquarium/fx/CheckMyName.java src/alice/test/topology/aquarium/fx/TopNode.java src/aquarium/test/local/StartCodeSegment.java
diffstat 5 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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();
--- 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();
--- 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");
--- 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);