Index: applications/editors/josm/plugins/addrinterpolation/.checkstyle
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/.checkstyle	(revision 33005)
+++ applications/editors/josm/plugins/addrinterpolation/.checkstyle	(revision 33005)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="JOSM" location="/JOSM/tools/checkstyle/josm_checks.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="JOSM" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="DerivedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value=".svn"/>
+    <filter-data value="data"/>
+    <filter-data value="images"/>
+    <filter-data value="resources"/>
+    <filter-data value="styles"/>
+    <filter-data value="scripts"/>
+  </filter>
+</fileset-config>
Index: applications/editors/josm/plugins/addrinterpolation/.project
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/.project	(revision 33004)
+++ applications/editors/josm/plugins/addrinterpolation/.project	(revision 33005)
@@ -16,7 +16,13 @@
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>
Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java	(revision 33004)
+++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java	(revision 33005)
@@ -1,4 +1,3 @@
-// License: GPL. Copyright 2009 by Mike Nice and others
-// Connects from JOSM menu action to Plugin
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.AddrInterpolation;
 
@@ -16,10 +15,9 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-
 @SuppressWarnings("serial")
-public  class AddrInterpolationAction extends JosmAction implements
+public class AddrInterpolationAction extends JosmAction implements
 SelectionChangedListener {
 
-    public AddrInterpolationAction(){
+    public AddrInterpolationAction() {
         super(tr("Address Interpolation"), "AddrInterpolation", tr("Handy Address Interpolation Functions"),
                 Shortcut.registerShortcut("tools:AddressInterpolation", tr("Tool: {0}", tr("Address Interpolation")),
@@ -43,8 +41,4 @@
         }
         setEnabled(false);
-
     }
-
 }
-
-
Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java	(revision 33004)
+++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java	(revision 33005)
@@ -1,5 +1,3 @@
-// License: GPL. Copyright 2009 by Mike Nice and others
-
-// Main plugin logic
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.AddrInterpolation;
 
@@ -59,5 +57,5 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-public class AddrInterpolationDialog extends JDialog implements ActionListener  {
+public class AddrInterpolationDialog extends JDialog implements ActionListener {
 
     private Way selectedStreet = null;
@@ -76,7 +74,7 @@
 
     // Edit controls
-    private EscapeDialog dialog=null;
+    private EscapeDialog dialog = null;
     private JRadioButton streetNameButton = null;
-    private JRadioButton streetRelationButton  = null;
+    private JRadioButton streetRelationButton = null;
     private JTextField startTextField = null;
     private JTextField endTextField = null;
@@ -95,12 +93,12 @@
     // NOTE: The following 2 arrays must match in number of elements and position
     // Tag values for map (Except that 'Numeric' is replaced by actual # on map)
-    String[] addrInterpolationTags = { "odd", "even", "all", "alphabetic", "Numeric" };
-    String[] addrInterpolationStrings = { tr("Odd"), tr("Even"), tr("All"), tr("Alphabetic"), tr("Numeric") }; // Translatable names for display
+    String[] addrInterpolationTags = {"odd", "even", "all", "alphabetic", "Numeric"};
+    String[] addrInterpolationStrings = {tr("Odd"), tr("Even"), tr("All"), tr("Alphabetic"), tr("Numeric") }; // Translatable names for display
     private final int NumericIndex = 4;
     private JComboBox<String> addrInterpolationList = null;
 
     // NOTE: The following 2 arrays must match in number of elements and position
-    String[] addrInclusionTags = { "actual", "estimate", "potential" }; // Tag values for map
-    String[] addrInclusionStrings = { tr("Actual"), tr("Estimate"), tr("Potential") }; // Translatable names for display
+    String[] addrInclusionTags = {"actual", "estimate", "potential" }; // Tag values for map
+    String[] addrInclusionStrings = {tr("Actual"), tr("Estimate"), tr("Potential") }; // Translatable names for display
     private JComboBox<String> addrInclusionList = null;
 
@@ -124,17 +122,14 @@
 
         dialog.add(editControlsPane);
-        dialog.setSize(new Dimension(300,500));
-        dialog.setLocation(new Point(100,300));
+        dialog.setSize(new Dimension(300, 500));
+        dialog.setLocation(new Point(100, 300));
 
         // Listen for windowOpened event to set focus
-        dialog.addWindowListener( new WindowAdapter()
-        {
+        dialog.addWindowListener(new WindowAdapter() {
             @Override
-            public void windowOpened( WindowEvent e )
-            {
+            public void windowOpened(WindowEvent e) {
                 if (addrInterpolationWay != null) {
                     startTextField.requestFocus();
-                }
-                else {
+                } else {
                     cityTextField.requestFocus();
                 }
@@ -163,5 +158,5 @@
         editControlsPane.setLayout(gridbag);
 
-        editControlsPane.setBorder(BorderFactory.createEmptyBorder(15,15,15,15));
+        editControlsPane.setBorder(BorderFactory.createEmptyBorder(15, 15, 15, 15));
 
         String streetName = selectedStreet.get("name");
@@ -174,5 +169,5 @@
         if (associatedStreetRelation == null) {
             streetNameButton.setSelected(true);
-        }else {
+        } else {
             streetRelationButton.setSelected(true);
         }
@@ -217,5 +212,5 @@
         JLabel[] textLabels = {startLabel, endLabel, numberingLabel, incrementLabel, inclusionLabel};
         Component[] editFields = {startTextField, endTextField, addrInterpolationList, incrementTextField, addrInclusionList};
-        AddEditControlRows(textLabels, editFields,  editControlsPane);
+        AddEditControlRows(textLabels, editFields, editControlsPane);
 
         cbConvertToHouseNumbers = new Checkbox(tr("Convert way to individual house numbers."), null, lastConvertToHousenumber);
@@ -259,5 +254,5 @@
         addrInterpolationList.addFocusListener(new FocusAdapter() {
             @Override
-            public void focusGained(FocusEvent fe){
+            public void focusGained(FocusEvent fe) {
                 if (!interpolationMethodSet) {
                     if (AutoDetectInterpolationMethod()) {
@@ -271,5 +266,5 @@
         // Numeric increment box can be enabled or disabled.
         addrInterpolationList.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e){
+            public void actionPerformed(ActionEvent e) {
                 int selectedIndex = addrInterpolationList.getSelectedIndex();
                 incrementTextField.setEnabled(selectedIndex == NumericIndex); // Enable or disable numeric field
@@ -281,10 +276,10 @@
         if (houseNumberNodes.size() > 0) {
             JLabel houseNumberNodeNote = new JLabel(tr("Will associate {0} additional house number nodes",
-                    houseNumberNodes.size() ));
+                    houseNumberNodes.size()));
             editControlsPane.add(houseNumberNodeNote, c);
         }
 
         editControlsPane.add(new UrlLabel("http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AddrInterpolation",
-                tr("More information about this feature"),2), c);
+                tr("More information about this feature"), 2), c);
 
         c.gridx = 0;
@@ -320,5 +315,5 @@
         String startValueString = ReadTextField(startTextField);
         String endValueString = ReadTextField(endTextField);
-        if ( (startValueString == null) || (endValueString== null) ) {
+        if ((startValueString == null) || (endValueString == null)) {
             // Not all values entered yet
             return false;
@@ -329,12 +324,11 @@
         if (isLong(startValueString) && isLong(endValueString)) {
             // Have 2 numeric values
-            long startValue = Long.parseLong( startValueString );
-            long endValue = Long.parseLong( endValueString );
+            long startValue = Long.parseLong(startValueString);
+            long endValue = Long.parseLong(endValueString);
 
             if (isEven(startValue)) {
                 if (isEven(endValue)) {
                     SelectInterpolationMethod("even");
-                }
-                else {
+                } else {
                     SelectInterpolationMethod("all");
                 }
@@ -342,6 +336,5 @@
                 if (!isEven(endValue)) {
                     SelectInterpolationMethod("odd");
-                }
-                else {
+                } else {
                     SelectInterpolationMethod("all");
                 }
@@ -352,5 +345,5 @@
             char endingChar = endValueString.charAt(endValueString.length()-1);
 
-            if ( (!IsNumeric("" + startingChar)) &&  (!IsNumeric("" + endingChar)) ) {
+            if ((!IsNumeric("" + startingChar)) && (!IsNumeric("" + endingChar))) {
                 // Both end with alpha
                 SelectInterpolationMethod("alphabetic");
@@ -358,7 +351,7 @@
             }
 
-            if ( (IsNumeric("" + startingChar)) &&  (!IsNumeric("" + endingChar)) ) {
+            if ((IsNumeric("" + startingChar)) && (!IsNumeric("" + endingChar))) {
                 endingChar = Character.toUpperCase(endingChar);
-                if ( (endingChar >= 'A') && (endingChar <= 'Z') ) {
+                if ((endingChar >= 'A') && (endingChar <= 'Z')) {
                     // First is a number, last is Latin alpha
                     SelectInterpolationMethod("alphabetic");
@@ -381,8 +374,7 @@
             incrementTextField.setText(currentMethod);
             incrementTextField.setEnabled(true);
-        }
-        else {
+        } else {
             // Must scan OSM key values because combo box is already loaded with translated strings
-            for (int i=0; i<addrInterpolationTags.length; i++) {
+            for (int i = 0; i < addrInterpolationTags.length; i++) {
                 if (addrInterpolationTags[i].equals(currentMethod)) {
                     currentIndex = i;
@@ -399,5 +391,5 @@
         int currentIndex = 0;
         // Must scan OSM key values because combo box is already loaded with translated strings
-        for (int i=0; i<addrInclusionTags.length; i++) {
+        for (int i = 0; i < addrInclusionTags.length; i++) {
             if (addrInclusionTags[i].equals(currentMethod)) {
                 currentIndex = i;
@@ -416,5 +408,5 @@
         editControlsPane.setLayout(gridbag);
 
-        editControlsPane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        editControlsPane.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
         JLabel[] optionalTextLabels = {new JLabel(tr("City:")),
@@ -433,5 +425,5 @@
             @Override
             public void keyTyped(KeyEvent e) {
-                JTextField jtextfield = (JTextField)e.getSource();
+                JTextField jtextfield = (JTextField) e.getSource();
                 String text = jtextfield.getText();
                 int length = text.length();
@@ -444,5 +436,5 @@
                     // Accept key; convert to upper case
                     if (!e.isActionKey()) {
-                        e.setKeyChar(Character.toUpperCase(e.getKeyChar()) );
+                        e.setKeyChar(Character.toUpperCase(e.getKeyChar()));
                     }
                 }
@@ -451,5 +443,5 @@
 
         Component[] optionalEditFields = {cityTextField, stateTextField, postCodeTextField, countryTextField, fullTextField};
-        AddEditControlRows(optionalTextLabels, optionalEditFields,  editControlsPane);
+        AddEditControlRows(optionalTextLabels, optionalEditFields, editControlsPane);
 
         JPanel optionPanel = new JPanel(new BorderLayout());
@@ -543,5 +535,5 @@
                     if (relationType.equals("associatedStreet")) {
                         for (RelationMember relationMember : relation.getMembers()) {
-                            if (relationMember.isWay()){
+                            if (relationMember.isWay()) {
                                 Way way = (Way) relationMember.getMember();
                                 // System.out.println("Name: " + way.get("name") );
@@ -552,8 +544,8 @@
                                     String streetName = "";
                                     if (relation.getKeys().containsKey("name")) {
-                                        streetName =  relation.get("name");
+                                        streetName = relation.get("name");
                                     } else {
                                         // Relation is unnamed - use street name
-                                        streetName =  selectedStreet.get("name");
+                                        streetName = selectedStreet.get("name");
                                     }
                                     relationDescription += " (" + streetName + ")";
@@ -561,5 +553,4 @@
                                 }
                             }
-
                         }
                     }
@@ -590,6 +581,5 @@
                     namedWayCount++;
                     this.selectedStreet = way;
-                }
-                else {
+                } else {
                     unNamedWayCount++;
                     this.addrInterpolationWay = way;
@@ -600,5 +590,5 @@
             //   Either selected or in the middle of the Address Interpolation way
             //     Do not include end points of Address Interpolation way in this set yet.
-            houseNumberNodes  = new ArrayList<>();
+            houseNumberNodes = new ArrayList<>();
             // Check selected nodes
             for (OsmPrimitive osm : currentDataSet.getSelectedNodes()) {
@@ -612,5 +602,5 @@
                 // Check nodes in middle of address interpolation way
                 if (addrInterpolationWay.getNodesCount() > 2) {
-                    for (int i=1; i<(addrInterpolationWay.getNodesCount()-2); i++) {
+                    for (int i = 1; i < (addrInterpolationWay.getNodesCount()-2); i++) {
                         Node testNode = addrInterpolationWay.getNode(i);
                         if (testNode.getKeys().containsKey("addr:housenumber")) {
@@ -682,5 +672,5 @@
                 dialog.dispose();
             }
-        } else  if ("cancel".equals(e.getActionCommand())) {
+        } else if ("cancel".equals(e.getActionCommand())) {
             dialog.dispose();
         }
@@ -694,6 +684,5 @@
         if (strValue.length() > 0) {
             return strValue.substring(0, strValue.length()-1);
-        }
-        else {
+        } else {
             return "";
         }
@@ -703,6 +692,5 @@
         if (strValue.length() > 0) {
             return strValue.charAt(strValue.length()-1);
-        }
-        else {
+        } else {
             return 0;
         }
@@ -710,19 +698,15 @@
 
     // Test for valid positive long int
-    private boolean isLong( String input ) {
-        try
-        {
-            Long val = Long.parseLong( input );
+    private boolean isLong(String input) {
+        try {
+            Long val = Long.parseLong(input);
             return (val > 0);
-        }
-        catch( Exception e)
-        {
+        } catch (Exception e) {
             return false;
         }
     }
 
-    private boolean isEven( Long input )
-    {
-        return ((input %2) == 0);
+    private boolean isEven(Long input) {
+        return ((input % 2) == 0);
     }
 
@@ -737,9 +721,9 @@
 
         String baseAlpha = BaseAlpha(endValueString);
-        int nSegments  =endNodeIndex - startNodeIndex;
+        int nSegments = endNodeIndex - startNodeIndex;
 
         double[] segmentLengths = new double[nSegments];
         // Total length of address interpolation way section
-        double totalLength= CalculateSegmentLengths(startNodeIndex, endNodeIndex, segmentLengths);
+        double totalLength = CalculateSegmentLengths(startNodeIndex, endNodeIndex, segmentLengths);
 
 
@@ -751,5 +735,5 @@
             Node lastHouseNode = addrInterpolationWay.getNode(startNodeIndex);
             int currentSegment = 0; // Segment being used to place new house # node
-            char currentChar= startingChar;
+            char currentChar = startingChar;
             while (nHouses > 0) {
                 double distanceNeeded = houseSpacing;
@@ -769,5 +753,5 @@
                 Node newHouseNumberNode = new Node(newHouseNumberPosition);
                 currentChar++;
-                if ( (currentChar >'Z') && (currentChar <'a')) {
+                if ((currentChar > 'Z') && (currentChar < 'a')) {
                     // Wraparound past uppercase Z: go directly to lower case a
                     currentChar = 'a';
@@ -784,5 +768,5 @@
 
                 segmentLengths[currentSegment] -= distanceNeeded; // Track amount used
-                nHouses -- ;
+                nHouses--;
             }
         }
@@ -800,5 +784,5 @@
         // Search for possible anchors from the 2nd node to 2nd from last, interpolating between each anchor
         int startIndex = 0; // Index into first interpolation zone of address interpolation way
-        for (int i=1; i<addrInterpolationWay.getNodesCount()-1; i++) {
+        for (int i = 1; i < addrInterpolationWay.getNodesCount()-1; i++) {
             Node testNode = addrInterpolationWay.getNode(i);
             String endNodeNumber = testNode.get("addr:housenumber");
@@ -807,5 +791,5 @@
                 if (endNodeNumber != "") {
                     char anchorChar = LastChar(endNodeNumber);
-                    if ( (anchorChar >startingChar) && (anchorChar < endingChar) ) {
+                    if ((anchorChar > startingChar) && (anchorChar < endingChar)) {
                         // Lies within the expected range
                         InterpolateAlphaSection(startIndex, i, endNodeNumber, startingChar, anchorChar);
@@ -825,5 +809,5 @@
     }
 
-    private double CalculateSegmentLengths(int startNodeIndex, int endNodeIndex, double segmentLengths[]) {
+    private double CalculateSegmentLengths(int startNodeIndex, int endNodeIndex, double[] segmentLengths) {
         Node fromNode = addrInterpolationWay.getNode(startNodeIndex);
         double totalLength = 0.0;
@@ -831,5 +815,5 @@
         for (int segment = 0; segment < nSegments; segment++) {
             Node toNode = addrInterpolationWay.getNode(startNodeIndex + 1 + segment);
-            segmentLengths[segment]= fromNode.getCoor().greatCircleDistance(toNode.getCoor());
+            segmentLengths[segment] = fromNode.getCoor().greatCircleDistance(toNode.getCoor());
             totalLength += segmentLengths[segment];
 
@@ -843,12 +827,12 @@
             long increment) {
 
-        int nSegments  =endNodeIndex - startNodeIndex;
+        int nSegments = endNodeIndex - startNodeIndex;
 
         double[] segmentLengths = new double[nSegments];
 
         // Total length of address interpolation way section
-        double totalLength= CalculateSegmentLengths(startNodeIndex, endNodeIndex, segmentLengths);
-
-        int nHouses = (int)((endingAddr - startingAddr) / increment) -1;
+        double totalLength = CalculateSegmentLengths(startNodeIndex, endNodeIndex, segmentLengths);
+
+        int nHouses = (int) ((endingAddr - startingAddr) / increment) -1;
         if (nHouses > 0) {
 
@@ -885,5 +869,5 @@
 
                 segmentLengths[currentSegment] -= distanceNeeded; // Track amount used
-                nHouses -- ;
+                nHouses--;
             }
         }
@@ -892,10 +876,10 @@
     private void CreateNumericInterpolation(String startValueString, String endValueString, long increment) {
 
-        long startingAddr = Long.parseLong( startValueString );
-        long endingAddr = Long.parseLong( endValueString );
+        long startingAddr = Long.parseLong(startValueString);
+        long endingAddr = Long.parseLong(endValueString);
 
         // Search for possible anchors from the 2nd node to 2nd from last, interpolating between each anchor
         int startIndex = 0; // Index into first interpolation zone of address interpolation way
-        for (int i=1; i<addrInterpolationWay.getNodesCount()-1; i++) {
+        for (int i = 1; i < addrInterpolationWay.getNodesCount()-1; i++) {
             Node testNode = addrInterpolationWay.getNode(i);
             String strEndNodeNumber = testNode.get("addr:housenumber");
@@ -904,6 +888,6 @@
                 if (isLong(strEndNodeNumber)) {
 
-                    long anchorAddrNumber = Long.parseLong( strEndNodeNumber );
-                    if ( (anchorAddrNumber >startingAddr) && (anchorAddrNumber < endingAddr) ) {
+                    long anchorAddrNumber = Long.parseLong(strEndNodeNumber);
+                    if ((anchorAddrNumber > startingAddr) && (anchorAddrNumber < endingAddr)) {
                         // Lies within the expected range
                         InterpolateNumericSection(startIndex, i, startingAddr, anchorAddrNumber, increment);
@@ -954,5 +938,5 @@
 
         // Remove untagged nodes
-        for (int i=1; i<addrInterpolationWay.getNodesCount()-1; i++) {
+        for (int i = 1; i < addrInterpolationWay.getNodesCount()-1; i++) {
             Node testNode = addrInterpolationWay.getNode(i);
             if (!testNode.hasKeys()) {
@@ -977,8 +961,8 @@
         String selectedMethod = GetInterpolationMethod();
         if (addrInterpolationWay != null) {
-            Long startAddr=0L, endAddr=0L;
+            Long startAddr = 0L, endAddr = 0L;
             if (!selectedMethod.equals("alphabetic")) {
                 Long[] addrArray = {startAddr, endAddr};
-                if (!ValidAddressNumbers(startValueString, endValueString, addrArray )) {
+                if (!ValidAddressNumbers(startValueString, endValueString, addrArray)) {
                     return false;
                 }
@@ -1009,5 +993,5 @@
             }
             if (!errorMessage.equals("")) {
-                JOptionPane.showMessageDialog(Main.parent, errorMessage, tr("Error"),   JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(Main.parent, errorMessage, tr("Error"), JOptionPane.ERROR_MESSAGE);
                 return false;
             }
@@ -1017,5 +1001,5 @@
             if (country.length() != 2) {
                 JOptionPane.showMessageDialog(Main.parent,
-                        tr("Country code must be 2 letters"), tr("Error"),  JOptionPane.ERROR_MESSAGE);
+                        tr("Country code must be 2 letters"), tr("Error"), JOptionPane.ERROR_MESSAGE);
                 return false;
             }
@@ -1086,5 +1070,5 @@
                 AddToRelation(associatedStreetRelation, node, "house");
             }
-            if ((city != null) || (streetNameButton.isSelected()) ) {
+            if ((city != null) || (streetNameButton.isSelected())) {
                 // Include street unconditionally if adding nodes only or city name specified
                 commandGroup.add(new ChangePropertyCommand(node, "addr:street", streetName));
@@ -1102,5 +1086,4 @@
         }
 
-
         Main.main.undoRedo.add(new SequenceCommand(tr("Address Interpolation"), commandGroup));
         Main.map.repaint();
@@ -1115,9 +1098,9 @@
         }
         long testIncrement = Long.parseLong(incrementString);
-        if ( (testIncrement <=0) || (testIncrement > endingAddr ) ) {
+        if ((testIncrement <= 0) || (testIncrement > endingAddr)) {
             return false;
         }
 
-        if ( ((endingAddr - startingAddr) % testIncrement) != 0) {
+        if (((endingAddr - startingAddr) % testIncrement) != 0) {
             return false;
         }
@@ -1150,5 +1133,5 @@
     // Test if relation contains specified member
     //   If not already present, it is added
-    private void AddToRelation(Relation relation,   OsmPrimitive testMember, String role) {
+    private void AddToRelation(Relation relation, OsmPrimitive testMember, String role) {
         boolean isFound = false;
         for (RelationMember relationMember : relation.getMembers()) {
@@ -1174,5 +1157,5 @@
     private String ValidateAlphaAddress(String startValueString,
             String endValueString) {
-        String errorMessage="";
+        String errorMessage = "";
 
         if (startValueString.equals("") || endValueString.equals("")) {
@@ -1184,11 +1167,11 @@
 
             boolean isOk = false;
-            if ( (IsNumeric("" + startingChar)) &&  (!IsNumeric("" + endingChar)) ) {
+            if ((IsNumeric("" + startingChar)) && (!IsNumeric("" + endingChar))) {
                 endingChar = Character.toUpperCase(endingChar);
-                if ( (endingChar >= 'A') && (endingChar <= 'Z') ) {
+                if ((endingChar >= 'A') && (endingChar <= 'Z')) {
                     // First is a number, last is Latin alpha
                     isOk = true;
                 }
-            } else if ( (!IsNumeric("" + startingChar)) && (!IsNumeric("" + endingChar)) ) {
+            } else if ((!IsNumeric("" + startingChar)) && (!IsNumeric("" + endingChar))) {
                 // Both are alpha
                 isOk = true;
@@ -1197,5 +1180,4 @@
                 errorMessage = tr("Alphabetic address must end with a letter");
             }
-
 
             // if a number is included, validate that it is the same number
@@ -1235,6 +1217,6 @@
         }
         if (errorMessage.equals("")) {
-            addrArray[0] = Long.parseLong( startValueString );
-            addrArray[1] = Long.parseLong( endValueString );
+            addrArray[0] = Long.parseLong(startValueString);
+            addrArray[1] = Long.parseLong(endValueString);
 
             if (addrArray[1] <= addrArray[0]) {
@@ -1247,5 +1229,5 @@
 
         } else {
-            JOptionPane.showMessageDialog(Main.parent, errorMessage, tr("Error"),   JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent, errorMessage, tr("Error"), JOptionPane.ERROR_MESSAGE);
             return false;
         }
Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationPlugin.java
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationPlugin.java	(revision 33004)
+++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationPlugin.java	(revision 33005)
@@ -1,5 +1,4 @@
-// License: GPL. Copyright 2009 by Mike Nice and others
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.AddrInterpolation;
-
 
 import org.openstreetmap.josm.Main;
Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/EscapeDialog.java
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/EscapeDialog.java	(revision 33004)
+++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/EscapeDialog.java	(revision 33005)
@@ -1,4 +1,3 @@
-// License: GPL. Copyright 2009 by Mike Nice and others
-// Handles ESC key to close a dialog
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.AddrInterpolation;
 
@@ -16,31 +15,38 @@
 public class EscapeDialog extends JDialog {
     public EscapeDialog() {
-        this((Frame)null, false);
+        this((Frame) null, false);
     }
+    
     public EscapeDialog(Frame owner) {
         this(owner, false);
     }
+    
     public EscapeDialog(Frame owner, boolean modal) {
         this(owner, null, modal);
     }
+    
     public EscapeDialog(Frame owner, String title) {
         this(owner, title, false);
     }
+    
     public EscapeDialog(Frame owner, String title, boolean modal) {
         super(owner, title, modal);
     }
+    
     public EscapeDialog(Dialog owner) {
         this(owner, false);
     }
+    
     public EscapeDialog(Dialog owner, boolean modal) {
         this(owner, null, modal);
     }
+    
     public EscapeDialog(Dialog owner, String title) {
         this(owner, title, false);
     }
+    
     public EscapeDialog(Dialog owner, String title, boolean modal) {
         super(owner, title, modal);
     }
-
 
     @Override