MSDlite corrected

apocist · Aug 6, 2014 · 7a380cf · 7a380cf
1 parent 33ea467
commit 7a380cf
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/.classpath b/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="lib" path="lib/MSDlite.jar"/>
+	<classpathentry kind="lib" path="lib/MSDlite.jar" sourcepath="/MAL Signature Designer Lite/src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/lib/MSDlite.jar b/lib/MSDlite.jar
diff --git a/src/com/inverseinnovations/VisualMALSignatureDesigner/BlockWindow.java b/src/com/inverseinnovations/VisualMALSignatureDesigner/BlockWindow.java
@@ -23,6 +23,7 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
+import javax.swing.JTextArea;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
@@ -56,15 +57,16 @@ public void run(){
 				JMenuItem menuItem = new JMenuItem("Generate Script");
 				menuItem.addActionListener(new ActionListener(){
 					public void actionPerformed(ActionEvent e){
-						System.out.println(blocks.getRootNode().createScript(null));
-					}
-				});
-				menu.add(menuItem);
+						final JDialog d = new JDialog(blockFrame, "MSD Script", true);
 
-				menuItem = new JMenuItem("Move Down");
-				menuItem.addActionListener(new ActionListener(){
-					public void actionPerformed(ActionEvent e){
-						blocks.moveNodeDown();
+						JTextArea textArea = new JTextArea(20, 100);
+						JScrollPane textscrollPane = new JScrollPane(textArea);
+						textArea.setEditable(false);
+						textArea.setText(blocks.getRootNode().createScript(null));
+						d.getContentPane().add(textscrollPane, BorderLayout.CENTER);
+
+						d.pack();
+						d.setVisible(true);
 					}
 				});
 				menu.add(menuItem);

diff --git a/src/com/inverseinnovations/VisualMALSignatureDesigner/BuildingBlock/BuildingBlock.java b/src/com/inverseinnovations/VisualMALSignatureDesigner/BuildingBlock/BuildingBlock.java
@@ -144,6 +144,6 @@ public String createScript(String filteronly){
 	 * @return
 	 */
 	public String generateScript(){
-		return null;
+		return "";
 	}
 }
diff --git a/src/com/inverseinnovations/VisualMALSignatureDesigner/Main.java b/src/com/inverseinnovations/VisualMALSignatureDesigner/Main.java
@@ -23,7 +23,7 @@ public Main(){
 
     	//just testing stuff here
     	try {
-            Thread.sleep(300);
+            Thread.sleep(400);
         } catch (InterruptedException e) {}
         //sig.addBackground("#FF33FF"); //Place a black background(honestly not needed)