Mercurial > hg > Database > Christie

changeset 34:7b405f622c5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactor code
author Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp>
date Sat, 17 Feb 2018 13:14:22 +0900
parents e7bf1506810c
children 6660ebba441e
files src/main/java/christie/codegear/InputDataGear.java src/main/java/christie/test/Remote/RemotePutTest.java src/main/java/christie/test/Remote/StartRemotePut.java src/main/java/christie/test/RemoteTake/RemoteTakeTest.java src/main/java/christie/test/RemoteTake/StartRemoteTake.java
diffstat 5 files changed, 15 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/christie/codegear/InputDataGear.java	Thu Feb 15 19:08:55 2018 +0900
+++ b/src/main/java/christie/codegear/InputDataGear.java	Sat Feb 17 13:14:22 2018 +0900
@@ -58,30 +58,17 @@
     public void setInputValue(){//Annotationから揃ったInputDataGearの値をキャスト
         for (Field field : cg.getClass().getDeclaredFields()) {
             field.setAccessible(true);
-            if (field.isAnnotationPresent(Take.class)){
-                Take ano = field.getAnnotation(Take.class);
-                setField(field);
-            } else if (field.isAnnotationPresent(Peek.class)){
-                Peek ano = field.getAnnotation(Peek.class);
-                setField(field);
-            }  else if (field.isAnnotationPresent(TakeFrom.class)){
-                TakeFrom ano = field.getAnnotation(TakeFrom.class);
-                setField(field);
-            } else if (field.isAnnotationPresent(PeekFrom.class)){
-                PeekFrom ano = field.getAnnotation(PeekFrom.class);
-                setField(field);
+            if (field.isAnnotationPresent(Take.class) || field.isAnnotationPresent(TakeFrom.class) ||
+                    field.isAnnotationPresent(Peek.class) || field.isAnnotationPresent(PeekFrom.class)){
+                try {
+                    field.set(cg, typeCheck(field.getName()));
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
             }
         }
     }
 
-    public void setField(Field field){
-        try {
-            field.set(cg, typeCheck(field.getName()));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
     public Object typeCheck(String key){
         if (inputValue.get(key).getData() != null){
             return inputValue.get(key).getData();
--- a/src/main/java/christie/test/Remote/RemotePutTest.java	Thu Feb 15 19:08:55 2018 +0900
+++ b/src/main/java/christie/test/Remote/RemotePutTest.java	Sat Feb 17 13:14:22 2018 +0900
@@ -15,11 +15,10 @@
 
     @Override
     protected void run(CodeGearManager cgm) {
-        if (count != 10){
+        if (count <= 10){
             System.out.println(cgmID + " : " + count);
             cgm.setup(new RemotePutTest());
             getDGM("remote").put("count", count + 1);
-            //getDGM("remote").put("cgmID", cgm.cgmID);
         }
     }
 
--- a/src/main/java/christie/test/Remote/StartRemotePut.java	Thu Feb 15 19:08:55 2018 +0900
+++ b/src/main/java/christie/test/Remote/StartRemotePut.java	Sat Feb 17 13:14:22 2018 +0900
@@ -16,11 +16,11 @@
         new StartRemotePut(cgm);
 
         cgm.setup(new CreateRemotePutTest());//この中身をここに直接書くとなぜか通らない
-        cgm.createRemoteDGM("remote", "localhost", 10000);
+        cgm.createRemoteDGM("remote", "localhost", 10001);
 
-        //CodeGearManager cgm2 = createCGM(10001);
-        //cgm2.setup(new RemotePutTest());
-        //cgm2.createRemoteDGM("remote", "localhost", 10000);
+        CodeGearManager cgm2 = createCGM(10001);
+        cgm2.setup(new CreateRemotePutTest());
+        cgm2.createRemoteDGM("remote", "localhost", 10000);
     }
 
 }
--- a/src/main/java/christie/test/RemoteTake/RemoteTakeTest.java	Thu Feb 15 19:08:55 2018 +0900
+++ b/src/main/java/christie/test/RemoteTake/RemoteTakeTest.java	Sat Feb 17 13:14:22 2018 +0900
@@ -15,12 +15,10 @@
 
     @Override
     protected void run(CodeGearManager cgm) {
-        System.out.println(cgmID + " : " + count);
-
         if (count <= 10){
+            System.out.println(cgmID + " : " + count);
             cgm.setup(new RemoteTakeTest());
+            getLocalDGM().put("count", count + 1);
         }
-        getLocalDGM().put("count", count + 1);
-        //getLocalDGM().put("cgmID", cgm.cgmID);
     }
 }
--- a/src/main/java/christie/test/RemoteTake/StartRemoteTake.java	Thu Feb 15 19:08:55 2018 +0900
+++ b/src/main/java/christie/test/RemoteTake/StartRemoteTake.java	Sat Feb 17 13:14:22 2018 +0900
@@ -19,6 +19,6 @@
 
         CodeGearManager cgm2 = createCGM(10001);
         cgm2.createRemoteDGM("remote", "localhost", 10000);
-        cgm2.setup(new RemoteTakeTest());
+        cgm2.setup(new CreateRemoteTakeTest());
     }
 }