Mercurial > hg > Database > Alice

changeset 551:3841f137cbae dispose

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change remoteTest not compressed
author Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp>
date Fri, 13 Nov 2015 16:07:10 +0900
parents 8c17a9e66cc7
children 550a4557579b
files build.gradle src/main/java/alice/datasegment/RemoteDataSegmentManager.java src/main/java/alice/test/codesegment/remote/RemoteIncrement.java src/main/java/alice/test/codesegment/remote/RemoteStartCodeSegment.java src/main/java/alice/test/topology/aquarium/fx/Aquarium.java src/main/java/alice/topology/node/TopologyNodeConfig.java
diffstat 6 files changed, 11 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Fri Jun 19 14:06:10 2015 +0900
+++ b/build.gradle	Fri Nov 13 16:07:10 2015 +0900
@@ -7,7 +7,7 @@
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 group = 'cr.ie.u_ryukyu.ac.jp'
-version = '1.0'
+version = '1.1'
 
 dependencies {
     compile fileTree(dir: 'lib', include: '*.jar')
@@ -22,7 +22,7 @@
 }
 
 ext {
-    mavenRepository = System.getenv()['HOME']+'/workspace/maven'
+    mavenRepository = System.getenv()['HOME']+'/Development/CR/maven'
 }
 
 uploadArchives {
--- a/src/main/java/alice/datasegment/RemoteDataSegmentManager.java	Fri Jun 19 14:06:10 2015 +0900
+++ b/src/main/java/alice/datasegment/RemoteDataSegmentManager.java	Fri Nov 13 16:07:10 2015 +0900
@@ -18,7 +18,7 @@
 
     public RemoteDataSegmentManager(){}
 
-    public RemoteDataSegmentManager(String connectionKey, final String reverseKey, final String hostName, final int port) {
+    public RemoteDataSegmentManager(final String connectionKey, final String reverseKey, final String hostName, final int port) {
         logger = Logger.getLogger(connectionKey);
         connection = new Connection();
         connection.name = connectionKey;
--- a/src/main/java/alice/test/codesegment/remote/RemoteIncrement.java	Fri Jun 19 14:06:10 2015 +0900
+++ b/src/main/java/alice/test/codesegment/remote/RemoteIncrement.java	Fri Nov 13 16:07:10 2015 +0900
@@ -18,9 +18,9 @@
         if (num == 10) System.exit(0);
 
         RemoteIncrement cs = new RemoteIncrement();
-        cs.num.setKey("compressedremote", "num");
+        cs.num.setKey("remote", "num");
 
-        ods.put("compressedlocal", "num", num);
+        ods.put("local", "num", num);
     }
 
 }
\ No newline at end of file
--- a/src/main/java/alice/test/codesegment/remote/RemoteStartCodeSegment.java	Fri Jun 19 14:06:10 2015 +0900
+++ b/src/main/java/alice/test/codesegment/remote/RemoteStartCodeSegment.java	Fri Nov 13 16:07:10 2015 +0900
@@ -7,8 +7,8 @@
     @Override
     public void run() {
         RemoteIncrement cs = new RemoteIncrement();
-        cs.num.setKey("compressedremote", "num");
+        cs.num.setKey("remote", "num");
 
-        ods.put("compressedlocal", "num", 0);
+        ods.put("local", "num", 0);
     }
 }
\ No newline at end of file
--- a/src/main/java/alice/test/topology/aquarium/fx/Aquarium.java	Fri Jun 19 14:06:10 2015 +0900
+++ b/src/main/java/alice/test/topology/aquarium/fx/Aquarium.java	Fri Nov 13 16:07:10 2015 +0900
@@ -31,7 +31,7 @@
 
     @Override
     public void start(Stage primaryStage) throws IOException {
-        String myName = getParameters().getRaw().get(0); // name
+        final String myName = getParameters().getRaw().get(0); // name
         primaryStage.setTitle("Aquarium "+ myName);
         primaryStage.setResizable(false);
         primaryStage.setOnCloseRequest(new EventHandler<WindowEvent>(){
--- a/src/main/java/alice/topology/node/TopologyNodeConfig.java	Fri Jun 19 14:06:10 2015 +0900
+++ b/src/main/java/alice/topology/node/TopologyNodeConfig.java	Fri Nov 13 16:07:10 2015 +0900
@@ -49,8 +49,10 @@
         for (Class clazz : eventList)
             try {
                 clazz.newInstance();
-            } catch (InstantiationException | IllegalAccessException e) {
+            } catch (InstantiationException e) {
                 e.printStackTrace();
+            } catch(IllegalAccessException e){
+
             }
     }