mirrors/ipscan
2
0
Fork 0
mirror of https://github.com/angryip/ipscan.git synced 2025-10-26 11:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

MacApplicationMenu can now be compiled with any version of SWT, so move it to src and get rid of src-platform

Browse Source
This commit is contained in:
Anton Keks 2014-04-26 21:52:05 +03:00
parent 26d5762d19
commit 0c8dc248bb
8 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Ipscan.iml
View File

@ -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" />

1
build.xml
View File

@ -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"/>

0
src-platform/linux/.gitignore vendored
View File

0
src-platform/linux64/.gitignore vendored
View File

0
src-platform/win32/.gitignore vendored
View File

0
src-platform/win64/.gitignore vendored
View File

19
src/net/azib/ipscan/config/ComponentRegistry.java
View File

@ -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);
}
}

5
src-platform/mac/net/azib/ipscan/platform/mac/MacApplicationMenu.java → src/net/azib/ipscan/gui/MacApplicationMenu.java
View File

@ -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;