# HG changeset patch # User Nozomi Teruya # Date 1447684203 -32400 # Node ID 5a9b83c64ddf539671559a1666e262e38814e1e3 # Parent 8c17a9e66cc7a83bdde401357e7585729f19af93 fix gradle file diff -r 8c17a9e66cc7 -r 5a9b83c64ddf build.gradle --- a/build.gradle Fri Jun 19 14:06:10 2015 +0900 +++ b/build.gradle Mon Nov 16 23:30:03 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 { diff -r 8c17a9e66cc7 -r 5a9b83c64ddf src/main/java/alice/daemon/IncomingUdpConnection.java --- a/src/main/java/alice/daemon/IncomingUdpConnection.java Fri Jun 19 14:06:10 2015 +0900 +++ b/src/main/java/alice/daemon/IncomingUdpConnection.java Mon Nov 16 23:30:03 2015 +0900 @@ -73,7 +73,6 @@ getLocalDataSegmentManager().getDataSegmentKey(msg.key).runCommand(cmd); break; case REPLY: - System.out.println("in UDP REPLY"); cmd = manager.getAndRemoveCmd(msg.seq); rData = new ReceiveData(unpacker.getSerializedByteArray(unpacker.readInt())); diff -r 8c17a9e66cc7 -r 5a9b83c64ddf src/main/java/alice/datasegment/ReceiveData.java --- a/src/main/java/alice/datasegment/ReceiveData.java Fri Jun 19 14:06:10 2015 +0900 +++ b/src/main/java/alice/datasegment/ReceiveData.java Mon Nov 16 23:30:03 2015 +0900 @@ -100,7 +100,6 @@ * @return */ public T asClass(Class clazz) {///javasist - System.out.println("in asClass val:" + val + ", MP:" + messagePack + ", zMP:" + zMessagePack); try { if (val != null) { @@ -136,7 +135,6 @@ public byte[] getZMessagePack(){ if (zMessagePack != null){ - System.out.println("have zMessagePack"); return zMessagePack; } else { try { @@ -151,7 +149,6 @@ } public void zip() throws IOException { - System.out.println("in zip"); LinkedList inputs = new LinkedList(); int inputIndex = 0; LinkedList outputs = new LinkedList(); @@ -197,23 +194,12 @@ System.arraycopy(outputs.get(i).array(), 0, zMessagePack, 0 + tmp, outputs.get(i).limit());//limit? remaining? tmp += outputs.get(i).limit(); } - System.out.print("in make zMessagePack2: "); - for (int i = 0; i < zMessagePack.length; i++) { - System.out.print(Integer.toHexString(zMessagePack[i] & 0xff)); - } - System.out.print("\n"); } protected byte[] unzip(byte[] input, int zippedLength) {///read header & unzip int length = input.length; Inflater inflater = new Inflater(); - System.out.print("unziped input: "); - for (int i = 0; i < input.length; i++) { - System.out.print(Integer.toHexString(input[i] & 0xff)); - } - System.out.print("\n"); - byte [] output = new byte [zippedLength];///byteArray for unziped data inflater.setInput(input, 0, length);///set unzip data without header @@ -225,12 +211,6 @@ inflater.reset(); - System.out.print("unziped: "); - for (int i = 0; i < output.length; i++) { - System.out.print(Integer.toHexString(output[i] & 0xff)); - } - System.out.print("\n"); - return output; } diff -r 8c17a9e66cc7 -r 5a9b83c64ddf src/main/java/alice/datasegment/RemoteDataSegmentManager.java --- a/src/main/java/alice/datasegment/RemoteDataSegmentManager.java Fri Jun 19 14:06:10 2015 +0900 +++ b/src/main/java/alice/datasegment/RemoteDataSegmentManager.java Mon Nov 16 23:30:03 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; diff -r 8c17a9e66cc7 -r 5a9b83c64ddf src/main/java/alice/test/topology/aquarium/fx/Aquarium.java --- 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 Mon Nov 16 23:30:03 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(){ diff -r 8c17a9e66cc7 -r 5a9b83c64ddf src/main/java/alice/topology/node/TopologyNodeConfig.java --- 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 Mon Nov 16 23:30:03 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){ + } }