Changeset 23191 in osm for applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java

Timestamp:

2010-09-15T18:56:19+02:00 (14 years ago)

Author:

stoecker

Message:

remove tabs

File:

• applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java (modified) (9 diffs)

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

@@ -61 +61 @@
         this.street = street;
         this.associatedStreet = associatedStreet;
-        
+
         // This dialog is started modal
         this.dialog = new HouseNumberInputDialog(this, street, associatedStreet != null);
-        
+
         // We're done
     }
 
-        /**
-         * Find a button with a certain caption.
-         * Loops recursively through all objects to find all buttons.
-         * Function returns on the first match.
-         *
-         * @param root A container object that is recursively searched for other containers or buttons
-         * @param caption The caption of the button that is being searched
-         *
-         * @return The first button that matches the caption or null if not found
-         */
-        private static JButton getButton(Container root, String caption) {
-                Component children[] = root.getComponents();
+    /**
+     * Find a button with a certain caption.
+     * Loops recursively through all objects to find all buttons.
+     * Function returns on the first match.
+     *
+     * @param root A container object that is recursively searched for other containers or buttons
+     * @param caption The caption of the button that is being searched
+     *
+     * @return The first button that matches the caption or null if not found
+     */
+    private static JButton getButton(Container root, String caption) {
+        Component children[] = root.getComponents();
          for (Component child : children) {
-                JButton b;
-                if (child instanceof JButton) {
-                                b = (JButton) child;
-                                if (caption.equals(b.getText())) return b;
-                        } else if (child instanceof Container) {
+            JButton b;
+            if (child instanceof JButton) {
+                b = (JButton) child;
+                if (caption.equals(b.getText())) return b;
+            } else if (child instanceof Container) {
                   b = getButton((Container)child, caption);
                   if (b != null) return b;
              }
          }
-                return null;
-        }
-        
+        return null;
+    }
+
     /**
      * Validate the current input fields.
@@ -110 +110 @@
         // Allow non numeric characters for the low number as long as there is no high number of the segmentcount is 1
         if (dialog.hi.getText().length() > 0 | segments() > 1) {
-                    isOk = isOk
-                            && checkNumberStringField(dialog.lo, tr("Lowest number"),
-                                    message);
-                }
+            isOk = isOk
+                    && checkNumberStringField(dialog.lo, tr("Lowest number"),
+                            message);
+        }
         isOk = isOk
                 && checkNumberStringField(dialog.hi, tr("Highest number"),
@@ -124 +124 @@
             JButton okButton = getButton(dialog, "OK");
             if (okButton != null)
-                okButton.setEnabled(true);
-            
+                okButton.setEnabled(true);
+
             // For some reason the messageLabel doesn't want to show up
             dialog.messageLabel.setForeground(Color.black);
@@ -133 +133 @@
             JButton okButton = getButton(dialog, "OK");
             if (okButton != null)
-                        okButton.setEnabled(false);
-                                
-                // For some reason the messageLabel doesn't want to show up, so a MessageDialog is shown instead. Someone more knowledgeable might fix this.
-                dialog.messageLabel.setForeground(Color.red);
-                dialog.messageLabel.setText(message.toString());
-                //JOptionPane.showMessageDialog(null, message.toString(), tr("Error"), JOptionPane.ERROR_MESSAGE);
+                okButton.setEnabled(false);
+
+            // For some reason the messageLabel doesn't want to show up, so a MessageDialog is shown instead. Someone more knowledgeable might fix this.
+            dialog.messageLabel.setForeground(Color.red);
+            dialog.messageLabel.setText(message.toString());
+            //JOptionPane.showMessageDialog(null, message.toString(), tr("Error"), JOptionPane.ERROR_MESSAGE);
 
             return false;
@@ -273 +273 @@
             JButton button = (JButton) e.getSource();
             if ("OK".equals(button.getActionCommand()) & button.isEnabled()) {
-                if (validateInput()) {
-                            saveValues();
-                            
-                                terracerAction.terraceBuilding(
-                                    outline,
-                                    street,
-                                    associatedStreet,
-                                    segments(),
-                                    dialog.lo.getText(),
-                                    dialog.hi.getText(),
-                                    stepSize(),
-                                    streetName(),
-                                    doHandleRelation(),
-                                    doDeleteOutline());
-                                
-                            this.dialog.dispose();
-                        }
+                if (validateInput()) {
+                    saveValues();
+
+                    terracerAction.terraceBuilding(
+                        outline,
+                        street,
+                        associatedStreet,
+                        segments(),
+                        dialog.lo.getText(),
+                        dialog.hi.getText(),
+                        stepSize(),
+                        streetName(),
+                        doHandleRelation(),
+                        doDeleteOutline());
+
+                    this.dialog.dispose();
+                }
             } else if ("Cancel".equals(button.getActionCommand())) {
                 this.dialog.dispose();
@@ -357 +357 @@
         if (street != null)
             return null;
-            
+
         Object selected = dialog.streetComboBox.getSelectedItem();
         if (selected == null) {
@@ -376 +376 @@
      */
     public boolean doHandleRelation() {
-        if (this.dialog == null) {
-                JOptionPane.showMessageDialog(null, "dialog", "alert", JOptionPane.ERROR_MESSAGE); 
-        }
-        if (this.dialog.handleRelationCheckBox == null) {
-                JOptionPane.showMessageDialog(null, "checkbox", "alert", JOptionPane.ERROR_MESSAGE); 
-                return true;
-        }  else {
-                return this.dialog.handleRelationCheckBox.isSelected();
-        }
-    }
-
-   
+        if (this.dialog == null) {
+            JOptionPane.showMessageDialog(null, "dialog", "alert", JOptionPane.ERROR_MESSAGE);
+        }
+        if (this.dialog.handleRelationCheckBox == null) {
+            JOptionPane.showMessageDialog(null, "checkbox", "alert", JOptionPane.ERROR_MESSAGE);
+            return true;
+        }  else {
+            return this.dialog.handleRelationCheckBox.isSelected();
+        }
+    }
+
+
     /**
      * Whether the user likes to delete the outline way.
@@ -394 +394 @@
         return dialog.deleteOutlineCheckBox.isSelected();
     }
-    
+
     /* (non-Javadoc)
      * @see java.awt.event.FocusListener#focusGained(java.awt.event.FocusEvent)
      */
     public void focusGained(FocusEvent e) {
-                // Empty, but placeholder is required
+        // Empty, but placeholder is required
     }
 
@@ -406 +406 @@
      */
     public void focusLost(FocusEvent e) {
-        if (e.getOppositeComponent() == null)
-                return;
+        if (e.getOppositeComponent() == null)
+            return;
 
         validateInput();