From 0c8dc248bbf62fb746377dadbb63a3095beb156c Mon Sep 17 00:00:00 2001
From: Anton Keks <anton@codeborne.com>
Date: Sat, 26 Apr 2014 21:52:05 +0300
Subject: [PATCH] MacApplicationMenu can now be compiled with any version of
 SWT, so move it to src and get rid of src-platform

---
 Ipscan.iml                                    |  1 -
 build.xml                                     |  1 -
 src-platform/linux/.gitignore                 |  0
 src-platform/linux64/.gitignore               |  0
 src-platform/win32/.gitignore                 |  0
 src-platform/win64/.gitignore                 |  0
 .../azib/ipscan/config/ComponentRegistry.java | 19 +++----------------
 .../azib/ipscan/gui}/MacApplicationMenu.java  |  5 +----
 8 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 src-platform/linux/.gitignore
 delete mode 100644 src-platform/linux64/.gitignore
 delete mode 100644 src-platform/win32/.gitignore
 delete mode 100644 src-platform/win64/.gitignore
 rename {src-platform/mac/net/azib/ipscan/platform/mac => src/net/azib/ipscan/gui}/MacApplicationMenu.java (94%)

diff --git a/Ipscan.iml b/Ipscan.iml
index 895c6862..4e9cd153 100644
--- a/Ipscan.iml
+++ b/Ipscan.iml
@@ -9,7 +9,6 @@
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/ext/vserv-tcpip/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/ext/rocksaw/src/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src-platform/mac" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/ant-bin.linux" />
       <excludeFolder url="file://$MODULE_DIR$/ant-bin.linux64" />
       <excludeFolder url="file://$MODULE_DIR$/ant-bin.mac" />
diff --git a/build.xml b/build.xml
index b46bada9..51a6bab2 100755
--- a/build.xml
+++ b/build.xml
@@ -114,7 +114,6 @@
 			<mkdir dir="@{dest}"/>
 			<javac destdir="@{dest}" debug="@{debug}" source="1.6" target="1.6" optimize="@{optimize}" encoding="UTF-8">
 				<src path="@{path}"/>
-				<src path="@{path}-platform/@{platform}"/>
 				<src path="@{extpath}"/>
 				<classpath>
 					<fileset dir="lib" includes="**/*.jar"/>
diff --git a/src-platform/linux/.gitignore b/src-platform/linux/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/src-platform/linux64/.gitignore b/src-platform/linux64/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/src-platform/win32/.gitignore b/src-platform/win32/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/src-platform/win64/.gitignore b/src-platform/win64/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/net/azib/ipscan/config/ComponentRegistry.java b/src/net/azib/ipscan/config/ComponentRegistry.java
index 0e09a514..50e297a7 100644
--- a/src/net/azib/ipscan/config/ComponentRegistry.java
+++ b/src/net/azib/ipscan/config/ComponentRegistry.java
@@ -29,8 +29,6 @@ import org.picocontainer.defaults.ComponentParameter;
 import org.picocontainer.defaults.ConstantParameter;
 import org.picocontainer.defaults.DefaultPicoContainer;
 
-import java.util.logging.Logger;
-
 /**
  * This class is the dependency injection configuration using the Pico Container.
  * 
@@ -130,8 +128,9 @@ public class ComponentRegistry {
 				new ComponentParameter("mainShell"), new ComponentParameter("mainMenu"),
 				new ComponentParameter("commandsMenu"), anyComponentParameter, new ConstantParameter(container) });
 		container.registerComponentImplementation(MainMenu.ColumnsMenu.class, MainMenu.ColumnsMenu.class,
-				new Parameter[] { new ComponentParameter("mainShell"), anyComponentParameter, anyComponentParameter,
-						anyComponentParameter });
+				new Parameter[] { new ComponentParameter("mainShell"), anyComponentParameter, anyComponentParameter, anyComponentParameter });
+		if (Platform.MAC_OS)
+			container.registerComponentImplementation(MacApplicationMenu.class);
 
 		container.registerComponentImplementation(AboutDialog.class);
 		container.registerComponentImplementation(PreferencesDialog.class);
@@ -152,17 +151,6 @@ public class ComponentRegistry {
 		container.registerComponentImplementation(ToolsActions.ChooseFetchers.class);
 		container.registerComponentImplementation(HelpMenuActions.CheckVersion.class);
 
-		if (Platform.MAC_OS) {
-			// initialize mac-specific stuff
-			try {
-				container.registerComponentImplementation(Class
-						.forName("net.azib.ipscan.platform.mac.MacApplicationMenu"));
-			}
-			catch (Exception e) {
-				Logger.getLogger(getClass().getName()).warning("Cannot initialize MacApplicationMenu: " + e);
-			}
-		}
-
         new PluginLoader().addTo(container);
 	}
 
@@ -184,5 +172,4 @@ public class ComponentRegistry {
 		start();
 		return (CommandLineProcessor) container.getComponentInstance(CommandLineProcessor.class);
 	}
-
 }
diff --git a/src-platform/mac/net/azib/ipscan/platform/mac/MacApplicationMenu.java b/src/net/azib/ipscan/gui/MacApplicationMenu.java
similarity index 94%
rename from src-platform/mac/net/azib/ipscan/platform/mac/MacApplicationMenu.java
rename to src/net/azib/ipscan/gui/MacApplicationMenu.java
index 865350e6..b3e1d161 100644
--- a/src-platform/mac/net/azib/ipscan/platform/mac/MacApplicationMenu.java
+++ b/src/net/azib/ipscan/gui/MacApplicationMenu.java
@@ -1,9 +1,6 @@
-package net.azib.ipscan.platform.mac;
+package net.azib.ipscan.gui;
 
 import net.azib.ipscan.config.Labels;
-import net.azib.ipscan.gui.AboutDialog;
-import net.azib.ipscan.gui.PreferencesDialog;
-import net.azib.ipscan.gui.SelectFetchersDialog;
 import net.azib.ipscan.gui.actions.HelpMenuActions.CheckVersion;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;