Simplied the demo code into a single remote main.

Author: nedtwigg

src/matlabcontrol/demo/DemoFrame.java

@@ -68,11 +68,8 @@ public class DemoFrame extends JFrame {
 			RETURN_PANEL_SIZE = new Dimension(PANEL_WIDTH, 250),
 			METHOD_PANEL_SIZE = new Dimension(PANEL_WIDTH, 110 + 28 * ArrayPanel.NUM_ENTRIES),
 			DESCRIPTION_PANE_SIZE = new Dimension(PANEL_WIDTH, 200),
-			COMMAND_PANEL_SIZE = new Dimension(PANEL_WIDTH, METHOD_PANEL_SIZE.height +
-					DESCRIPTION_PANE_SIZE.height),
-			MAIN_PANEL_SIZE = new Dimension(PANEL_WIDTH, CONNECTION_PANEL_SIZE.height +
-					COMMAND_PANEL_SIZE.height +
-					RETURN_PANEL_SIZE.height);
+			COMMAND_PANEL_SIZE = new Dimension(PANEL_WIDTH, METHOD_PANEL_SIZE.height + DESCRIPTION_PANE_SIZE.height),
+			MAIN_PANEL_SIZE = new Dimension(PANEL_WIDTH, CONNECTION_PANEL_SIZE.height + COMMAND_PANEL_SIZE.height + RETURN_PANEL_SIZE.height);
 	//Factory to create proxy
 	private final MatlabProxyFactory _factory;
 
@@ -86,7 +83,7 @@ public class DemoFrame extends JFrame {
 
 	public static BufferedImage getIcon() {
 		try {
-			return ImageIO.read(DemoFrame.class.getResource("/matlabcontrol/demo/icon.png"));
+			return ImageIO.read(DemoFrame.class.getResource("/matlabcontrol/demo/logo_128.png"));
 		} catch (Exception e) {
 			e.printStackTrace();
 			return new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
@@ -190,7 +187,6 @@ public void run() {
 										status = STATUS_CONNECTED_EXISTING;
 									} else {
 										status = STATUS_CONNECTED_LAUNCHED;
-
 									}
 									connectionPanel.setBorder(BorderFactory.createTitledBorder(status));
 

src/matlabcontrol/demo/DemoMain.java

@@ -0,0 +1,41 @@
+/*
+ * Code licensed under new-style BSD (see LICENSE).
+ * All code up to tags/original: Copyright (c) 2013, Joshua Kaplan
+ * All code after tags/original: Copyright (c) 2015, DiffPlug
+ */
+package matlabcontrol.demo;
+
+import java.awt.EventQueue;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import javax.swing.WindowConstants;
+
+public class DemoMain {
+	public static void main(String[] args) {
+		new DemoMain();
+	}
+
+	public DemoMain() {
+		final int closeOperation = isRunningInsideMATLAB() ? WindowConstants.HIDE_ON_CLOSE : WindowConstants.EXIT_ON_CLOSE;
+		EventQueue.invokeLater(new Runnable() {
+			@Override
+			public void run() {
+				DemoFrame frame = new DemoFrame("matlabcontrol demo - Running Inside MATLAB", null);
+				frame.setDefaultCloseOperation(closeOperation);
+				frame.setVisible(true);
+			}
+		});
+	}
+
+	private static boolean isRunningInsideMATLAB() {
+		ClassLoader cl = ClassLoader.getSystemClassLoader();
+		URL[] urls = ((URLClassLoader) cl).getURLs();
+		for (URL url : urls) {
+			if (url.toExternalForm().contains("matlab")) {
+				return true;
+			}
+		}
+		return false;
+	}
+}

src/matlabcontrol/demo/InsideMatlab.java

@@ -6,6 +6,8 @@
 package matlabcontrol.demo;
 
 import java.awt.EventQueue;
+import java.net.URL;
+import java.net.URLClassLoader;
 
 import javax.swing.WindowConstants;
 
@@ -18,10 +20,13 @@
  * @author <a href="mailto:nonother@gmail.com">Joshua Kaplan</a>
  */
 class InsideMatlab {
-	/**
-	 * Launches the demo.
-	 */
-	public InsideMatlab() {
+	public static void main(String[] args) {
+		ClassLoader cl = ClassLoader.getSystemClassLoader();
+		URL[] urls = ((URLClassLoader) cl).getURLs();
+		for (URL url : urls) {
+			System.out.println(url.getFile());
+		}
+
 		EventQueue.invokeLater(new Runnable() {
 			@Override
 			public void run() {

src/matlabcontrol/demo/OSXAppearance.java

@@ -16,10 +16,7 @@
  */
 public class RemoteMain {
 	public static void main(String[] args) {
-		OSXAppearance.applyIfApplicable();
-
 		final String matlabLocation = (args.length == 1 ? args[0] : null);
-
 		EventQueue.invokeLater(new Runnable() {
 			@Override
 			public void run() {