Changeset 34645 in osm for applications

Timestamp:

2018-09-14T21:30:53+02:00 (6 years ago)

Author:

donvip

Message:

fix deprecation warnings

Location:

applications/editors/josm/plugins/imagery_cachexport

Files:

• .classpath (added)
• .project (added)
• .settings (added)
• .settings/org.eclipse.jdt.core.prefs (added)
• build.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/imagery_cachexport/AbstractImageryCacheExportAction.java (modified) (9 diffs)
• src/org/openstreetmap/josm/plugins/imagery_cachexport/ImageryCacheExportPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/imagery_cachexport/ImageryTileExportDialog.java (modified) (2 diffs)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** Usage
-** =====
-** Call "ant help" to get possible build targets.
-**
--->
 <project name="imagery_cachexport" default="dist" basedir=".">
 
@@ -11 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12847"/>
+    <property name="plugin.main.version" value="14140"/>
 
     <!-- Configure these properties (replace "..." accordingly).
@@ -48 +42 @@
     </target>
 
-    <!--
-    **********************************************************
-    ** javadoc - create the plugin documentation
-    **********************************************************
-    -->
-    <target name="javadoc" description="generate documentation">
-        <javadoc destdir="${plugin.javadoc.dir}"
-                sourcepath="${plugin.src.dir}"
-                windowtitle="${ant.project.name}"
-                linksource="true"
-                private="true">
-            <classpath>
-                <pathelement location="${josm}"/>
-            </classpath>
-            <!-- Paths are relative to javadoc destdir (${plugin.javadoc.dir}). -->
-            <link href="../../../core/javadoc/"/>
-            <link href="https://josm.openstreetmap.de/doc/"/>
-            <link href="https://docs.oracle.com//javase/8/docs/api/"/>
-        </javadoc>
-    </target>
-
     <target name="additional-manifest">
         <antcall target="mftrans"/>

applications/editors/josm/plugins/imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/AbstractImageryCacheExportAction.java

@@ -14 +14 @@
 import java.util.List;
 import java.util.Set;
+
 import javax.imageio.ImageIO;
-
 import javax.swing.AbstractAction;
 import javax.swing.JMenuItem;
@@ -21 +21 @@
 
 import org.apache.commons.jcs.access.CacheAccess;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -52 +51 @@
      * @return Currently selected layer.
      */
-    private AbstractCachedTileSourceLayer getSelectedLayer() {
-        return (AbstractCachedTileSourceLayer)LayerListDialog.getInstance().getModel()
+    private AbstractCachedTileSourceLayer<?> getSelectedLayer() {
+        return (AbstractCachedTileSourceLayer<?>)LayerListDialog.getInstance().getModel()
             .getSelectedLayers().get(0);
     }
@@ -81 +80 @@
      * @return Cache key prefix.
      */
-    protected String getCacheKeyPrefix(final AbstractCachedTileSourceLayer layer) {
+    protected String getCacheKeyPrefix(final AbstractCachedTileSourceLayer<?> layer) {
         return layer.getName().replace(':', '_');
     }
@@ -92 +91 @@
     @Override
     public void actionPerformed(ActionEvent evt) {
-        final AbstractCachedTileSourceLayer layer = getSelectedLayer();
+        final AbstractCachedTileSourceLayer<?> layer = getSelectedLayer();
         final String cacheName = layer.getName();
         final CacheAccess<String, BufferedImageCacheEntry> cache = getCache();
@@ -172 +171 @@
                                     @Override
                                     public void run() {
-                                        JOptionPane.showMessageDialog(Main.parent, message,
+                                        JOptionPane.showMessageDialog(MainApplication.getMainFrame(), message,
                                                                       tr("Error"), JOptionPane.ERROR_MESSAGE);
                                     }
@@ -209 +208 @@
      */
     private void exportImagery(final String exportPath,
-                               final AbstractCachedTileSourceLayer layer,
+                               final AbstractCachedTileSourceLayer<?> layer,
                                final CacheAccess<String, BufferedImageCacheEntry> cache) {
         try {
             Files.createDirectories(Paths.get(exportPath));
         } catch (FileAlreadyExistsException exn) {
-            JOptionPane.showMessageDialog(Main.parent,
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                           tr("Export file system path already exists but is not a directory."),
                                           tr("Error"),
@@ -222 +221 @@
             final String message = exn.getLocalizedMessage();
             if (message != null) {
-                JOptionPane.showMessageDialog(Main.parent,
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                               tr("Failed to create export directory: {0}", message),
                                               tr("Error"),
                                               JOptionPane.ERROR_MESSAGE);
             } else {
-                JOptionPane.showMessageDialog(Main.parent,
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                               tr("Failed to create export directory."),
                                               tr("Error"),
@@ -265 +264 @@
      * @param image Image to be written.
      * @param file  File the image is to be written to.
+     * @throws IOException in case of I/O error
      */
     public void writeImage(BufferedImage image, File file) throws IOException {

applications/editors/josm/plugins/imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/ImageryCacheExportPlugin.java

@@ -2 +2 @@
 
 import org.openstreetmap.josm.gui.layer.TMSLayer;
-import org.openstreetmap.josm.gui.layer.WMSLayer;
-import org.openstreetmap.josm.gui.layer.WMTSLayer;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;

applications/editors/josm/plugins/imagery_cachexport/src/org/openstreetmap/josm/plugins/imagery_cachexport/ImageryTileExportDialog.java

@@ -16 +16 @@
 
 import org.apache.commons.jcs.access.CacheAccess;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -39 +39 @@
                                    final String cacheName,
                                    final String cacheKeyPrefix) {
-        super(Main.parent, tr("Export Tiles"), new String[] {tr("Ok"), tr("Cancel")});
+        super(MainApplication.getMainFrame(), tr("Export Tiles"), new String[] {tr("Ok"), tr("Cancel")});
         this.cacheName = cacheName;