Changeset 126 in josm for src/org/openstreetmap

Timestamp:

2006-07-25T18:53:18+02:00 (18 years ago)

Author:

imi

Message:

fixed annotation presets view (added a new renderer)

Location:

src/org/openstreetmap/josm/gui/dialogs

Files:

• AnnotationPreset.java (modified) (2 diffs)
• PropertiesDialog.java (modified) (2 diffs)

src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java

@@ -202 +202 @@
 
         private List<Item> data;
-        public final String name;
-        private Collection<Class<?>> types;
+        public String name;
+        Collection<Class<?>> types;
 
         public AnnotationPreset(List<Item> data, String name, Collection<Class<?>> currentTypes) {
@@ -216 +216 @@
          * Use this as default item for "do not select anything".
          */
-        public AnnotationPreset() {
-                name = "";
-        }
+        public AnnotationPreset() {}
 
         public static List<AnnotationPreset> readAll(InputStream inStream) throws IOException, SAXException {

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

@@ -28 +28 @@
 
 import javax.swing.DefaultComboBoxModel;
+import javax.swing.DefaultListCellRenderer;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
+import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
+import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -261 +264 @@
                         }
                 });
+                annotationPresets.setRenderer(new DefaultListCellRenderer(){
+                        @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+                    AnnotationPreset a = (AnnotationPreset)value;
+                                if (a.name == null)
+                        return super.getListCellRendererComponent(list, "", index, false, false);
+                                JComponent c = (JComponent)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+                    JLabel l = new JLabel((a).name);
+                    l.setForeground(c.getForeground());
+                    l.setBackground(c.getBackground());
+                    l.setFont(c.getFont());
+                    l.setBorder(c.getBorder());
+                    if (a.types == null)
+                        l.setIcon(ImageProvider.get("data", "empty"));
+                    else if (a.types.size() != 1)
+                        l.setIcon(ImageProvider.get("data", "object"));
+                    else
+                        l.setIcon(ImageProvider.get("data", a.types.iterator().next().getSimpleName().toLowerCase()));
+                    l.setOpaque(true);
+                    return l;
+            }
+                });
 
                 data.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});