diff --git a/nbactions.xml b/nbactions.xml index 8a93fef..e64c258 100644 --- a/nbactions.xml +++ b/nbactions.xml @@ -10,9 +10,9 @@ org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - -classpath %classpath ch.psi.pshell.ui.App -b -l -dlaf -p=ch.psi.plugin.MainPanel + -classpath %classpath ch.psi.pshell.ui.App -b -l -nlaf -p=ch.psi.mxsc.MainPanel java - ../../pshell + ../../config/home @@ -26,10 +26,10 @@ org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath ch.psi.pshell.ui.App -b -l -dlaf -p=ch.psi.plugin.MainPanel + -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath ch.psi.pshell.ui.App -b -l -nlaf -p=ch.psi.mxsc.MainPanel java true - ../../pshell + ../../config/home @@ -43,9 +43,9 @@ org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - -classpath %classpath ch.psi.pshell.ui.App -b -l -dlaf -p=ch.psi.plugin.MainPanel + -classpath %classpath ch.psi.pshell.ui.App -b -l -nlaf -p=ch.psi.mxsc.MainPanel java - ../../pshell + ../../config/home diff --git a/pom.xml b/pom.xml index 6f7c210..b81c02b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,12 @@ ch.psi jcae 2.9.5 - + + + ch.psi + bsread + 3.4.4 + UTF-8 @@ -60,7 +65,7 @@ maven-jar-plugin 2.3.1 - ../pshell/home/plugins + ../../config/home/plugins diff --git a/src/main/java/ch/psi/mxsc/BasePlatePanel.java b/src/main/java/ch/psi/mxsc/BasePlatePanel.java index 5d84075..787d1b5 100644 --- a/src/main/java/ch/psi/mxsc/BasePlatePanel.java +++ b/src/main/java/ch/psi/mxsc/BasePlatePanel.java @@ -60,7 +60,7 @@ public class BasePlatePanel extends DevicePanel { Mode mode = Mode.horizontal; - enum Mode { + public enum Mode { single, horizontal, vertical, diff --git a/src/main/java/ch/psi/mxsc/MainPanelTest.java b/src/main/java/ch/psi/mxsc/MainPanelTest.java index 2c585ae..7503366 100644 --- a/src/main/java/ch/psi/mxsc/MainPanelTest.java +++ b/src/main/java/ch/psi/mxsc/MainPanelTest.java @@ -4,6 +4,8 @@ package ch.psi.mxsc; +import ch.psi.mxsc.BasePlatePanel; +import ch.psi.mxsc.Controller; import ch.psi.pshell.device.Device; import ch.psi.pshell.ui.Panel; import ch.psi.utils.swing.SwingUtils; @@ -12,7 +14,7 @@ import java.awt.Component; /** * */ -public class MainPanelTest extends Panel { +class MainPanelTest extends Panel { /** Creates new form Panel */ public MainPanelTest() {