ctdo
/
psychose
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved code into package, added complete maven support for intellij UI Designer and JAR packaging

This commit is contained in:
Lucas Pleß 2014-04-17 19:03:45 +02:00
parent 3086c96bac
commit a6a3666c15
18 changed files with 164 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
healthdisplay/.idea/compiler.xml
View File

@ -25,6 +25,9 @@
<module name="healthdisplay" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="healthdisplay" target="1.7" />
</bytecodeTargetLevel>
</component>
</project>

13
healthdisplay/.idea/libraries/Maven__asm_asm_3_0.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: asm:asm:3.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.0/asm-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.0/asm-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.0/asm-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
healthdisplay/.idea/libraries/Maven__asm_asm_commons_3_0.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: asm:asm-commons:3.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/asm/asm-commons/3.0/asm-commons-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/asm/asm-commons/3.0/asm-commons-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/asm/asm-commons/3.0/asm-commons-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
healthdisplay/.idea/libraries/Maven__asm_asm_tree_3_0.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: asm:asm-tree:3.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/asm/asm-tree/3.0/asm-tree-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/asm/asm-tree/3.0/asm-tree-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/asm/asm-tree/3.0/asm-tree-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
healthdisplay/.idea/libraries/Maven__com_intellij_forms_rt_7_0_3.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.intellij:forms_rt:7.0.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/intellij/forms_rt/7.0.3/forms_rt-7.0.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/intellij/forms_rt/7.0.3/forms_rt-7.0.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/intellij/forms_rt/7.0.3/forms_rt-7.0.3-sources.jar!/" />
</SOURCES>
</library>
</component>

13
healthdisplay/.idea/libraries/Maven__com_jgoodies_forms_1_1_preview.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.jgoodies:forms:1.1-preview">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/jgoodies/forms/1.1-preview/forms-1.1-preview.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/jgoodies/forms/1.1-preview/forms-1.1-preview-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/jgoodies/forms/1.1-preview/forms-1.1-preview-sources.jar!/" />
</SOURCES>
</library>
</component>

13
healthdisplay/.idea/libraries/Maven__jdom_jdom_1_0.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: jdom:jdom:1.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/jdom/jdom/1.0/jdom-1.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/jdom/jdom/1.0/jdom-1.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/jdom/jdom/1.0/jdom-1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

2
healthdisplay/.idea/uiDesigner.xml
View File

@ -119,7 +119,7 @@
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
<item class="ActorDisplay" icon="" removable="true" auto-create-binding="false" can-attach-label="false">
<item class="main.java.de.psychose.ActorDisplay" icon="" removable="true" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="0" />
</item>
</group>

5
healthdisplay/README Normal file
View File

@ -0,0 +1,5 @@
compile with
mvn clean compile ideauidesigner:javac2 assembly:single

10
healthdisplay/healthdisplay.iml
View File

@ -1,16 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.illposed.osc:javaosc-core:0.2" level="project" />
<orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.7.Final" level="project" />
<orderEntry type="library" name="Maven: com.intellij:forms_rt:7.0.3" level="project" />
<orderEntry type="library" name="Maven: asm:asm-commons:3.0" level="project" />
<orderEntry type="library" name="Maven: asm:asm-tree:3.0" level="project" />
<orderEntry type="library" name="Maven: asm:asm:3.0" level="project" />
<orderEntry type="library" name="Maven: com.jgoodies:forms:1.1-preview" level="project" />
<orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
</component>
</module>

37
healthdisplay/pom.xml
View File

@ -20,6 +20,12 @@
<artifactId>netty</artifactId>
<version>3.2.7.Final</version>
</dependency>
<dependency>
<groupId>com.intellij</groupId>
<artifactId>forms_rt</artifactId>
<version>7.0.3</version>
</dependency>
</dependencies>
@ -36,14 +42,23 @@
</repositories>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>MainForm</mainClass>
<mainClass>de.psychose.MainForm</mainClass>
</manifest>
</archive>
<descriptorRefs>
@ -51,6 +66,24 @@
</descriptorRefs>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>ideauidesigner-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>javac2</goal>
</goals>
</execution>
</executions>
<configuration>
<fork>true</fork>
<debug>true</debug>
<failOnError>true</failOnError>
</configuration>
</plugin>
</plugins>
</build>

2
healthdisplay/src/ActorDisplay.form → healthdisplay/src/main/java/de/psychose/ActorDisplay.form
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="ActorDisplay">
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.psychose.ActorDisplay">
<grid id="27dc6" binding="actorPanel" layout-manager="GridLayoutManager" row-count="9" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="4" left="6" bottom="4" right="6"/>
<constraints>

3
healthdisplay/src/ActorDisplay.java → healthdisplay/src/main/java/de/psychose/ActorDisplay.java
View File

@ -1,3 +1,5 @@
package de.psychose;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
@ -126,5 +128,6 @@ public class ActorDisplay {
timer.setRepeats(true);
timer.start();
}
}

2
healthdisplay/src/ChaOSCclient.java → healthdisplay/src/main/java/de/psychose/ChaOSCclient.java
View File

@ -1,3 +1,5 @@
package de.psychose;
import com.illposed.osc.OSCListener;
import com.illposed.osc.OSCMessage;
import com.illposed.osc.OSCPortIn;

19
healthdisplay/src/MainForm.form → healthdisplay/src/main/java/de/psychose/MainForm.form
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="MainForm">
<grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="2" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.psychose.MainForm">
<grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="2" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="5" left="5" bottom="5" right="5"/>
<constraints>
<xy x="20" y="20" width="720" height="576"/>
@ -19,27 +19,32 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
<nested-form id="71726" form-file="/ActorDisplay.form" binding="actor1">
<hspacer id="f912c">
<constraints>
<grid row="0" column="5" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
<nested-form id="bd9b" form-file="de/psychose/ActorDisplay.form" binding="actor1">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
</nested-form>
<nested-form id="a01e1" form-file="/ActorDisplay.form" binding="actor2">
<nested-form id="736bf" form-file="de/psychose/ActorDisplay.form" binding="actor2">
<constraints>
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
</nested-form>
<nested-form id="914d6" form-file="/ActorDisplay.form" binding="actor3">
<nested-form id="7fe82" form-file="de/psychose/ActorDisplay.form" binding="actor3">
<constraints>
<grid row="0" column="4" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
</nested-form>
<hspacer id="8e2fe">
<hspacer id="6a2b8">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
<hspacer id="f912c">
<hspacer id="67192">
<constraints>
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>

6
healthdisplay/src/MainForm.java → healthdisplay/src/main/java/de/psychose/MainForm.java
View File

@ -1,3 +1,5 @@
package de.psychose;
import com.illposed.osc.OSCListener;
import com.illposed.osc.OSCMessage;
@ -82,8 +84,10 @@ public class MainForm {
public static void main(String[] args) {
String host = args.length > 0 ? args[0] : "chaosc";
try {
final ChaOSCclient chaOSCclient = new ChaOSCclient("chaosc", 7110);
final ChaOSCclient chaOSCclient = new ChaOSCclient(host, 7110);
final MainForm mainForm = new MainForm(chaOSCclient);
final JFrame frame = new JFrame("MainForm");

2
healthdisplay/src/Streamer.java → healthdisplay/src/main/java/de/psychose/Streamer.java
View File

@ -1,3 +1,5 @@
package de.psychose;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.*;

2
healthdisplay/src/Test.java → healthdisplay/src/main/java/de/psychose/Test.java
View File

@ -1,3 +1,5 @@
package de.psychose;
import javax.sound.midi.*;
import java.io.File;
import java.util.HashSet;