pshell/MXSC
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge origin/master

Browse Source
This commit is contained in:
gac-S_Changer
2018-03-16 15:04:23 +01:00
parent 3ccf49f01d 9fe499b765
commit a26f415b4a
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nbactions.xml
View File

@@ -10,9 +10,9 @@
<goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
</goals>
<properties>
<exec.args>-classpath %classpath ch.psi.pshell.ui.App -b -l -dlaf -p=ch.psi.plugin.MainPanel</exec.args>
<exec.args>-classpath %classpath ch.psi.pshell.ui.App -b -l -nlaf -p=ch.psi.mxsc.MainPanel</exec.args>
<exec.executable>java</exec.executable>
<exec.workingdir>../../pshell</exec.workingdir>
<exec.workingdir>../../config/home</exec.workingdir>
</properties>
</action>
@@ -26,10 +26,10 @@
<goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
</goals>
<properties>
<exec.args>-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</exec.args>
<exec.args>-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</exec.args>
<exec.executable>java</exec.executable>
<jpda.listen>true</jpda.listen>
<exec.workingdir>../../pshell</exec.workingdir>
<exec.workingdir>../../config/home</exec.workingdir>
</properties>
</action>
@@ -43,9 +43,9 @@
<goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
</goals>
<properties>
<exec.args>-classpath %classpath ch.psi.pshell.ui.App -b -l -dlaf -p=ch.psi.plugin.MainPanel</exec.args>
<exec.args>-classpath %classpath ch.psi.pshell.ui.App -b -l -nlaf -p=ch.psi.mxsc.MainPanel</exec.args>
<exec.executable>java</exec.executable>
<exec.workingdir>../../pshell</exec.workingdir>
<exec.workingdir>../../config/home</exec.workingdir>
</properties>
</action>

9
pom.xml
View File

@@ -23,7 +23,12 @@
<groupId>ch.psi</groupId>
<artifactId>jcae</artifactId>
<version>2.9.5</version>
</dependency>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>bsread</artifactId>
<version>3.4.4</version>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -60,7 +65,7 @@
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<outputDirectory>../pshell/home/plugins</outputDirectory>
<outputDirectory>../../config/home/plugins</outputDirectory>
</configuration>
</plugin>
</plugins>

2
src/main/java/ch/psi/mxsc/BasePlatePanel.java
View File

@@ -60,7 +60,7 @@ public class BasePlatePanel extends DevicePanel {
Mode mode = Mode.horizontal;
enum Mode {
public enum Mode {
single,
horizontal,
vertical,

4
src/main/java/ch/psi/mxsc/MainPanelTest.java
View File

@@ -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() {