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 30197) +++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java (revision 30532) @@ -93,5 +93,4 @@ private boolean interpolationMethodSet = false; - // 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) @@ -99,12 +98,10 @@ String[] addrInterpolationStrings = { tr("Odd"), tr("Even"), tr("All"), tr("Alphabetic"), tr("Numeric") }; // Translatable names for display private final int NumericIndex = 4; - private JComboBox addrInterpolationList = null; + private JComboBox 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 - private JComboBox addrInclusionList = null; - - + private JComboBox addrInclusionList = null; // For tracking edit changes as group for undo @@ -121,8 +118,5 @@ ShowDialog(editControlsPane, name); - - } - - + } private void ShowDialog(JPanel editControlsPane, String name) { @@ -160,6 +154,4 @@ } - - // Create edit control items and return JPanel on which they reside private JPanel CreateEditControls() { @@ -172,5 +164,4 @@ editControlsPane.setBorder(BorderFactory.createEmptyBorder(15,15,15,15)); - String streetName = selectedStreet.get("name"); @@ -204,5 +195,5 @@ JLabel numberingLabel = new JLabel(tr("Numbering Scheme:")); - addrInterpolationList = new JComboBox(addrInterpolationStrings); + addrInterpolationList = new JComboBox<>(addrInterpolationStrings); JLabel incrementLabel = new JLabel(tr("Increment:")); @@ -217,5 +208,5 @@ JLabel inclusionLabel = new JLabel(tr("Accuracy:")); - addrInclusionList = new JComboBox(addrInclusionStrings); + addrInclusionList = new JComboBox<>(addrInclusionStrings); addrInclusionList.setSelectedIndex(lastAccuracyIndex); @@ -239,6 +230,4 @@ } - - JPanel optionPanel = CreateOptionalFields(); c.gridx = 0; @@ -248,5 +237,4 @@ editControlsPane.add(optionPanel, c); - KeyAdapter enterProcessor = new KeyAdapter() { @@ -257,5 +245,4 @@ dialog.dispose(); } - } } @@ -267,5 +254,4 @@ addrInterpolationList.addKeyListener(enterProcessor); incrementTextField.addKeyListener(enterProcessor); - // Watch when Interpolation Method combo box is selected so that @@ -282,5 +268,4 @@ }); - // Watch when Interpolation Method combo box is changed so that // Numeric increment box can be enabled or disabled. @@ -292,8 +277,5 @@ }); - editControlsPane.add(cbConvertToHouseNumbers, c); - - if (houseNumberNodes.size() > 0) { @@ -305,5 +287,4 @@ editControlsPane.add(new UrlLabel("http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AddrInterpolation", tr("More information about this feature"),2), c); - c.gridx = 0; @@ -332,6 +313,4 @@ } - - // Call after both starting and ending housenumbers have been entered - usually when // combo box gets focus. @@ -368,6 +347,4 @@ } } - - } else { // Test for possible alpha @@ -392,12 +369,7 @@ // Did not detect alpha return false; - - } - + } return true; - - } - - + } // Set Interpolation Method combo box to method specified by 'currentMethod' (an OSM key value) @@ -423,5 +395,4 @@ } - // Set Inclusion Method combo box to method specified by 'currentMethod' (an OSM key value) private void SelectInclusion(String currentMethod) { @@ -435,8 +406,5 @@ } addrInclusionList.setSelectedIndex(currentIndex); - - } - - + } // Create optional control fields in a group box @@ -485,6 +453,4 @@ AddEditControlRows(optionalTextLabels, optionalEditFields, editControlsPane); - - JPanel optionPanel = new JPanel(new BorderLayout()); Border groupBox = BorderFactory.createEtchedBorder(); @@ -498,9 +464,6 @@ } - - // Populate dialog for any possible existing settings if editing an existing Address interpolation way private void GetExistingMapKeys() { - // Check all nodes for optional addressing data @@ -538,11 +501,6 @@ CheckNodeForAddressTags(firstNode); CheckNodeForAddressTags(lastNode); - - } - - - - } - + } + } // Check for any existing address data. If found, @@ -571,8 +529,5 @@ lastFullAddress = value; } - - } - - + } // Look for a possible 'associatedStreet' type of relation for selected street @@ -609,13 +564,10 @@ } } - - } - } - + } + } } return ""; } - // We can proceed only if there is both a named way (the 'street') and @@ -668,5 +620,4 @@ } } - } @@ -697,8 +648,6 @@ } - return isValid; } - /** @@ -728,6 +677,4 @@ } - - public void actionPerformed(ActionEvent e) { if ("ok".equals(e.getActionCommand())) { @@ -735,12 +682,8 @@ dialog.dispose(); } - } else if ("cancel".equals(e.getActionCommand())) { dialog.dispose(); - - } - } - - + } + } // For Alpha interpolation, return base string @@ -757,5 +700,4 @@ } - private char LastChar(String strValue) { if (strValue.length() > 0) { @@ -767,8 +709,6 @@ } - // Test for valid positive long int - private boolean isLong( String input ) - { + private boolean isLong( String input ) { try { @@ -791,5 +731,4 @@ return p.matcher(s).matches(); } - private void InterpolateAlphaSection(int startNodeIndex, int endNodeIndex, String endValueString, @@ -828,6 +767,4 @@ LatLon newHouseNumberPosition = lastHouseNode.getCoor().interpolate(toNode.getCoor(), proportion); - - Node newHouseNumberNode = new Node(newHouseNumberPosition); currentChar++; @@ -850,8 +787,5 @@ } } - - - } - + } private void CreateAlphaInterpolation(String startValueString, String endValueString) { @@ -889,7 +823,5 @@ // End nodes do not actually contain housenumber value yet (command has not executed), so use user-entered value InterpolateAlphaSection(startIndex, addrInterpolationWay.getNodesCount()-1, endValueString, startingChar, endingChar); - - } - + } private double CalculateSegmentLengths(int startNodeIndex, int endNodeIndex, double segmentLengths[]) { @@ -905,7 +837,5 @@ } return totalLength; - - } - + } private void InterpolateNumericSection(int startNodeIndex, int endNodeIndex, @@ -913,5 +843,4 @@ long increment) { - int nSegments =endNodeIndex - startNodeIndex; @@ -920,5 +849,4 @@ // Total length of address interpolation way section double totalLength= CalculateSegmentLengths(startNodeIndex, endNodeIndex, segmentLengths); - int nHouses = (int)((endingAddr - startingAddr) / increment) -1; @@ -956,13 +884,9 @@ lastHouseNode = newHouseNumberNode; - segmentLengths[currentSegment] -= distanceNeeded; // Track amount used nHouses -- ; } } - - - } - + } private void CreateNumericInterpolation(String startValueString, String endValueString, long increment) { @@ -970,5 +894,4 @@ 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 @@ -1000,5 +923,4 @@ } - // Called if user has checked "Convert to House Numbers" checkbox. private void ConvertWayToHousenumbers(String selectedMethod, String startValueString, String endValueString, @@ -1011,5 +933,4 @@ CreateAlphaInterpolation(startValueString, endValueString); - } else { @@ -1021,12 +942,9 @@ } CreateNumericInterpolation(startValueString, endValueString, increment); - - } - + } RemoveAddressInterpolationWay(); } - private void RemoveAddressInterpolationWay() { @@ -1044,8 +962,5 @@ addrInterpolationWay = null; - - } - - + } private boolean ValidateAndSave() { @@ -1084,13 +999,12 @@ } else if (selectedMethod.equals("all")) { - }else if (selectedMethod.equals("alphabetic")) { + } else if (selectedMethod.equals("alphabetic")) { errorMessage = ValidateAlphaAddress(startValueString, endValueString); - }else if (selectedMethod.equals("Numeric")) { + } else if (selectedMethod.equals("Numeric")) { if (!ValidNumericIncrementString(incrementString, startAddr, endAddr)) { errorMessage = tr("Expected valid number for increment"); } - } if (!errorMessage.equals("")) { @@ -1125,5 +1039,4 @@ currentDataSet.clearSelection(lastNode); // Workaround for JOSM Bug #3838 } - String interpolationTagValue = selectedMethod; @@ -1151,6 +1064,4 @@ } - - if (streetRelationButton.isSelected()) { @@ -1167,5 +1078,4 @@ } } - // For all nodes, add to relation and @@ -1199,5 +1109,4 @@ } - private boolean ValidNumericIncrementString(String incrementString, long startingAddr, long endingAddr) { @@ -1215,6 +1124,4 @@ return true; } - - // Create Associated Street relation, add street, and add to list of commands to perform @@ -1228,6 +1135,4 @@ } - - // Read from dialog text box, removing leading and trailing spaces // Return the string, or null for a zero length string @@ -1243,5 +1148,4 @@ } - // Test if relation contains specified member // If not already present, it is added @@ -1263,6 +1167,4 @@ } } - - // Check alphabetic style address @@ -1316,11 +1218,8 @@ errorMessage = tr("Starting address letter must be less than ending address letter"); } - } return errorMessage; } - - // Convert string addresses to numeric, with error check @@ -1353,11 +1252,8 @@ } - - private String GetInterpolationMethod() { int selectedIndex = addrInterpolationList.getSelectedIndex(); return addrInterpolationTags[selectedIndex]; } - private String GetInclusionMethod() { @@ -1366,12 +1262,3 @@ return addrInclusionTags[selectedIndex]; } - - - - - - - } - -