Changeset 6707 in josm for trunk

Timestamp:

2014-01-17T00:41:23+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9028, see #6797 - load imagery layer icons in background

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (3 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.preferences.imagery.WMSLayerTree;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.imagery.WMSImagery;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageCallback;
 
+/**
+ * Action displayed in imagery menu to add a new imagery layer. 
+ * @since 3715
+ */
 public class AddImageryLayerAction extends JosmAction implements AdaptableAction {
 
@@ -33 +39 @@
     private final ImageryInfo info;
 
+    /**
+     * Constructs a new {@code AddImageryLayerAction} for the given {@code ImageryInfo}.
+     * If an http:// icon is specified, it is fetched asynchronously.
+     * @param info The imagery info
+     */
     public AddImageryLayerAction(ImageryInfo info) {
         super(info.getMenuName(), /* ICON */"imagery_menu", tr("Add imagery layer {0}",info.getName()), null, false, false);
@@ -42 +53 @@
         try {
             if (info.getIcon() != null) {
-                ImageIcon i = new ImageProvider(info.getIcon()).setOptional(true).
-                        setMaxHeight(MAX_ICON_SIZE).setMaxWidth(MAX_ICON_SIZE).get();
-                if (i != null) {
-                    putValue(Action.SMALL_ICON, i);
-                }
+                new ImageProvider(info.getIcon()).setOptional(true).
+                        setMaxHeight(MAX_ICON_SIZE).setMaxWidth(MAX_ICON_SIZE).getInBackground(new ImageCallback() {
+                            @Override
+                            public void finished(final ImageIcon result) {
+                                if (result != null) {
+                                    GuiHelper.runInEDT(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            putValue(Action.SMALL_ICON, result);
+                                        }
+                                    });
+                                }
+                            }
+                        });
             }
         } catch (Exception ex) {

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -738 +738 @@
     public class MouseClickWatch extends MouseAdapter {
         @Override public void mouseClicked(MouseEvent e) {
-            if (e.getClickCount() < 2)
-            {
+            if (e.getClickCount() < 2) {
                 // single click, clear selection in other table not clicked in
                 if (e.getSource() == tagTable) {
@@ -748 +747 @@
             }
             // double click, edit or add tag
-            else if (e.getSource() == tagTable)
-            {
+            else if (e.getSource() == tagTable) {
                 int row = tagTable.rowAtPoint(e.getPoint());
                 if (row > -1) {
@@ -764 +762 @@
                 }
             }
-            else
-            {
+            else {
                 editHelper.addTag();
                 btnAdd.requestFocusInWindow();