# HG changeset patch # User Nozomi Teruya # Date 1517309714 -32400 # Node ID d1fc3ebb269e3eca0d74a7d79224819df5d2f03a # Parent da373b25ae064d942300d7fd769ac88438f56b2d minor change diff -r da373b25ae06 -r d1fc3ebb269e src/main/java/christie/annotation/RemotePeek.java --- a/src/main/java/christie/annotation/RemotePeek.java Sat Jan 27 16:41:59 2018 +0900 +++ b/src/main/java/christie/annotation/RemotePeek.java Tue Jan 30 19:55:14 2018 +0900 @@ -8,6 +8,6 @@ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface RemotePeek { - String dsmName(); + String dgmName(); String key(); } diff -r da373b25ae06 -r d1fc3ebb269e src/main/java/christie/annotation/RemoteTake.java --- a/src/main/java/christie/annotation/RemoteTake.java Sat Jan 27 16:41:59 2018 +0900 +++ b/src/main/java/christie/annotation/RemoteTake.java Tue Jan 30 19:55:14 2018 +0900 @@ -12,6 +12,6 @@ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface RemoteTake { - String dsmName(); + String dgmName(); String key(); } \ No newline at end of file diff -r da373b25ae06 -r d1fc3ebb269e src/main/java/christie/codegear/CodeGear.java --- a/src/main/java/christie/codegear/CodeGear.java Sat Jan 27 16:41:59 2018 +0900 +++ b/src/main/java/christie/codegear/CodeGear.java Tue Jan 30 19:55:14 2018 +0900 @@ -39,7 +39,7 @@ setPeekCommand("local", ano.value(), initDataGear(field, ano.value())); } else if (field.isAnnotationPresent(RemoteTake.class)) { RemoteTake ano = field.getAnnotation(RemoteTake.class); - setTakeCommand("local", ano.key(), initDataGear(field, ano.key())); + setTakeCommand(ano.dgmName(), ano.key(), initDataGear(field, ano.key())); } //ToDo:add remote peek } diff -r da373b25ae06 -r d1fc3ebb269e src/main/java/christie/test/RemoteTake/RemoteTakeTest.java --- a/src/main/java/christie/test/RemoteTake/RemoteTakeTest.java Sat Jan 27 16:41:59 2018 +0900 +++ b/src/main/java/christie/test/RemoteTake/RemoteTakeTest.java Tue Jan 30 19:55:14 2018 +0900 @@ -7,10 +7,10 @@ public class RemoteTakeTest extends CodeGear{ - @RemoteTake(dsmName = "remote",key = "hoge") + @RemoteTake(dgmName = "remote",key = "hoge") public DataGear hoge = new DataGear<>(); - @RemoteTake(dsmName = "remote",key = "cgmID") + @RemoteTake(dgmName = "remote",key = "cgmID") public DataGear cgmID = new DataGear<>(); @Override diff -r da373b25ae06 -r d1fc3ebb269e src/main/java/christie/test/TestLocal/TestCodeGear.java --- a/src/main/java/christie/test/TestLocal/TestCodeGear.java Sat Jan 27 16:41:59 2018 +0900 +++ b/src/main/java/christie/test/TestLocal/TestCodeGear.java Tue Jan 30 19:55:14 2018 +0900 @@ -12,7 +12,7 @@ public class TestCodeGear extends CodeGear { @Take("hoge") - public DataGear hoge = new DataGear<>(); + public DataGear hoge = new DataGear<>();//必ずこの書き方でないとエラー public void run(CodeGearManager cgm){ System.out.println(hoge.getData());