Changeset 24308 in osm for applications/editors/josm/plugins/piclayer/src/org/openstreetmap

Timestamp:

2010-11-18T23:30:20+01:00 (14 years ago)

Author:

ocroquette

Message:

PicLayer: Get supported file formats from ImageIO instead of using hard coded values (adds GIF support for free)

Location:

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer

Files:

• NewLayerFromFileAction.java (modified) (3 diffs)
• PicLayerAbstract.java (modified) (1 diff)

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java

@@ -27 +27 @@
 import java.io.IOException;
 
+import javax.imageio.ImageIO;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
@@ -50 +51 @@
         @Override
         public boolean accept(File f) {
+            if ( f.isDirectory() )
+                return true;
 
-            String ext3 = ( f.getName().length() > 4 ) ?  f.getName().substring( f.getName().length() - 4 ).toLowerCase() : "";
-            String ext4 = ( f.getName().length() > 5 ) ?  f.getName().substring( f.getName().length() - 5 ).toLowerCase() : "";
+            String fileExtension = f.getName().substring(f.getName().lastIndexOf('.')+1);
+            String[] supportedExtensions = ImageIO.getReaderFormatNames();
 
-            // TODO: check what is supported by Java :)
-            return ( f.isDirectory()
-                ||  ext3.equals( ".jpg" )
-                ||  ext4.equals( ".jpeg" )
-                ||  ext3.equals( ".png" )
-                );
+            // Unfortunately, getReaderFormatNames does not always return ALL extensions in 
+            // both lower and upper case, so we can not do a search in the array
+            for (String e: supportedExtensions)
+                if ( e.toLowerCase().equals(fileExtension) ) {
+                    return true;
+                }
+                    
+            return false;
         }
 
@@ -65 +70 @@
         @Override
         public String getDescription() {
-            return tr("Image files");
+            return tr("Supported image files");
         }
 

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java

@@ -129 +129 @@
         Image image = createImage();
         if ( image == null ) {
-            throw new IOException(tr("Image not created properly."));
+            throw new IOException(tr("PicLayer failed to load or import the image."));
         }
         // Convert to Buffered Image - not sure if this is the right way...