Changeset 20427 in osm for applications/editors

Timestamp:

2010-03-11T21:26:09+01:00 (14 years ago)

Author:

jttt

Message:

OsmPrimitive.highlighted => OsmPrimitive.setHighlighted()

Location:

applications/editors/josm/plugins/routes

Files:

• build.xml (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java (modified) (1 diff)

applications/editors/josm/plugins/routes/build.xml

@@ -18 +18 @@
 **
 ** To build against the core in ../../core, create a correct manifest and deploy to
-** SVN, 
+** SVN,
 **    set the properties commit.message and plugin.main.version
 ** and run
@@ -28 +28 @@
 
         <property name="commit.message" value="Changed the constructor signature of the plugin main class" />
-        <property name="plugin.main.version" value="2830" />
+        <property name="plugin.main.version" value="3116" />
 
         <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
@@ -96 +96 @@
 
         <!--
-                 ************************** Publishing the plugin *********************************** 
+                 ************************** Publishing the plugin ***********************************
                 -->
         <!--
-                ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+                ** extracts the JOSM release for the JOSM version in ../core and saves it in the
                 ** property ${coreversion.info.entry.revision}
                 **
@@ -148 +148 @@
 
         <!--
-                ** commits the plugin.jar 
+                ** commits the plugin.jar
                 -->
         <target name="commit-dist">
                 <echo>
         ***** Properties of published ${plugin.jar} *****
-        Commit message    : '${commit.message}'                                 
+        Commit message    : '${commit.message}'
         Plugin-Mainversion: ${plugin.main.version}
         JOSM build version: ${coreversion.info.entry.revision}
         Plugin-Version    : ${version.entry.commit.revision}
-        ***** / Properties of published ${plugin.jar} *****                                     
-                                                
+        ***** / Properties of published ${plugin.jar} *****
+
         Now commiting ${plugin.jar} ...
         </echo>

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java

@@ -22 +22 @@
 public class RelationEditMode extends MapMode {
         private static final long serialVersionUID = -7767329767438266289L;
-        
+
         private Way highlightedWay;
-        
+
         public RelationEditMode(MapFrame mapFrame) {
-        super(tr("Edit relation"), "node/autonode", tr("Edit relations"),
-                Shortcut.registerShortcut("mapmode:editRelation", tr("Mode: {0}", tr("Edit relation")), KeyEvent.VK_H, Shortcut.GROUP_EDIT),
-                mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+                super(tr("Edit relation"), "node/autonode", tr("Edit relations"),
+                                Shortcut.registerShortcut("mapmode:editRelation", tr("Mode: {0}", tr("Edit relation")), KeyEvent.VK_H, Shortcut.GROUP_EDIT),
+                                mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
         }
-        
-    @Override
+
+        @Override
         public void enterMode() {
-        super.enterMode();
-        Main.map.mapView.addMouseListener(this);
-        Main.map.mapView.addMouseMotionListener(this);
-    }
-    
-    @Override
+                super.enterMode();
+                Main.map.mapView.addMouseListener(this);
+                Main.map.mapView.addMouseMotionListener(this);
+        }
+
+        @Override
         public void exitMode() {
-        super.exitMode();
-        Main.map.mapView.removeMouseListener(this);
-        Main.map.mapView.removeMouseMotionListener(this);
-    }
-    
-    @Override
-    public void mouseMoved(MouseEvent e) {
-        Way nearestWay = Main.map.mapView.getNearestWay(e.getPoint());
-        if (nearestWay != highlightedWay) {
-                if (highlightedWay != null) {
-                        highlightedWay.highlighted = false;
-                }
-                if (nearestWay != null) {
-                        nearestWay.highlighted = true;
-                }
-                highlightedWay = nearestWay;
-                        Main.map.mapView.repaint();     
-        }
-    }
-    
-    @Override
+                super.exitMode();
+                Main.map.mapView.removeMouseListener(this);
+                Main.map.mapView.removeMouseMotionListener(this);
+        }
+
+        @Override
+        public void mouseMoved(MouseEvent e) {
+                Way nearestWay = Main.map.mapView.getNearestWay(e.getPoint());
+                if (nearestWay != highlightedWay) {
+                        if (highlightedWay != null) {
+                                highlightedWay.setHighlighted(false);
+                        }
+                        if (nearestWay != null) {
+                                nearestWay.setHighlighted(true);
+                        }
+                        highlightedWay = nearestWay;
+                        Main.map.mapView.repaint();
+                }
+        }
+
+        @Override
         public void mouseClicked(MouseEvent e) {
-        Way way = Main.map.mapView.getNearestWay(e.getPoint());
-        
-        Collection<Relation> selectedRelations = Main.main.getCurrentDataSet().getSelectedRelations();
-        
-        if (way != null) {
-                
-                if (selectedRelations.isEmpty()) {
-                        JOptionPane.showMessageDialog(Main.parent, tr("No relation is selected"));
-                }
-                
-                for (OsmPrimitive rel:selectedRelations) {
-                        Relation r = (Relation)rel;
-                        RelationMember foundMember = null;
-                        for (RelationMember member:r.getMembers()) {
-                                if (member.getMember() == way) {
-                                        foundMember = member;
-                                        break;
-                                }
-                        }
-                        
-                        if (foundMember != null) {
-                                Main.main.undoRedo.add(new RemoveRelationMemberCommand(r, new RelationMember("", way)));
-                        } else {
-                                Relation newRelation = new Relation(r);
-                                newRelation.addMember(new RelationMember("", way));
-                    Main.main.undoRedo.add(new ChangeCommand(r, newRelation));
-                        }
-                }
-        }
-    }
+                Way way = Main.map.mapView.getNearestWay(e.getPoint());
 
-        
+                Collection<Relation> selectedRelations = Main.main.getCurrentDataSet().getSelectedRelations();
+
+                if (way != null) {
+
+                        if (selectedRelations.isEmpty()) {
+                                JOptionPane.showMessageDialog(Main.parent, tr("No relation is selected"));
+                        }
+
+                        for (OsmPrimitive rel:selectedRelations) {
+                                Relation r = (Relation)rel;
+                                RelationMember foundMember = null;
+                                for (RelationMember member:r.getMembers()) {
+                                        if (member.getMember() == way) {
+                                                foundMember = member;
+                                                break;
+                                        }
+                                }
+
+                                if (foundMember != null) {
+                                        Main.main.undoRedo.add(new RemoveRelationMemberCommand(r, new RelationMember("", way)));
+                                } else {
+                                        Relation newRelation = new Relation(r);
+                                        newRelation.addMember(new RelationMember("", way));
+                                        Main.main.undoRedo.add(new ChangeCommand(r, newRelation));
+                                }
+                        }
+                }
+        }
+
+
 
 }