Changeset 31961 in osm for applications/editors/josm

Timestamp:

2016-01-07T19:28:29+01:00 (9 years ago)

Author:

holgermappt

Message:

Enabled photo property editor. Added thumbnail request.

Location:

applications/editors/josm/plugins/photoadjust

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java (modified) (5 diffs)

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

@@ -5 +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="9270"/>
+    <property name="plugin.main.version" value="9277"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustPlugin.java

@@ -36 +36 @@
         super(info);
         GeoImageLayer.registerMenuAddition(new UntaggedGeoImageLayerAction());
-        //new PhotoPropertyEditor();
+        new PhotoPropertyEditor();
         worker = new PhotoAdjustWorker();
         initAdapters();

applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -19 +17 @@
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
-import javax.swing.JTextArea;
 import javax.swing.UIManager;
 import javax.swing.event.DocumentEvent;
@@ -33 +30 @@
 import org.openstreetmap.josm.gui.layer.geoimage.ImageEntry;
 import org.openstreetmap.josm.gui.layer.geoimage.ImageViewerDialog;
-import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
@@ -139 +135 @@
         private final ImageEntry image;
         private final GeoImageLayer layer;
-        private static final Color BG_COLOR_ERROR = new Color(255,224,224);
+        private static final Color BG_COLOR_ERROR = new Color(255, 224, 224);
 
         public PropertyEditorDialog(String title, final ImageEntry image,
@@ -148 +144 @@
             setButtonIcons(new String[] {"ok", "cancel"});
             final JPanel content = new JPanel(new GridBagLayout());
-            //content.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+            //content.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
             if (image.hasThumbnail() || image.getFile() != null) {
                 final JLabel header = new JLabel(image.getFile() != null
                                                  ? image.getFile().getName()
                                                  : "");
-                //if (!image.hasThumbnail()) {
-                //    image.loadThumbnail();
-                //}
+                if (!image.hasThumbnail()) {
+                    image.loadThumbnail();
+                }
                 if (image.hasThumbnail()) {
                     header.setIcon(new ImageIcon(image.getThumbnail()));