Changeset 158 in josm

Timestamp:

2006-10-08T21:45:13+02:00 (18 years ago)

Author:

imi

Message:

• added possibility to support a locale in .josm/lang/*.jar
• fixed bug that displayed the layer's context menu at wrong place

Files:

• .classpath (modified) (1 diff)
• src/org/openstreetmap/josm/actions/DownloadAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/mapmode/MoveAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (4 diffs)
• src/org/openstreetmap/josm/tools/I18n.java (modified) (4 diffs)
• test/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitorTest.java (modified) (3 diffs)
• test/org/openstreetmap/josm/testframework/MotherObject.java (modified) (1 diff)

.classpath

@@ -8 +8 @@
         <classpathentry kind="lib" path="lib/MinML2.jar"/>
         <classpathentry kind="lib" path="lib/metadata-extractor-2.3.1.jar"/>
-        <classpathentry kind="lib" path="lib/gettext-commons-0.9.jar"/>
+        <classpathentry sourcepath="C:/Download/gettext-commons-0.9-src.zip" kind="lib" path="lib/gettext-commons-0.9.jar"/>
         <classpathentry exported="true" kind="lib" path="po"/>
         <classpathentry kind="lib" path="lib/easymock.jar"/>

src/org/openstreetmap/josm/actions/DownloadAction.java

@@ -262 +262 @@
                         else if (!anySelected)
                                 JOptionPane.showMessageDialog(Main.parent,tr("Please select at least one download data type."));
-                } while (b == null && anySelected);
+                } while (b == null || !anySelected);
 
                 double minlon = b.latlon[0];

src/org/openstreetmap/josm/actions/mapmode/MoveAction.java

@@ -83 +83 @@
                 if (selectionMode)
                         return;
-                
+
                 if (mousePos == null)
                         mousePos = e.getPoint();
@@ -131 +131 @@
                 OsmPrimitive osm = Main.map.mapView.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0);
                 if (osm != null) {
-                if (!sel.contains(osm))
-                        Main.ds.setSelected(osm);
-                oldCursor = Main.map.mapView.getCursor();
-                Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
-        } else {
-                selectionMode = true;
+                        if (!sel.contains(osm))
+                                Main.ds.setSelected(osm);
+                        oldCursor = Main.map.mapView.getCursor();
+                        Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+                } else {
+                        selectionMode = true;
                         selectionManager.register(Main.map.mapView);
-        }
+                }
 
                 Main.map.mapView.repaint();
@@ -156 +156 @@
         }
 
-        
+
         public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) {
                 SelectionAction.selectEverythingInRectangle(selectionManager, r, alt, shift, ctrl);
-    }
+        }
 }

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

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.GridLayout;
+import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -49 +50 @@
          */
         static JList instance;
-
+        private JScrollPane listScrollPane;
+        
         public final static class DeleteLayerAction extends AbstractAction {
 
@@ -120 +122 @@
                 super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."), KeyEvent.VK_L, 100);
                 instance = new JList(model);
-                add(new JScrollPane(instance), BorderLayout.CENTER);
+                listScrollPane = new JScrollPane(instance);
+                add(listScrollPane, BorderLayout.CENTER);
                 instance.setBackground(UIManager.getColor("Button.background"));
                 instance.setCellRenderer(new DefaultListCellRenderer(){
@@ -160 +163 @@
                                 Layer layer = (Layer)instance.getModel().getElementAt(index);
                                 LayerListPopup menu = new LayerListPopup(instance, layer);
-                                menu.show(LayerListDialog.this, e.getX(), e.getY());
+                                Point p = listScrollPane.getMousePosition();
+                                menu.show(listScrollPane, p.x, p.y-3);
                         }
                         @Override public void mousePressed(MouseEvent e) {

src/org/openstreetmap/josm/tools/I18n.java

@@ -1 +1 @@
 package org.openstreetmap.josm.tools;
 
+import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.text.MessageFormat;
 import java.util.Locale;
@@ -15 +18 @@
 public class I18n {
         private static org.xnap.commons.i18n.I18n i18n;
-        
+
         static {
+                String localeFile = Main.pref.getPreferencesDir()+"lang/"+Locale.getDefault()+".jar";
+                Class<?> klass = Main.class;
+                if (new File(localeFile).exists()) {
+                        try {
+                                String url = localeFile.replace('\\','/');
+                                if (System.getProperty("os.name").startsWith("Windows"))
+                                        url = "file:/"+url;
+                                else
+                                        url = "file://"+url;
+                        URLClassLoader loader = new URLClassLoader(new URL[]{new URL(url)});
+                        klass = Class.forName("org.openstreetmap.josm.Translation_"+Locale.getDefault(), true, loader);
+                } catch (Exception e) {
+                        System.out.println("Couldn't load locale file "+localeFile);
+                        e.printStackTrace();
+                }
+                }
                 try {
-                i18n = I18nFactory.getI18n(Main.class);
-        } catch (MissingResourceException e) {
-                System.out.println("Locale '"+Locale.getDefault()+"' not found. Using default.");
-        }
+                        i18n = I18nFactory.getI18n(klass);
+                } catch (MissingResourceException e) {
+                        System.out.println("Locale '"+Locale.getDefault()+"' not found. Using default.");
+                }
         }
-        
+
         public static String tr(String text, Object... objects) {
                 if (i18n == null)
@@ -39 +58 @@
                 if (i18n == null)
                         return n == 1 ? tr(text, objects) : tr(pluralText, objects);
-                return i18n.trn(text, pluralText, n, objects);
+                        return i18n.trn(text, pluralText, n, objects);
         }
 
@@ -45 +64 @@
                 if (i18n == null)
                         return n == 1 ? tr(text) : tr(pluralText);
-                return i18n.trn(text, pluralText, n);
+                        return i18n.trn(text, pluralText, n);
         }
 }

test/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitorTest.java

@@ -2 +2 @@
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.LinkedList;
 
@@ -31 +30 @@
                 s.visit(v);
                 assertEquals(2, v.nodes.size());
-                Iterator<Node> it = v.nodes.iterator();
-                assertSame(s.from, it.next());
-                assertSame(s.to, it.next());
+                assertTrue(v.nodes.contains(s.from));
+                assertTrue(v.nodes.contains(s.to));
         }
 
@@ -41 +39 @@
                 int numberOfNodes = 2*w.segments.size();
                 assertEquals(numberOfNodes, v.nodes.size());
-                Iterator<Node> itNodes = v.nodes.iterator();
-                Iterator<Segment> it = w.segments.iterator();
-                for (int i = 0; i < numberOfNodes; ++i)
-                        assertSame(i%2==0?it.next().from:it.next().to, itNodes.next());
+                for (Segment s : w.segments) {
+                        assertTrue(v.nodes.contains(s.from));
+                        assertTrue(v.nodes.contains(s.to));
+                }
         }
 

test/org/openstreetmap/josm/testframework/MotherObject.java

@@ -90 +90 @@
                 assertEquals(0, copy.size());
     }
+        
+        /**
+         * To have JUnit shut up.
+         */
+        public void test() {
+        }
 }