Mercurial > hg > Database > Christie
changeset 4:605f1b0576c2
change ods.put to dgm.put
| author | Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Wed, 13 Dec 2017 17:35:25 +0900 |
| parents | e3bb0eea73f2 |
| children | 5be6647b87d2 |
| files | src/main/java/christie/codegear/CodeGear.java src/main/java/christie/codegear/OutputDataGear.java src/main/java/christie/datagear/DataGearManager.java src/main/java/christie/datagear/LocalDataGearManager.java src/main/java/christie/datagear/RemoteDataGearManager.java src/main/java/christie/test/StartTest.java |
| diffstat | 6 files changed, 14 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/christie/codegear/CodeGear.java Wed Dec 13 17:24:14 2017 +0900 +++ b/src/main/java/christie/codegear/CodeGear.java Wed Dec 13 17:35:25 2017 +0900 @@ -17,9 +17,11 @@ public OutputDataGear odg = new OutputDataGear(); public ArrayList<Command> commandList = new ArrayList<Command>(); public CodeGearManager cgm; + public DataGearManager dgm; public CodeGear(CodeGearManager cgm){//AnnotationからInputDataGearをセット this.cgm = cgm; + this.dgm = cgm.getDGM("local"); odg.initODG(cgm, this); for (Field field : this.getClass().getDeclaredFields()) {
--- a/src/main/java/christie/codegear/OutputDataGear.java Wed Dec 13 17:24:14 2017 +0900 +++ b/src/main/java/christie/codegear/OutputDataGear.java Wed Dec 13 17:35:25 2017 +0900 @@ -14,11 +14,11 @@ this.cg = cg; } - public void put(String key, Object dg){ - cgm.getDGM("local").put(key, new DataGear(dg)); + public void put(String key, Object data){ + cgm.getDGM("local").put(key, data); } - public void put(String dist, String key, Object dg){ - cgm.getDGM(dist).put(key, new DataGear(dg)); + public void put(String dist, String key, Object data){ + cgm.getDGM(dist).put(key, data); } }
--- a/src/main/java/christie/datagear/DataGearManager.java Wed Dec 13 17:24:14 2017 +0900 +++ b/src/main/java/christie/datagear/DataGearManager.java Wed Dec 13 17:35:25 2017 +0900 @@ -16,7 +16,7 @@ TreeMap<String, DataGear> dataGears = new TreeMap<String, DataGear>(); HashMap<String, Command> waitList = new HashMap<String, Command>(); void take(Command cm); - void put(String key, DataGear data); + void put(String key, Object data); void runCommand(Command cm); void addWaitList(Command command); }
--- a/src/main/java/christie/datagear/LocalDataGearManager.java Wed Dec 13 17:24:14 2017 +0900 +++ b/src/main/java/christie/datagear/LocalDataGearManager.java Wed Dec 13 17:35:25 2017 +0900 @@ -17,10 +17,11 @@ } } - public void put(String key, DataGear data) { - dataGears.put(key, data); + public void put(String key, Object data) { + DataGear dg = new DataGear(data); + dataGears.put(key, dg); if (waitList.containsKey(key)){ - waitList.get(key).dg = data; + waitList.get(key).dg = dg; runCommand(waitList.get(key)); } }
--- a/src/main/java/christie/datagear/RemoteDataGearManager.java Wed Dec 13 17:24:14 2017 +0900 +++ b/src/main/java/christie/datagear/RemoteDataGearManager.java Wed Dec 13 17:35:25 2017 +0900 @@ -10,7 +10,7 @@ } @Override - public void put(String key, DataGear data) { + public void put(String key, Object data) { }
--- a/src/main/java/christie/test/StartTest.java Wed Dec 13 17:24:14 2017 +0900 +++ b/src/main/java/christie/test/StartTest.java Wed Dec 13 17:35:25 2017 +0900 @@ -6,8 +6,8 @@ public static void main(String args[]){ TestCodeGear test = new TestCodeGear(createCGM("first")); - test.odg.put("hoge", "hogehogehoge"); - test.odg.put("huga", 100); + test.dgm.put("hoge", "hogehogehoge"); + test.dgm.put("huga", 100); } }