# HG changeset patch # User akahori # Date 1552290337 -32400 # Node ID 9a1d9c99e708dd4df07c6b2e4fbe6f4fbdbbe0d6 # Parent 2ecb3a93b8aeb635582b815c14ad06dcf05e91bc fix Command run to execute diff -r 2ecb3a93b8ae -r 9a1d9c99e708 src/main/java/christie/datagear/LocalDataGearManager.java --- a/src/main/java/christie/datagear/LocalDataGearManager.java Mon Mar 11 16:21:30 2019 +0900 +++ b/src/main/java/christie/datagear/LocalDataGearManager.java Mon Mar 11 16:45:37 2019 +0900 @@ -22,7 +22,7 @@ case PUT: dataGears.setData(cm); - if (waitList.containsKey(cm.key)){//ここもsyncronized? + if (waitList.containsKey(cm.key)){ runCommand(waitList.getAndRemoveCommand(cm.key)); } @@ -33,13 +33,13 @@ case REMOTEPEEK: if (dataGears.containsKey(cm.key)) { cm.setDg(dataGears.getData(cm)); - cm.run(); + cm.execute(); } else { waitList.add(cm); } break; case REPLY: - cm.run(); + cm.execute(); break; } diff -r 2ecb3a93b8ae -r 9a1d9c99e708 src/main/java/christie/datagear/RemoteDataGearManager.java --- a/src/main/java/christie/datagear/RemoteDataGearManager.java Mon Mar 11 16:21:30 2019 +0900 +++ b/src/main/java/christie/datagear/RemoteDataGearManager.java Mon Mar 11 16:45:37 2019 +0900 @@ -89,7 +89,7 @@ public void resolveWaitCommand(String key, DataGear dg) { Command cm = waitList.getAndRemoveCommand(key); cm.setDg(dg); - cm.run(); + cm.execute(); } diff -r 2ecb3a93b8ae -r 9a1d9c99e708 src/main/java/christie/datagear/command/CloseCommand.java --- a/src/main/java/christie/datagear/command/CloseCommand.java Mon Mar 11 16:21:30 2019 +0900 +++ b/src/main/java/christie/datagear/command/CloseCommand.java Mon Mar 11 16:45:37 2019 +0900 @@ -17,7 +17,7 @@ } @Override - public void run() { + public void execute() { connection.close(); } } diff -r 2ecb3a93b8ae -r 9a1d9c99e708 src/main/java/christie/datagear/command/Command.java --- a/src/main/java/christie/datagear/command/Command.java Mon Mar 11 16:21:30 2019 +0900 +++ b/src/main/java/christie/datagear/command/Command.java Mon Mar 11 16:45:37 2019 +0900 @@ -21,7 +21,7 @@ public Class clazz = null;// for remote public Connection connection = null;//for reply - public abstract void run(); + public abstract void execute(); //public abstract void run(Object dataGear); //for remote diff -r 2ecb3a93b8ae -r 9a1d9c99e708 src/main/java/christie/datagear/command/FinishCommand.java --- a/src/main/java/christie/datagear/command/FinishCommand.java Mon Mar 11 16:21:30 2019 +0900 +++ b/src/main/java/christie/datagear/command/FinishCommand.java Mon Mar 11 16:45:37 2019 +0900 @@ -13,7 +13,7 @@ @Override - public void run() { + public void execute() { System.exit(0); } @Override diff -r 2ecb3a93b8ae -r 9a1d9c99e708 src/main/java/christie/datagear/command/RemoteTakeCommand.java --- a/src/main/java/christie/datagear/command/RemoteTakeCommand.java Mon Mar 11 16:21:30 2019 +0900 +++ b/src/main/java/christie/datagear/command/RemoteTakeCommand.java Mon Mar 11 16:45:37 2019 +0900 @@ -32,7 +32,7 @@ } @Override - public void run() { + public void execute() { new ReplyCommand(this).run(); } diff -r 2ecb3a93b8ae -r 9a1d9c99e708 src/main/java/christie/datagear/command/TakeCommand.java --- a/src/main/java/christie/datagear/command/TakeCommand.java Mon Mar 11 16:21:30 2019 +0900 +++ b/src/main/java/christie/datagear/command/TakeCommand.java Mon Mar 11 16:45:37 2019 +0900 @@ -26,7 +26,7 @@ } @Override - public void run() { + public void execute() { setInputs(); }