Changeset 22018 in osm for applications/editors/josm/plugins/terracer

Timestamp:

2010-06-25T21:33:50+02:00 (14 years ago)

Author:

jttt

Message:

Adapt to latest josm

Location:

applications/editors/josm/plugins/terracer

Files:

• build.xml (modified) (1 diff)
• src/terracer/HouseNumberInputDialog.java (modified) (7 diffs)

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

@@ -33 +33 @@
 
     <property name="commit.message" value="Fix crash when adding a single address to an odd shaped building. See also #2496" />
-    <property name="plugin.main.version" value="3210" />
+    <property name="plugin.main.version" value="3338" />
 
 

applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java

@@ -14 +14 @@
 import java.awt.Container;
 import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Frame;
+import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
-
 import java.util.TreeSet;
 
 import javax.swing.BoxLayout;
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -37 +30 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox; 
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -83 +76 @@
 
         HouseNumberInputHandler inputHandler;
-        
+
     /**
      * @param street If street is not null, we assume, the name of the street to be fixed
@@ -120 +113 @@
                 this.interpolation.addItemListener(this.inputHandler);
     }
-        
+
     /**
      * This method initializes jContentPane
@@ -154 +147 @@
             messageLabel.setEditable(false);
             messageLabel.setFocusable(false); // Needed so that lowest number can have focus immediately
-            
+
             interpolationLabel = new JLabel();
             interpolationLabel.setText(tr("Interpolation"));
@@ -177 +170 @@
                         c.gridwidth = GridBagConstraints.REMAINDER;
             inputPanel.add(messageLabel, c);
-            
+
             inputPanel.add(loLabel, GBC.std().insets(3,3,0,0));
             inputPanel.add(getLo(), GBC.eol().fill(GBC.HORIZONTAL).insets(5,3,0,0));
@@ -201 +194 @@
      * Overrides the default actions. Will not close the window when upload trace is clicked
      */
-    @Override protected void buttonAction(final ActionEvent evt) {
+    @Override protected void buttonAction(int buttonIndex, final ActionEvent evt) {
         String a = evt.getActionCommand();
         this.inputHandler.actionPerformed(evt);