Changeset 23305 in osm for applications/editors/josm/plugins/ImportImagePlugin

Timestamp:

2010-09-22T07:43:38+02:00 (14 years ago)

Author:

bastik

Message:

'use consistent plugin name (don't mix up the words)'

Location:

applications/editors/josm/plugins/ImportImagePlugin

Files:

• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (moved) (moved from applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageImportPlugin.java ) (7 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java (modified) (1 diff)

applications/editors/josm/plugins/ImportImagePlugin/build.xml

@@ -31 +31 @@
 
         <!-- enter the SVN commit message -->
-        <property name="commit.message" value="fix main class; add link" />
+        <property name="commit.message" value="use consistent plugin name (don't mix up the words)" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
         <property name="plugin.main.version" value="3376" />
@@ -118 +118 @@
                         <manifest>
                 <attribute name="Author" value="Christoph Beekmans, Fabian Kowitz, Anna Robaszkiewicz, Oliver Kuhn, Martin Ulitzny"/>
-                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.ImportImagePlugin.ImageImportPlugin"/>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.ImportImagePlugin.ImportImagePlugin"/>
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Plugin for importing spatial referenced images"/>

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.ImageImportPlugin;
+package org.openstreetmap.josm.plugins.ImportImagePlugin;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -81 +81 @@
         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"));
         
     }

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.ImageImportPlugin;
+package org.openstreetmap.josm.plugins.ImportImagePlugin;
 
 import java.io.BufferedInputStream;
@@ -30 +30 @@
  *
  */
-public class ImageImportPlugin extends Plugin{
+public class ImportImagePlugin extends Plugin{
     
     private static Logger logger;
@@ -44 +44 @@
     
     // 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 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() + "/ImageImportPlugin/log4j.properties/";
+    static final String LOGGING_PROPERTIES_FILEPATH = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/log4j.properties/";
     
     
@@ -61 +61 @@
      * @param info
      */
-    public ImageImportPlugin(PluginInformation info){
+    public ImportImagePlugin(PluginInformation info){
         super(info);
         
@@ -238 +238 @@
             // Set file for logging here:
             props.setProperty("log4j.appender.MyRoFiAppender.file",
-                    (Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImageImportPlugin/" + "log.log"));
+                    (Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/" + "log.log"));
             
             PropertyConfigurator.configure(props);
 
-            logger = Logger.getLogger(ImageImportPlugin.class);
+            logger = Logger.getLogger(ImportImagePlugin.class);
             
             logger.info("Logger successfully initialized.");
@@ -264 +264 @@
         // Set file for logging here:
         props.setProperty("log4j.appender.A.file",
-                (Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImageImportPlugin/" + "log.log"));
+                (Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/" + "log.log"));
         
         PropertyConfigurator.configure(props);
-        logger = Logger.getLogger(ImageImportPlugin.class);
+        logger = Logger.getLogger(ImportImagePlugin.class);
         logger.info("Logger successfully initialized with standard settings.");
         
@@ -283 +283 @@
         loader = URLClassLoader.newInstance(
                 new URL[] { new File(Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin.jar").toURI().toURL()},
-                ImageImportPlugin.class.getClassLoader()
+                ImportImagePlugin.class.getClassLoader()
                 );
         

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.ImageImportPlugin;
+package org.openstreetmap.josm.plugins.ImportImagePlugin;
 import java.awt.Cursor;
 import java.awt.Dimension;
@@ -527 +527 @@
                                     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();
                                     

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.ImageImportPlugin;
+package org.openstreetmap.josm.plugins.ImportImagePlugin;
 import java.awt.event.ActionEvent;
 import java.io.IOException;
@@ -16 +16 @@
 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;
 
 

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.ImageImportPlugin;
+package org.openstreetmap.josm.plugins.ImportImagePlugin;
 
 import java.awt.geom.Rectangle2D;