From f8f738651cc41decca8c649641859ca649d3fc1b Mon Sep 17 00:00:00 2001 From: Alexandre Gobbo Date: Thu, 17 Dec 2015 11:29:13 +0100 Subject: [PATCH] Updating API --- pshell.properties | 16 ---------------- src/main/java/ch/psi/plugin/MainPanel.java | 2 +- src/main/java/ch/psi/plugin/TestPlugin.java | 3 ++- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 pshell.properties diff --git a/pshell.properties b/pshell.properties deleted file mode 100644 index a0bb8ee..0000000 --- a/pshell.properties +++ /dev/null @@ -1,16 +0,0 @@ -#Thu Dec 04 18:06:51 CET 2014 -dataPath={home}/data -logPath={home}/log -logLevel=Info -libraryPath={script}; {script}/site-packages -scriptPath={home}/script -serverPort=-1 -contextPath={home}/context -logDaysToLive=-1 -devicePoolFile={devices}/devices.properties -homePath=./home -deviceUpdateStrategyFile={devices}/update.properties -devicesPath={home}/devices -test=false -sessionsPath={home}/sessions -scriptType=py diff --git a/src/main/java/ch/psi/plugin/MainPanel.java b/src/main/java/ch/psi/plugin/MainPanel.java index a5a56dc..1caf8e2 100644 --- a/src/main/java/ch/psi/plugin/MainPanel.java +++ b/src/main/java/ch/psi/plugin/MainPanel.java @@ -3,7 +3,7 @@ */ package ch.psi.plugin; -import ch.psi.pshell.dev.Device; +import ch.psi.pshell.device.Device; import ch.psi.utils.State; /** diff --git a/src/main/java/ch/psi/plugin/TestPlugin.java b/src/main/java/ch/psi/plugin/TestPlugin.java index 27a6f79..3bf95bd 100644 --- a/src/main/java/ch/psi/plugin/TestPlugin.java +++ b/src/main/java/ch/psi/plugin/TestPlugin.java @@ -4,6 +4,7 @@ package ch.psi.plugin; +import ch.psi.pshell.device.Device; import ch.psi.pshell.ui.Plugin; import ch.psi.utils.State; import ch.psi.utils.swing.SwingUtils; @@ -39,7 +40,7 @@ public class TestPlugin implements Plugin{ @Override public void onInitialize(int runCount){ - panel.setDevice(getDevice("motor")); + panel.setDevice((Device)getDevice("motor")); }