Changeset 15049 in josm for trunk/src/org

Timestamp:

2019-05-05T02:24:18+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16301 - add category icons in imagery preferences

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (4 diffs)
• gui/preferences/imagery/ImageryPreference.java (modified) (7 diffs)
• tools/ImageProvider.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumMap;
 import java.util.List;
 import java.util.Locale;
@@ -43 +44 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Logging;
@@ -123 +125 @@
         private final String category;
         private final String description;
+        private static final Map<ImageSizes, Map<ImageryCategory, ImageIcon>> iconCache =
+                Collections.synchronizedMap(new EnumMap<>(ImageSizes.class));
 
         ImageryCategory(String category, String description) {
@@ -143 +147 @@
         public final String getDescription() {
             return description;
+        }
+
+        /**
+         * Returns the category icon at the given size.
+         * @param size icon wanted size
+         * @return the category icon at the given size
+         * @since 15049
+         */
+        public final ImageIcon getIcon(ImageSizes size) {
+            return iconCache
+                    .computeIfAbsent(size, x -> Collections.synchronizedMap(new EnumMap<>(ImageryCategory.class)))
+                    .computeIfAbsent(this, x -> ImageProvider.get("data/imagery", x.category, size));
         }
 

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -25 +25 @@
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -31 +32 @@
 import javax.swing.BorderFactory;
 import javax.swing.Box;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JLabel;
@@ -56 +58 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryCategory;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
@@ -75 +78 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Logging;
@@ -335 +339 @@
 
             TableColumnModel mod = defaultTable.getColumnModel();
-            mod.getColumn(2).setPreferredWidth(800);
-            mod.getColumn(2).setCellRenderer(new ImageryURLTableCellRenderer(layerInfo.getLayers()));
-            mod.getColumn(1).setPreferredWidth(400);
-            mod.getColumn(1).setCellRenderer(new ImageryNameTableCellRenderer());
+            mod.getColumn(3).setPreferredWidth(775);
+            mod.getColumn(3).setCellRenderer(new ImageryURLTableCellRenderer(layerInfo.getLayers()));
+            mod.getColumn(2).setPreferredWidth(475);
+            mod.getColumn(2).setCellRenderer(new ImageryNameTableCellRenderer());
+            mod.getColumn(0).setPreferredWidth(50);
             mod.getColumn(0).setPreferredWidth(50);
 
@@ -757 +762 @@
              */
             public ImageryDefaultLayerTableModel() {
-                setColumnIdentifiers(new String[]{"", tr("Menu Name (Default)"), tr("Imagery URL (Default)")});
+                setColumnIdentifiers(new String[]{"", "", tr("Menu Name (Default)"), tr("Imagery URL (Default)")});
             }
 
@@ -775 +780 @@
 
             @Override
+            public Class<?> getColumnClass(int columnIndex) {
+                return columnIndex == 0 ? ImageIcon.class : super.getColumnClass(columnIndex);
+            }
+
+            @Override
             public Object getValueAt(int row, int column) {
                 ImageryInfo info = layerInfo.getAllDefaultLayers().get(row);
+                ImageryCategory cat = Optional.ofNullable(info.getImageryCategory()).orElse(ImageryCategory.OTHER);
                 switch (column) {
                 case 0:
+                    return cat.getIcon(ImageSizes.TABLE);
+                case 1:
                     return info.getCountryCode();
-                case 1:
+                case 2:
                     return info;
-                case 2:
+                case 3:
                     return info.getExtendedUrl();
                 }

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -150 +150 @@
          */
         LAYER(Config.getPref().getInt("iconsize.layer", 16)),
+        /** Table icon size
+         * @since 15049
+         */
+        TABLE(SMALLICON),
         /** Toolbar button icon size
          * @since 9253