Changeset 23879 in osm for applications/editors/josm

Timestamp:

2010-10-27T21:53:30+02:00 (14 years ago)

Author:

oliverw

Message:

• Added icon for assign button
• Eclipse: Replaced java builder with ant

Location:

applications/editors/josm/plugins/AddressEdit

Files:

• .externalToolBuilders (added)
• .externalToolBuilders/JOSM-Ant.launch (added)
• .externalToolBuilders/org.eclipse.jdt.core.javabuilder (2).launch (added)
• .project (modified) (1 diff)
• images/assignstreet_24.png (added)
• images/dialogs (added)
• images/dialogs/assignstreet_24.png (added)
• src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java (modified) (6 diffs)

applications/editors/josm/plugins/AddressEdit/.project

@@ -7 +7 @@
         <buildSpec>
                 <buildCommand>
-                        <name>org.eclipse.jdt.core.javabuilder</name>
+                        <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+                        <triggers>full,incremental,</triggers>
                         <arguments>
+                                <dictionary>
+                                        <key>LaunchConfigHandle</key>
+                                        <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.jdt.core.javabuilder (2).launch</value>
+                                </dictionary>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+                        <triggers>full,incremental,</triggers>
+                        <arguments>
+                                <dictionary>
+                                        <key>LaunchConfigHandle</key>
+                                        <value>&lt;project&gt;/.externalToolBuilders/JOSM-Ant.launch</value>
+                                </dictionary>
                         </arguments>
                 </buildCommand>

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java

@@ -46 +46 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel.PresetHandler;
 import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
@@ -57 +58 @@
         private static final String UNRESOLVED_HEADER_FMT = tr("Unresolved Addresses (%d)");
         private static final String STREET_HEADER_FMT = tr("Streets (%d)");
-        private static final String CANCEL_COMMAND = "Cancel";
-        private static final String OK_COMMAND = "Ok";
+        private static final String OK_COMMAND = tr("Close");
         /**
          * 
@@ -119 +119 @@
                         
                         JPanel unresolvedButtons = new JPanel(new FlowLayout());
-                        JButton assign = new JButton(resolveAction);
+                        SideButton assign = new SideButton(resolveAction, "assignstreet_24");                                                                                                                      
                         unresolvedButtons.add(assign);
                         unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH);
@@ -143 +143 @@
                 JButton ok = new JButton(OK_COMMAND);
                 ok.addActionListener(this);
-                buttonPanel.add(ok);
-                
-                // JMapViewer
                 
                 // Murks
@@ -151 +148 @@
                         buttonPanel.add(new JSeparator());
                 }
+
+                buttonPanel.add(ok);
+                
                 
                 this.getContentPane().add(buttonPanel, BorderLayout.SOUTH);
@@ -174 +174 @@
         public void actionPerformed(ActionEvent e) {
                 if (OK_COMMAND.equals(e.getActionCommand())) {
-                        this.setVisible(false);
-                }
-                
-                // TODO: Check, if there is some kind of undo; otherwise this button is not necessary
-                if (CANCEL_COMMAND.equals(e.getActionCommand())) {
                         this.setVisible(false);
                 }