Index: applications/editors/josm/plugins/ImportImagePlugin/build.xml
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/build.xml (revision 23304)
+++ applications/editors/josm/plugins/ImportImagePlugin/build.xml (revision 23305)
@@ -31,5 +31,5 @@
-
+
@@ -118,5 +118,5 @@
-
+
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageImportPlugin.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageImportPlugin.java (revision 23304)
+++ (revision )
@@ -1,291 +1,0 @@
-package org.openstreetmap.josm.plugins.ImageImportPlugin;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Properties;
-
-import javax.swing.JMenu;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.plugins.Plugin;
-import org.openstreetmap.josm.plugins.PluginInformation;
-
-/**
- * Plugin class.
- * Provides basic routines for plugin installation and provides the plugin properties.
- *
- *
- * @author Christoph Beekmans, Fabian Kowitz, Anna Robaszkiewicz, Oliver Kuhn, Martin Ulitzny
- *
- */
-public class ImageImportPlugin extends Plugin{
-
- private static Logger logger;
-
- JMenu mainmenu = null;
- JosmAction loadFileAction = null;
-
- // custom Classloader
- static ClassLoader pluginClassLoader;
-
- // plugin proerties
- static Properties pluginProps;
-
- // path constants
- static final String PLUGIN_DIR = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImageImportPlugin/";
- static final String PLUGINPROPERTIES_PATH = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImageImportPlugin/pluginProperties.properties";
- static final String PLUGINLIBRARIES_DIR = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImageImportPlugin/lib/";
- static final String PLUGINPROPERTIES_FILENAME = "pluginProperties.properties";
- static final String LOGGING_PROPERTIES_FILEPATH = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImageImportPlugin/log4j.properties/";
-
-
- public Properties getPluginProps() {
- return pluginProps;
- }
-
-
- /**
- * constructor
- *
- * @param info
- */
- public ImageImportPlugin(PluginInformation info){
- super(info);
-
- try {
-
- // First create custom ClassLoader to load resources from the main JAR
- pluginClassLoader = createPluginClassLoader();
-
- // Initialize logger
- initializeLogger(pluginClassLoader);
-
- // Check whether plugin has already been installed. Otherwise install
- checkInstallation();
-
- // If resources are available load properties from plugin directory
- if(pluginProps == null || pluginProps.isEmpty())
- {
- pluginProps = new Properties();
- pluginProps.load(new File(PLUGINPROPERTIES_PATH).toURI().toURL().openStream());
- logger.debug("Plugin properties loaded");
- }
-
- /* Change class path:
- * Use java reflection methods to add URLs to the class-path.
- * Changes take effect when calling methods of other plugin classes
- * (new threads)
- * */
- URLClassLoader sysLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
- String[] libraryNames = pluginProps.getProperty("libraries").split(",");
- Class sysclass = URLClassLoader.class;
- Method method = sysclass.getDeclaredMethod("addURL", new Class[]{URL.class});
- method.setAccessible(true);
- for (int i = 0; i < libraryNames.length; i++) {
- File library = new File(PLUGINLIBRARIES_DIR + "/" + libraryNames[i]);
- method.invoke(sysLoader, new Object[]{library.toURI().toURL()});
- }
-
-
- // load information about supported reference systems
- PluginOperations.loadCRSData(pluginProps);
-
- // create new Action for menu entry
- LoadImageAction loadFileAction = new LoadImageAction();
- loadFileAction.setEnabled(true);
-
- // add menu entries
- Main.main.menu.fileMenu.insert(loadFileAction, 8);
- Main.main.menu.fileMenu.insertSeparator(9);
-
-
- } catch (Exception e) {
- logger.fatal("Error while loading plugin", e);
- try {
- throw e;
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
-
- logger.info("Plugin successfully loaded.");
-
- }
-
-
-
- /**
- * Checks whether plugin resources are available.
- * If not, start install procedure.
- *
- * @throws IOException
- */
- private void checkInstallation() throws IOException
- {
-
- // check plugin resource state
- boolean isInstalled = true;
- if(!new File(PLUGINPROPERTIES_PATH).exists()
- || !new File(PLUGIN_DIR).exists()
- || !new File(PLUGINLIBRARIES_DIR).exists())
- isInstalled = false;
-
-
- // if properties file doesn't exist, install plugin
- if(!isInstalled)
- {
-
- /*----------- Begin installation ---------------*/
-
- // check if plugin directory exist
- File pluginDir = new File(PLUGIN_DIR);
- if(!pluginDir.exists()){
- pluginDir.mkdir();
- }
-
- // check if "lib" directory exist
- File libDir = new File(PLUGINLIBRARIES_DIR);
- if(!libDir.exists()){
- libDir.mkdir();
- }
-
- // create local properties file
- if(pluginProps == null || pluginProps.isEmpty()){
-
- FileWriter fw = new FileWriter(new File(PLUGINPROPERTIES_PATH));
- URL propertiesURL = pluginClassLoader.getResource("resources/" + PLUGINPROPERTIES_FILENAME);
- pluginProps = new Properties();
- pluginProps.load(propertiesURL.openStream());
- pluginProps.store(fw, null);
- fw.close();
- logger.debug("Plugin properties loaded");
- }
-
- if(!new File(LOGGING_PROPERTIES_FILEPATH).exists())
- {
- FileWriter fw = new FileWriter(new File(LOGGING_PROPERTIES_FILEPATH));
- URL propertiesURL = pluginClassLoader.getResource("resources/log4j.properties");
- Properties loggingProps = new Properties();
- loggingProps.load(propertiesURL.openStream());
- loggingProps.store(fw, null);
- fw.close();
- logger.debug("Logging properties created");
- }
-
-
- // Copy all needed JAR files to $PLUGIN_DIR$/lib/
- String[] libStrings = pluginProps.getProperty("libraries").split(",");
-
- for (int i = 0; i < libStrings.length; i++) {
-
- URL url = pluginClassLoader.getResource("lib/" + libStrings[i]);
-
- FileOutputStream out = null;
-
- try{
- out = new FileOutputStream(new File(libDir, libStrings[i]));
- } catch (FileNotFoundException e) {
- break;
- }
-
- BufferedInputStream in = null;
- try
- {
- in = new BufferedInputStream(url.openStream());
-
- byte[] buffer = new byte[1024];
- while (true)
- {
- int count = in.read(buffer);
- if (count == -1)
- break;
- out.write(buffer, 0, count);
- }
- }
- finally
- {
- if (in != null)
- in.close();
- }
- }
- logger.debug("Plugin successfully installed");
- }
- }
-
-
- /**
- * Initialize logger using plugin classloader.
- *
- * @param cl
- */
- private void initializeLogger(ClassLoader cl) {
-
- Properties props = new Properties();
- try {
- props.load(new File(LOGGING_PROPERTIES_FILEPATH).toURI().toURL().openStream());
-
- // Set file for logging here:
- props.setProperty("log4j.appender.MyRoFiAppender.file",
- (Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImageImportPlugin/" + "log.log"));
-
- PropertyConfigurator.configure(props);
-
- logger = Logger.getLogger(ImageImportPlugin.class);
-
- logger.info("Logger successfully initialized.");
-
- return;
-
- } catch (IOException e) {
- System.out.println("Logging properties file not found. Using standard settings.");
- }
-
- // if no log4j.properties file can be found, initialize manually:
-
- props.setProperty("log4j.rootLogger", "INFO, A");
- props.setProperty("log4j.appender.A", "org.apache.log4j.FileAppender");
-
- props.setProperty("log4j.appender.A.layout",
- "org.apache.log4j.PatternLayout ");
- props.setProperty("log4j.appender.A.layout.ConversionPattern",
- "%d{ISO8601} %-5p [%t] %c: %m%n");
-
- // Set file for logging here:
- props.setProperty("log4j.appender.A.file",
- (Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImageImportPlugin/" + "log.log"));
-
- PropertyConfigurator.configure(props);
- logger = Logger.getLogger(ImageImportPlugin.class);
- logger.info("Logger successfully initialized with standard settings.");
-
- }
-
- /**
- * get a plugin-specific classloader.
- *
- * @return
- * @throws MalformedURLException
- */
- private ClassLoader createPluginClassLoader() throws MalformedURLException
- {
- ClassLoader loader = null;
- loader = URLClassLoader.newInstance(
- new URL[] { new File(Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin.jar").toURI().toURL()},
- ImageImportPlugin.class.getClassLoader()
- );
-
- return loader;
- }
-
-}
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (revision 23304)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (revision 23305)
@@ -1,3 +1,3 @@
-package org.openstreetmap.josm.plugins.ImageImportPlugin;
+package org.openstreetmap.josm.plugins.ImportImagePlugin;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -81,5 +81,5 @@
this.imageFile = file;
this.image = (BufferedImage) createImage();
- layericon = new ImageIcon(ImageImportPlugin.pluginClassLoader.getResource("images/layericon.png"));
+ layericon = new ImageIcon(ImportImagePlugin.pluginClassLoader.getResource("images/layericon.png"));
}
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (revision 23305)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (revision 23305)
@@ -0,0 +1,291 @@
+package org.openstreetmap.josm.plugins.ImportImagePlugin;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Properties;
+
+import javax.swing.JMenu;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginInformation;
+
+/**
+ * Plugin class.
+ * Provides basic routines for plugin installation and provides the plugin properties.
+ *
+ *
+ * @author Christoph Beekmans, Fabian Kowitz, Anna Robaszkiewicz, Oliver Kuhn, Martin Ulitzny
+ *
+ */
+public class ImportImagePlugin extends Plugin{
+
+ private static Logger logger;
+
+ JMenu mainmenu = null;
+ JosmAction loadFileAction = null;
+
+ // custom Classloader
+ static ClassLoader pluginClassLoader;
+
+ // plugin proerties
+ static Properties pluginProps;
+
+ // path constants
+ static final String PLUGIN_DIR = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/";
+ static final String PLUGINPROPERTIES_PATH = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/pluginProperties.properties";
+ static final String PLUGINLIBRARIES_DIR = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/lib/";
+ static final String PLUGINPROPERTIES_FILENAME = "pluginProperties.properties";
+ static final String LOGGING_PROPERTIES_FILEPATH = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/log4j.properties/";
+
+
+ public Properties getPluginProps() {
+ return pluginProps;
+ }
+
+
+ /**
+ * constructor
+ *
+ * @param info
+ */
+ public ImportImagePlugin(PluginInformation info){
+ super(info);
+
+ try {
+
+ // First create custom ClassLoader to load resources from the main JAR
+ pluginClassLoader = createPluginClassLoader();
+
+ // Initialize logger
+ initializeLogger(pluginClassLoader);
+
+ // Check whether plugin has already been installed. Otherwise install
+ checkInstallation();
+
+ // If resources are available load properties from plugin directory
+ if(pluginProps == null || pluginProps.isEmpty())
+ {
+ pluginProps = new Properties();
+ pluginProps.load(new File(PLUGINPROPERTIES_PATH).toURI().toURL().openStream());
+ logger.debug("Plugin properties loaded");
+ }
+
+ /* Change class path:
+ * Use java reflection methods to add URLs to the class-path.
+ * Changes take effect when calling methods of other plugin classes
+ * (new threads)
+ * */
+ URLClassLoader sysLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
+ String[] libraryNames = pluginProps.getProperty("libraries").split(",");
+ Class sysclass = URLClassLoader.class;
+ Method method = sysclass.getDeclaredMethod("addURL", new Class[]{URL.class});
+ method.setAccessible(true);
+ for (int i = 0; i < libraryNames.length; i++) {
+ File library = new File(PLUGINLIBRARIES_DIR + "/" + libraryNames[i]);
+ method.invoke(sysLoader, new Object[]{library.toURI().toURL()});
+ }
+
+
+ // load information about supported reference systems
+ PluginOperations.loadCRSData(pluginProps);
+
+ // create new Action for menu entry
+ LoadImageAction loadFileAction = new LoadImageAction();
+ loadFileAction.setEnabled(true);
+
+ // add menu entries
+ Main.main.menu.fileMenu.insert(loadFileAction, 8);
+ Main.main.menu.fileMenu.insertSeparator(9);
+
+
+ } catch (Exception e) {
+ logger.fatal("Error while loading plugin", e);
+ try {
+ throw e;
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+
+ logger.info("Plugin successfully loaded.");
+
+ }
+
+
+
+ /**
+ * Checks whether plugin resources are available.
+ * If not, start install procedure.
+ *
+ * @throws IOException
+ */
+ private void checkInstallation() throws IOException
+ {
+
+ // check plugin resource state
+ boolean isInstalled = true;
+ if(!new File(PLUGINPROPERTIES_PATH).exists()
+ || !new File(PLUGIN_DIR).exists()
+ || !new File(PLUGINLIBRARIES_DIR).exists())
+ isInstalled = false;
+
+
+ // if properties file doesn't exist, install plugin
+ if(!isInstalled)
+ {
+
+ /*----------- Begin installation ---------------*/
+
+ // check if plugin directory exist
+ File pluginDir = new File(PLUGIN_DIR);
+ if(!pluginDir.exists()){
+ pluginDir.mkdir();
+ }
+
+ // check if "lib" directory exist
+ File libDir = new File(PLUGINLIBRARIES_DIR);
+ if(!libDir.exists()){
+ libDir.mkdir();
+ }
+
+ // create local properties file
+ if(pluginProps == null || pluginProps.isEmpty()){
+
+ FileWriter fw = new FileWriter(new File(PLUGINPROPERTIES_PATH));
+ URL propertiesURL = pluginClassLoader.getResource("resources/" + PLUGINPROPERTIES_FILENAME);
+ pluginProps = new Properties();
+ pluginProps.load(propertiesURL.openStream());
+ pluginProps.store(fw, null);
+ fw.close();
+ logger.debug("Plugin properties loaded");
+ }
+
+ if(!new File(LOGGING_PROPERTIES_FILEPATH).exists())
+ {
+ FileWriter fw = new FileWriter(new File(LOGGING_PROPERTIES_FILEPATH));
+ URL propertiesURL = pluginClassLoader.getResource("resources/log4j.properties");
+ Properties loggingProps = new Properties();
+ loggingProps.load(propertiesURL.openStream());
+ loggingProps.store(fw, null);
+ fw.close();
+ logger.debug("Logging properties created");
+ }
+
+
+ // Copy all needed JAR files to $PLUGIN_DIR$/lib/
+ String[] libStrings = pluginProps.getProperty("libraries").split(",");
+
+ for (int i = 0; i < libStrings.length; i++) {
+
+ URL url = pluginClassLoader.getResource("lib/" + libStrings[i]);
+
+ FileOutputStream out = null;
+
+ try{
+ out = new FileOutputStream(new File(libDir, libStrings[i]));
+ } catch (FileNotFoundException e) {
+ break;
+ }
+
+ BufferedInputStream in = null;
+ try
+ {
+ in = new BufferedInputStream(url.openStream());
+
+ byte[] buffer = new byte[1024];
+ while (true)
+ {
+ int count = in.read(buffer);
+ if (count == -1)
+ break;
+ out.write(buffer, 0, count);
+ }
+ }
+ finally
+ {
+ if (in != null)
+ in.close();
+ }
+ }
+ logger.debug("Plugin successfully installed");
+ }
+ }
+
+
+ /**
+ * Initialize logger using plugin classloader.
+ *
+ * @param cl
+ */
+ private void initializeLogger(ClassLoader cl) {
+
+ Properties props = new Properties();
+ try {
+ props.load(new File(LOGGING_PROPERTIES_FILEPATH).toURI().toURL().openStream());
+
+ // Set file for logging here:
+ props.setProperty("log4j.appender.MyRoFiAppender.file",
+ (Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/" + "log.log"));
+
+ PropertyConfigurator.configure(props);
+
+ logger = Logger.getLogger(ImportImagePlugin.class);
+
+ logger.info("Logger successfully initialized.");
+
+ return;
+
+ } catch (IOException e) {
+ System.out.println("Logging properties file not found. Using standard settings.");
+ }
+
+ // if no log4j.properties file can be found, initialize manually:
+
+ props.setProperty("log4j.rootLogger", "INFO, A");
+ props.setProperty("log4j.appender.A", "org.apache.log4j.FileAppender");
+
+ props.setProperty("log4j.appender.A.layout",
+ "org.apache.log4j.PatternLayout ");
+ props.setProperty("log4j.appender.A.layout.ConversionPattern",
+ "%d{ISO8601} %-5p [%t] %c: %m%n");
+
+ // Set file for logging here:
+ props.setProperty("log4j.appender.A.file",
+ (Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/" + "log.log"));
+
+ PropertyConfigurator.configure(props);
+ logger = Logger.getLogger(ImportImagePlugin.class);
+ logger.info("Logger successfully initialized with standard settings.");
+
+ }
+
+ /**
+ * get a plugin-specific classloader.
+ *
+ * @return
+ * @throws MalformedURLException
+ */
+ private ClassLoader createPluginClassLoader() throws MalformedURLException
+ {
+ ClassLoader loader = null;
+ loader = URLClassLoader.newInstance(
+ new URL[] { new File(Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin.jar").toURI().toURL()},
+ ImportImagePlugin.class.getClassLoader()
+ );
+
+ return loader;
+ }
+
+}
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java (revision 23304)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java (revision 23305)
@@ -1,3 +1,3 @@
-package org.openstreetmap.josm.plugins.ImageImportPlugin;
+package org.openstreetmap.josm.plugins.ImportImagePlugin;
import java.awt.Cursor;
import java.awt.Dimension;
@@ -527,8 +527,8 @@
PluginOperations.defaultSourceCRSDescription = selection;
- ImageImportPlugin.pluginProps.setProperty("default_crs_eastingfirst", "" + eastingFirstCheckBox.isSelected());
- ImageImportPlugin.pluginProps.setProperty("default_crs_srid", code);
- FileWriter fileWriter = new FileWriter(new File(ImageImportPlugin.PLUGINPROPERTIES_PATH));
- ImageImportPlugin.pluginProps.store(fileWriter, null);
+ ImportImagePlugin.pluginProps.setProperty("default_crs_eastingfirst", "" + eastingFirstCheckBox.isSelected());
+ ImportImagePlugin.pluginProps.setProperty("default_crs_srid", code);
+ FileWriter fileWriter = new FileWriter(new File(ImportImagePlugin.PLUGINPROPERTIES_PATH));
+ ImportImagePlugin.pluginProps.store(fileWriter, null);
fileWriter.close();
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java (revision 23304)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java (revision 23305)
@@ -1,3 +1,3 @@
-package org.openstreetmap.josm.plugins.ImageImportPlugin;
+package org.openstreetmap.josm.plugins.ImportImagePlugin;
import java.awt.event.ActionEvent;
import java.io.IOException;
@@ -16,5 +16,5 @@
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.plugins.ImageImportPlugin.ImageLayer.LayerCreationCancledException;
+import org.openstreetmap.josm.plugins.ImportImagePlugin.ImageLayer.LayerCreationCancledException;
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java (revision 23304)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java (revision 23305)
@@ -1,3 +1,3 @@
-package org.openstreetmap.josm.plugins.ImageImportPlugin;
+package org.openstreetmap.josm.plugins.ImportImagePlugin;
import java.awt.geom.Rectangle2D;