Changeset 1747 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2009-07-08T15:26:12+02:00 (15 years ago)

Author:

stoecker

Message:

close #2874 (NPE), improved external style handling

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• ProjectionPreference.java (modified) (1 diff)
• StyleSources.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java

@@ -54 +54 @@
         projPanel.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
         projPanel.setLayout(new GridBagLayout());
+        projPanel.add(new JLabel(tr("Display coordinates as")), GBC.std().insets(5,5,0,5));
+        projPanel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
+        projPanel.add(coordinatesCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5));
         projPanel.add(new JLabel(tr("Projection method")), GBC.std().insets(5,5,0,5));
         projPanel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
         projPanel.add(projectionCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5));
-        projPanel.add(new JLabel(tr("Display coordinates as")), GBC.std().insets(5,5,0,5));
-        projPanel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
-        projPanel.add(coordinatesCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5));
         projPanel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
         JScrollPane scrollpane = new JScrollPane(projPanel);

trunk/src/org/openstreetmap/josm/gui/preferences/StyleSources.java

@@ -95 +95 @@
     }
 
-    public StyleSources(String pref, String iconpref, String url, boolean named, final String name)
+    public StyleSources(String pref, String iconpref, final String url, boolean named, final String name)
     {
         sourcesList = new JList(new DefaultListModel());
@@ -199 +199 @@
                     ((DefaultListModel)sourcesList.getModel()).addElement(
                     ((SourceInfo)sourcesDefaults.getSelectedValue()).url);
+                }
+            }
+        });
+
+        JButton update = new JButton(tr("Update"));
+        update.addActionListener(new ActionListener(){
+            public void actionPerformed(ActionEvent e) {
+                MirroredInputStream.cleanup(url);
+                getDefaults(url);
+                int num = sourcesList.getModel().getSize();
+                if (num > 0)
+                {
+                    ArrayList<String> l = new ArrayList<String>();
+                    for (int i = 0; i < num; ++i)
+                        MirroredInputStream.cleanup((String)sourcesList.getModel().getElementAt(i));
                 }
             }
@@ -219 +234 @@
         buttonPanel.add(edit, GBC.std().insets(5,5,5,0));
         buttonPanel.add(delete, GBC.std().insets(0,5,5,0));
-        buttonPanel.add(copy, GBC.std().insets(0,5,0,0));
+        buttonPanel.add(copy, GBC.std().insets(0,5,5,0));
+        buttonPanel.add(update, GBC.std().insets(0,5,0,0));
         if(iconsList != null)
         {
@@ -265 +281 @@
     public void getDefaults(String name)
     {
+        ((DefaultListModel)sourcesDefaults.getModel()).removeAllElements();
         String lang = Main.getLanguageCode()+"_";
         try