Changeset 135 in josm

Timestamp:

2006-08-15T17:55:31+02:00 (18 years ago)

Author:

imi

Message:

• fixed test directory structure
• shortkeys do not cycle through modes anymore
• Ctrl+, and Ctrl+. to zoom in/out. Should work on Mac now.

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/actions/GroupAction.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/MapMover.java (modified) (2 diffs)
• src/org/openstreetmap/josm/test (deleted)
• test (added)
• test/org (added)
• test/org/openstreetmap (added)
• test/org/openstreetmap/josm (added)
• test/org/openstreetmap/josm/data (added)
• test/org/openstreetmap/josm/data/osm (added)
• test/org/openstreetmap/josm/data/osm/visitor (added)
• test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (copied) (copied from src/org/openstreetmap/josm/test/MergeVisitorTest.java ) (2 diffs)
• test/org/openstreetmap/josm/testframework (added)
• test/org/openstreetmap/josm/testframework/Bug.java (copied) (copied from src/org/openstreetmap/josm/test/framework/Bug.java ) (1 diff)
• test/org/openstreetmap/josm/testframework/DataSetTestCaseHelper.java (copied) (copied from src/org/openstreetmap/josm/test/framework/DataSetTestCaseHelper.java ) (1 diff)
• test/org/openstreetmap/josm/testframework/DateParserTest.java (added)

.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry including="images/" excluding="po/org/|po/" kind="src" path=""/>
+        <classpathentry kind="src" path="test"/>
+        <classpathentry excluding="po/|src/|test/" including="images/" kind="src" path=""/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-        <classpathentry sourcepath="JUNIT_SRC_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
+        <classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
         <classpathentry kind="lib" path="lib/MinML2.jar"/>
         <classpathentry kind="lib" path="lib/metadata-extractor-2.3.1.jar"/>

build.xml

@@ -31 +31 @@
         </target>
 
-        <target name="dist" depends="compile,gettext">
+        <target name="dist" depends="compile">
                 <!-- jars -->
                 <unjar src="${lib}/MinML2.jar" dest="${build}" />

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

@@ -3 +3 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -8 +9 @@
 import java.util.List;
 
+import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.Icon;
@@ -30 +32 @@
         private PropertyChangeListener forwardActiveListener = new PropertyChangeListener(){
                 public void propertyChange(PropertyChangeEvent evt) {
-                        if (evt.getPropertyName().equals("active")) {
+                        if (evt.getPropertyName().equals("active"))
                                 putValue("active", evt.getNewValue());
-                                if (evt.getNewValue() == Boolean.FALSE)
-                                        cycle = false;
-                        }
                 }
         };
-        public boolean cycle;
 
         protected void setCurrent(int current) {
@@ -53 +51 @@
                 String idName = getClass().getName();
                 Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(shortCut, modifiers), idName);
-        Main.contentPane.getActionMap().put(idName, this);
+                Main.contentPane.getActionMap().put(idName, this);
                 shortCutName = ShortCutLabel.name(shortCut, modifiers);
-                addPropertyChangeListener(new PropertyChangeListener(){
-                        public void propertyChange(PropertyChangeEvent evt) {
-                                if (evt.getPropertyName().equals("active") && evt.getNewValue() == Boolean.FALSE)
-                                        cycle = false;
-            }
+                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(shortCut, KeyEvent.SHIFT_DOWN_MASK), idName+".cycle");
+                Main.contentPane.getActionMap().put(idName+".cycle", new AbstractAction(){
+                        public void actionPerformed(ActionEvent e) {
+                                setCurrent((current+1)%actions.size());
+                                actions.get(current).actionPerformed(e);
+                        }
                 });
         }
@@ -68 +67 @@
                         b.setSelected(!b.isSelected());
                         openPopup(b);
-                } else {
-                        if (cycle)
-                                setCurrent((current+1)%actions.size());
-                        else
-                                cycle = true;
+                } else
                         actions.get(current).actionPerformed(e);
-                }
         }
 

src/org/openstreetmap/josm/gui/MapMover.java

@@ -32 +32 @@
         }
             public void actionPerformed(ActionEvent e) {
-                if (action.equals("+") || action.equals("-")) {
+                System.out.println("e="+e.toString()+" action="+e.getActionCommand());
+                if (action.equals(".") || action.equals(",")) {
                         Point mouse = nc.getMousePosition();
                         if (mouse == null)
                                 mouse = new Point((int)nc.getBounds().getCenterX(), (int)nc.getBounds().getCenterY());
-                        MouseWheelEvent we = new MouseWheelEvent(nc, e.getID(), e.getWhen(), e.getModifiers(), mouse.x, mouse.y, 0, false, MouseWheelEvent.WHEEL_UNIT_SCROLL, 1, action.equals("+") ? -1 : 1);
+                        MouseWheelEvent we = new MouseWheelEvent(nc, e.getID(), e.getWhen(), e.getModifiers(), mouse.x, mouse.y, 0, false, MouseWheelEvent.WHEEL_UNIT_SCROLL, 1, action.equals(",") ? -1 : 1);
                         mouseWheelMoved(we);
                 } else {
@@ -78 +79 @@
                 nc.addMouseWheelListener(this);
                 
-                String[] n = {"+","-","up","right","down","left"};
-                int[] k = {KeyEvent.VK_PLUS, KeyEvent.VK_MINUS, KeyEvent.VK_UP, KeyEvent.VK_RIGHT, KeyEvent.VK_DOWN, KeyEvent.VK_LEFT};
+                String[] n = {",",".","up","right","down","left"};
+                int[] k = {KeyEvent.VK_COMMA, KeyEvent.VK_PERIOD, KeyEvent.VK_UP, KeyEvent.VK_RIGHT, KeyEvent.VK_DOWN, KeyEvent.VK_LEFT};
 
                 for (int i = 0; i < n.length; ++i) {

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

@@ -1 @@
-package org.openstreetmap.josm.test;
+package org.openstreetmap.josm.data.osm.visitor;
 
 import java.util.Date;
@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
-import org.openstreetmap.josm.test.framework.Bug;
-import org.openstreetmap.josm.test.framework.DataSetTestCaseHelper;
+import org.openstreetmap.josm.testframework.Bug;
+import org.openstreetmap.josm.testframework.DataSetTestCaseHelper;
 
 public class MergeVisitorTest extends TestCase {

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

@@ -1 @@
-package org.openstreetmap.josm.test.framework;
+package org.openstreetmap.josm.testframework;
 
 /**

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

@@ -1 @@
-package org.openstreetmap.josm.test.framework;
+package org.openstreetmap.josm.testframework;
 
 import java.util.Arrays;