Mercurial > hg > Database > Christie

changeset 36:4479d37c8e53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change put syntax
author Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp>
date Wed, 28 Feb 2018 20:32:36 +0900
parents 6660ebba441e
children b9dd655a54b9
files src/main/java/christie/codegear/CodeGear.java src/main/java/christie/test/Remote/CreateRemotePutTest.java src/main/java/christie/test/Remote/RemotePutTest.java src/main/java/christie/test/RemoteTake/CreateRemoteTakeTest.java src/main/java/christie/test/RemoteTake/RemoteTakeTest.java src/main/java/christie/test/TestLocal/StartTest.java src/main/java/christie/test/TestLocal/TestCodeGear.java
diffstat 7 files changed, 33 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/christie/codegear/CodeGear.java	Sun Feb 18 23:44:15 2018 +0900
+++ b/src/main/java/christie/codegear/CodeGear.java	Wed Feb 28 20:32:36 2018 +0900
@@ -38,7 +38,7 @@
             } else if (field.isAnnotationPresent(Peek.class)) {
                 Peek ano = field.getAnnotation(Peek.class);
                 setPeekCommand("local", field.getName(), new DataGear(field.getType()));
-            } if (field.isAnnotationPresent(TakeFrom.class)) {
+            } else if (field.isAnnotationPresent(TakeFrom.class)) {
                 TakeFrom ano = field.getAnnotation(TakeFrom.class);
                 setTakeCommand(ano.value(), field.getName(), new DataGear(field.getType()));
             } else if (field.isAnnotationPresent(PeekFrom.class)) {
@@ -66,6 +66,26 @@
         return cgm.getDGM(dgmName);
     }
 
+    public void put(String dgmName, String key, Object data){
+        getDGM(dgmName).put(key, data);
+    }
+
+    public void put(String key, Object value){
+        localDGM.put(key, value);
+    }
+
+    public void flip(String dgmName, String key){//ToDo: これ値を編集できるからflipできてない。初期値をflipしたい。
+        for (Field field : this.getClass().getDeclaredFields()) {
+            if (field.getName() == key){
+                try {
+                    getDGM(dgmName).put(key, field.get(this));
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
     public InputDataGear getIdg() {
         return idg;
     }
--- a/src/main/java/christie/test/Remote/CreateRemotePutTest.java	Sun Feb 18 23:44:15 2018 +0900
+++ b/src/main/java/christie/test/Remote/CreateRemotePutTest.java	Wed Feb 28 20:32:36 2018 +0900
@@ -8,7 +8,7 @@
     @Override
     protected void run(CodeGearManager cgm) {//できるだけ並列に走らせるためにStartCodeGearには書かない
         cgm.setup(new RemotePutTest());
-        getDGM("remote").put("count", 1);
-        getDGM("remote").put("cgmID", cgm.cgmID);
+        put("remote","count", 1);
+        put("remote","cgmID", cgm.cgmID);
     }
 }
--- a/src/main/java/christie/test/Remote/RemotePutTest.java	Sun Feb 18 23:44:15 2018 +0900
+++ b/src/main/java/christie/test/Remote/RemotePutTest.java	Wed Feb 28 20:32:36 2018 +0900
@@ -18,7 +18,7 @@
         if (count <= 10){
             System.out.println(cgmID + " : " + count);
             cgm.setup(new RemotePutTest());
-            getDGM("remote").put("count", count + 1);
+            put("remote", "count", count + 1);
         }
     }
 
--- a/src/main/java/christie/test/RemoteTake/CreateRemoteTakeTest.java	Sun Feb 18 23:44:15 2018 +0900
+++ b/src/main/java/christie/test/RemoteTake/CreateRemoteTakeTest.java	Wed Feb 28 20:32:36 2018 +0900
@@ -9,7 +9,7 @@
     @Override
     protected void run(CodeGearManager cgm) {
         cgm.setup(new RemoteTakeTest());
-        getLocalDGM().put("count", 1);
-        getLocalDGM().put("cgmID", cgm.cgmID);
+        put("count", 1);
+        put("cgmID", cgm.cgmID);
     }
 }
--- a/src/main/java/christie/test/RemoteTake/RemoteTakeTest.java	Sun Feb 18 23:44:15 2018 +0900
+++ b/src/main/java/christie/test/RemoteTake/RemoteTakeTest.java	Wed Feb 28 20:32:36 2018 +0900
@@ -18,7 +18,7 @@
         if (count <= 10){
             System.out.println(cgmID + " : " + count);
             cgm.setup(new RemoteTakeTest());
-            getLocalDGM().put("count", count + 1);
+            put("count", count + 1);
         }
     }
 }
--- a/src/main/java/christie/test/TestLocal/StartTest.java	Sun Feb 18 23:44:15 2018 +0900
+++ b/src/main/java/christie/test/TestLocal/StartTest.java	Wed Feb 28 20:32:36 2018 +0900
@@ -16,7 +16,7 @@
     @Override
     protected void run(CodeGearManager cgm) {
         cgm.setup(new TestCodeGear());
-        getLocalDGM().put("hoge", "hoge!");
-        getLocalDGM().put("count", 1);
+        put("hoge", "hoge!");
+        put("count", 1);
     }
 }
--- a/src/main/java/christie/test/TestLocal/TestCodeGear.java	Sun Feb 18 23:44:15 2018 +0900
+++ b/src/main/java/christie/test/TestLocal/TestCodeGear.java	Wed Feb 28 20:32:36 2018 +0900
@@ -8,6 +8,7 @@
 
 
 /**
+ * LocalDGMからPeekとTakeを10回行うテスト
  * Created by e125769 on 12/7/17.
  */
 public class TestCodeGear extends CodeGear {
@@ -23,8 +24,10 @@
 
         if (count != 10){
             cgm.setup(new TestCodeGear());
-            getLocalDGM().put("count", count + 1);
+            put("count", count + 1);
         }
     }
 
 }
+
+