Changeset 119 in josm for src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

Timestamp:

2006-07-21T00:31:54+02:00 (20 years ago)

Author:

imi

Message:

• added Annotation Preset Tester
• added Language selection in preferences
• fixed merging bug where incomplete line segments were not replaced

File:

• src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) (4 diffs)

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

@@ -7 +7 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.GridLayout;
@@ -209 +208 @@
          */
         public PropertiesDialog(MapFrame mapFrame) {
-                super(tr("Properties"), "propertiesdialog", tr("Property for selected objects."), KeyEvent.VK_P);
-                setPreferredSize(new Dimension(320,150));
-                
+                super(tr("Properties"), "propertiesdialog", tr("Property for selected objects."), KeyEvent.VK_P, 150);
+
                 Vector<AnnotationPreset> allPresets = new Vector<AnnotationPreset>();
                 String allAnnotations = Main.pref.get("annotation.sources");
@@ -219 +217 @@
                         String source = st.nextToken();
                         try {
-                    if (source.startsWith("http") || source.startsWith("ftp") || source.startsWith("file"))
-                        in = new URL(source).openStream();
-                    else if (source.startsWith("resource://"))
-                        in = Main.class.getResourceAsStream(source.substring("resource:/".length()));
-                    else
-                        in = new FileInputStream(source);
-                    allPresets.addAll(AnnotationPreset.readAll(in));
-            } catch (IOException e) {
-                    e.printStackTrace();
-                    JOptionPane.showMessageDialog(Main.parent, tr("Could not read annotation preset source: {0}",source));
-            } catch (SAXException e) {
-                    e.printStackTrace();
-                    JOptionPane.showMessageDialog(Main.parent, tr("Error parsing {0}: ", source)+e.getMessage());
-            }
+                                if (source.startsWith("http") || source.startsWith("ftp") || source.startsWith("file"))
+                                        in = new URL(source).openStream();
+                                else if (source.startsWith("resource://"))
+                                        in = Main.class.getResourceAsStream(source.substring("resource:/".length()));
+                                else
+                                        in = new FileInputStream(source);
+                                allPresets.addAll(AnnotationPreset.readAll(in));
+                        } catch (IOException e) {
+                                e.printStackTrace();
+                                JOptionPane.showMessageDialog(Main.parent, tr("Could not read annotation preset source: {0}",source));
+                        } catch (SAXException e) {
+                                e.printStackTrace();
+                                JOptionPane.showMessageDialog(Main.parent, tr("Error parsing {0}: ", source)+e.getMessage());
+                        }
                 }
                 if (allPresets.size() > 0) {
@@ -256 +254 @@
                                 }
                                 annotationPresets.setSelectedIndex(0);
-            }
+                        }
                 });