diff --git a/.gitignore b/.gitignore index cacc9aa..d2511ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ /Java/MoppyDesk/nbproject/private/ /Java/MoppyDesk/build/ /Java/MoppyDesk/dist/ +.classpath +.project +*bin/ midicomp *.o diff --git a/Java/MoppyDesk/lib/commons-cli-1.2-javadoc.jar b/Java/MoppyDesk/lib/commons-cli-1.2-javadoc.jar new file mode 100644 index 0000000..1677c89 Binary files /dev/null and b/Java/MoppyDesk/lib/commons-cli-1.2-javadoc.jar differ diff --git a/Java/MoppyDesk/lib/commons-cli-1.2-sources.jar b/Java/MoppyDesk/lib/commons-cli-1.2-sources.jar new file mode 100644 index 0000000..80b9c14 Binary files /dev/null and b/Java/MoppyDesk/lib/commons-cli-1.2-sources.jar differ diff --git a/Java/MoppyDesk/lib/commons-cli-1.2.jar b/Java/MoppyDesk/lib/commons-cli-1.2.jar new file mode 100644 index 0000000..ce4b9ff Binary files /dev/null and b/Java/MoppyDesk/lib/commons-cli-1.2.jar differ diff --git a/Java/MoppyDesk/lib/themidibus.jar b/Java/MoppyDesk/lib/themidibus.jar deleted file mode 100644 index d68ec0c..0000000 Binary files a/Java/MoppyDesk/lib/themidibus.jar and /dev/null differ diff --git a/Java/MoppyDesk/src/moppydesk/MoppyMainWindow.form b/Java/MoppyDesk/src/moppydesk/MoppyMainWindow.form deleted file mode 100644 index f151dfe..0000000 --- a/Java/MoppyDesk/src/moppydesk/MoppyMainWindow.form +++ /dev/null @@ -1,363 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/Java/MoppyDesk/src/moppydesk/MoppyUI.java b/Java/MoppyDesk/src/moppydesk/MoppyUI.java index f630d74..ad87843 100644 --- a/Java/MoppyDesk/src/moppydesk/MoppyUI.java +++ b/Java/MoppyDesk/src/moppydesk/MoppyUI.java @@ -4,27 +4,29 @@ */ package moppydesk; -import org.jdesktop.application.SingleFrameApplication; /** * * @author Sam */ -public class MoppyUI extends SingleFrameApplication{ +public class MoppyUI { MoppySequencer ms = null; - @Override - protected void startup() { - MoppyMainWindow mainWindow = new MoppyMainWindow(this); - show(mainWindow); + MoppyUI instance = null; + + + public MoppyUI() { + MoppyMainWindow mainWindow = new MoppyMainWindow(this); + mainWindow.setVisible(true); } + /** * Main method launching the application. */ public static void main(String[] args) { - launch(MoppyUI.class, args); + new MoppyUI(); } }