Changeset 129 in josm for src

Timestamp:

2006-07-26T22:14:05+02:00 (18 years ago)

Author:

imi

Message:

• fixed combo box display in annotation preset tester
• fixed NPE in GeoImageLayer

Location:

src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• gui/annotation (added)
• gui/annotation/AnnotationCellRenderer.java (added)
• gui/annotation/AnnotationPreset.java (moved) (moved from src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java ) (2 diffs)
• gui/annotation/AnnotationTester.java (moved) (moved from src/org/openstreetmap/josm/gui/dialogs/AnnotationTester.java ) (2 diffs)
• gui/dialogs/HistoryDialog.java (modified) (2 diffs)
• gui/dialogs/PropertiesDialog.java (modified) (3 diffs)
• gui/layer/GeoImageLayer.java (modified) (1 diff)

src/org/openstreetmap/josm/Main.java

@@ -48 +48 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.dialogs.AnnotationTester;
+import org.openstreetmap.josm.gui.annotation.AnnotationTester;
 import org.openstreetmap.josm.gui.dialogs.SelectionListDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -142 +142 @@
                         setMapFrame(null);
         }
+
+
         public Main() {
                 main = this;

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

@@ -1 @@
-package org.openstreetmap.josm.gui.dialogs;
+package org.openstreetmap.josm.gui.annotation;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -203 +203 @@
         private List<Item> data;
         public String name;
-        Collection<Class<?>> types;
+        public Collection<Class<?>> types;
 
         public AnnotationPreset(List<Item> data, String name, Collection<Class<?>> currentTypes) {

src/org/openstreetmap/josm/gui/annotation/AnnotationTester.java

@@ -1 @@
-package org.openstreetmap.josm.gui.dialogs;
+package org.openstreetmap.josm.gui.annotation;
 
 import java.awt.BorderLayout;
@@ -73 +73 @@
                 this.args = args;
                 annotationPresets = new JComboBox();
+                annotationPresets.setRenderer(new AnnotationCellRenderer());
                 reload();
 

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

@@ -57 +57 @@
                 return c.getTime();
         }
-        
+
         private static class HistoryItem implements Comparable<HistoryItem> {
                 OsmPrimitive osm;
                 boolean visible;
-                
+
                 public int compareTo(HistoryItem o) {
-                return unifyDate(osm.timestamp).compareTo(unifyDate(o.osm.timestamp));
-        }
+                        return unifyDate(osm.timestamp).compareTo(unifyDate(o.osm.timestamp));
+                }
         }
 
@@ -100 +100 @@
                 history.getTableHeader().setDefaultRenderer(new DefaultTableCellRenderer(){
                         @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-                    JComponent c = (JComponent)oldRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-                    if (!value.equals(""))
-                        return c;
-                    JLabel l = new JLabel(ImageProvider.get("misc","showhide"));
-                    l.setForeground(c.getForeground());
-                    l.setBackground(c.getBackground());
-                    l.setFont(c.getFont());
-                    l.setBorder(c.getBorder());
-                    l.setOpaque(true);
-                    return l;
-            }
+                                JComponent c = (JComponent)oldRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+                                if (!value.equals(""))
+                                        return c;
+                                JLabel l = new JLabel(ImageProvider.get("misc","showhide"));
+                                l.setForeground(c.getForeground());
+                                l.setBackground(c.getBackground());
+                                l.setFont(c.getFont());
+                                l.setBorder(c.getBorder());
+                                l.setOpaque(true);
+                                return l;
+                        }
                 });
 

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;
@@ -50 +47 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.annotation.AnnotationCellRenderer;
+import org.openstreetmap.josm.gui.annotation.AnnotationPreset;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.xml.sax.SAXException;
@@ -264 +263 @@
                         }
                 });
-                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;
-            }
-                });
+                annotationPresets.setRenderer(new AnnotationCellRenderer());
 
                 data.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});

src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java

@@ -299 +299 @@
                                 e.icon.paintIcon(mv, g, r.x, r.y);
                                 Border b = null;
-                                if (!clickedFound && mousePressed && r.contains(mv.getMousePosition())) {
+                                Point mousePosition = mv.getMousePosition();
+                                if (mousePosition == null)
+                                        continue; // mouse outside the whole window
+                                if (!clickedFound && mousePressed && r.contains(mousePosition)) {
                                         b = BorderFactory.createBevelBorder(BevelBorder.LOWERED);
                                         clickedFound = true;