Index: /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs (revision 34057) +++ /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs (revision 34058) @@ -16,4 +16,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error @@ -47,5 +48,5 @@ org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning @@ -53,4 +54,5 @@ org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning @@ -59,4 +61,5 @@ org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore @@ -75,4 +78,5 @@ org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -81,4 +85,7 @@ org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java (revision 34057) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java (revision 34058) @@ -737,8 +737,8 @@ @Override - public int compareTo(StreetScore arg0) { - if (arg0 == null) return 1; - - return Integer.valueOf(score).compareTo(Integer.valueOf(arg0.score)); + public int compareTo(StreetScore o) { + if (o == null) return 1; + + return Integer.valueOf(score).compareTo(Integer.valueOf(o.score)); } } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java (revision 34057) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java (revision 34058) @@ -29,7 +29,7 @@ SelectIncompleteAddressesAction incAddrAction = new SelectIncompleteAddressesAction(); - // ... and add them to the tools menu in main - MainMenu.add(MainApplication.getMenu().toolsMenu, action, false, 0); - MainMenu.add(MainApplication.getMenu().toolsMenu, incAddrAction); + // ... and add them to JOSM menus + MainMenu.add(MainApplication.getMenu().dataMenu, action, false); + MainMenu.add(MainApplication.getMenu().selectionMenu, incAddrAction); // create preferences instance Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java (revision 34057) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java (revision 34058) @@ -44,5 +44,5 @@ @Override - public void actionPerformed(ActionEvent arg0) { + public void actionPerformed(ActionEvent e) { if (addressEditContainer != null) { addressEditContainer.attachToDataSet(newSelection); Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java (revision 34057) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java (revision 34058) @@ -45,6 +45,6 @@ import org.openstreetmap.josm.plugins.fixAddresses.StringUtils; import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction; +import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AddressActions; import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ApplyAllGuessesAction; -import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AddressActions; import org.openstreetmap.josm.tools.ImageProvider; @@ -381,14 +381,14 @@ @Override - public void keyPressed(KeyEvent arg0) { + public void keyPressed(KeyEvent e) { } @Override - public void keyReleased(KeyEvent arg0) { + public void keyReleased(KeyEvent e) { } @Override - public void keyTyped(KeyEvent arg0) { - JTable table = (JTable) arg0.getSource(); + public void keyTyped(KeyEvent e) { + JTable table = (JTable) e.getSource(); if (table == null) return; @@ -404,5 +404,5 @@ } - char firstChar = Character.toLowerCase(arg0.getKeyChar()); + char firstChar = Character.toLowerCase(e.getKeyChar()); // visit every row and find a matching entry Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java (revision 34057) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java (revision 34058) @@ -174,5 +174,5 @@ @Override - public abstract int compare(E arg0, E arg1); + public abstract int compare(E o1, E o2); } } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java (revision 34057) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java (revision 34058) @@ -78,6 +78,6 @@ @Override - public Class getColumnClass(int arg0) { - return COLUMN_CLASSES[arg0]; + public Class getColumnClass(int columnIndex) { + return COLUMN_CLASSES[columnIndex]; } @@ -131,22 +131,22 @@ @Override - public int compare(OSMAddress arg0, OSMAddress arg1) { + public int compare(OSMAddress o1, OSMAddress o2) { int cc = 0; switch (getColumn()) { case 0: - cc = arg0.getCountry().compareTo(arg1.getCountry()); + cc = o1.getCountry().compareTo(o2.getCountry()); break; case 1: - cc = arg0.getCity().compareTo(arg1.getCity()); + cc = o1.getCity().compareTo(o2.getCity()); break; case 2: - cc = arg0.getPostalCode().compareTo(arg1.getPostalCode()); + cc = o1.getPostalCode().compareTo(o2.getPostalCode()); break; case 3: - cc = arg0.getStreetName().compareTo(arg1.getStreetName()); + cc = o1.getStreetName().compareTo(o2.getStreetName()); break; case 4: - cc = arg0.getHouseNumber().compareTo(arg1.getHouseNumber()); + cc = o1.getHouseNumber().compareTo(o2.getHouseNumber()); break; default: Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java (revision 34057) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java (revision 34058) @@ -109,23 +109,23 @@ @Override - public int compare(OSMStreet arg0, OSMStreet arg1) { - if (arg0 == null || arg1 == null) return 0; + public int compare(OSMStreet o1, OSMStreet o2) { + if (o1 == null || o2 == null) return 0; switch (getColumn()) { case 0: - if (arg0.getType() != null) { - return arg0.getType().compareTo(arg1.getType()); + if (o1.getType() != null) { + return o1.getType().compareTo(o2.getType()); } else { - return arg1.hasName() ? -1 : 0; + return o2.hasName() ? -1 : 0; } case 1: - if (arg0.hasName()) { - return arg0.getName().compareTo(arg1.getName()); + if (o1.hasName()) { + return o1.getName().compareTo(o2.getName()); } else { - return arg1.hasName() ? -1 : 0; + return o2.hasName() ? -1 : 0; } case 2: - return Integer.valueOf(arg0.getNumberOfAddresses()). - compareTo(Integer.valueOf(arg1.getNumberOfAddresses())); + return Integer.valueOf(o1.getNumberOfAddresses()). + compareTo(Integer.valueOf(o2.getNumberOfAddresses())); default: } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java (revision 34057) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java (revision 34058) @@ -81,6 +81,6 @@ @Override - public Class getColumnClass(int arg0) { - return COLUMN_CLASSES[arg0]; + public Class getColumnClass(int columnIndex) { + return COLUMN_CLASSES[columnIndex]; } @@ -131,21 +131,21 @@ @Override - public int compare(OSMAddress arg0, OSMAddress arg1) { + public int compare(OSMAddress o1, OSMAddress o2) { int cc = 0; switch (getColumn()) { case 0: - cc = arg0.getStreetName().compareTo(arg1.getStreetName()); + cc = o1.getStreetName().compareTo(o2.getStreetName()); break; case 1: - cc = arg0.getHouseNumber().compareTo(arg1.getHouseNumber()); + cc = o1.getHouseNumber().compareTo(o2.getHouseNumber()); break; case 2: - cc = arg0.getCity().compareTo(arg1.getCity()); + cc = o1.getCity().compareTo(o2.getCity()); break; case 3: - cc = arg0.getPostalCode().compareTo(arg1.getPostalCode()); + cc = o1.getPostalCode().compareTo(o2.getPostalCode()); break; case 4: - cc = arg0.getName().compareTo(arg1.getName()); + cc = o1.getName().compareTo(o2.getName()); break; default: Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java (revision 34057) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java (revision 34058) @@ -83,5 +83,5 @@ @Override - public void actionPerformed(ActionEvent arg0) { + public void actionPerformed(ActionEvent e) { if (event != null) { // use the event acquired previously. addressEditActionPerformed(event); Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java (revision 34057) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java (revision 34058) @@ -124,17 +124,17 @@ @Override - public void mouseEntered(MouseEvent arg0) { + public void mouseEntered(MouseEvent e) { } @Override - public void mouseExited(MouseEvent arg0) { + public void mouseExited(MouseEvent e) { } @Override - public void mousePressed(MouseEvent arg0) { + public void mousePressed(MouseEvent e) { } @Override - public void mouseReleased(MouseEvent arg0) { + public void mouseReleased(MouseEvent e) { } } Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java (revision 34057) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java (revision 34058) @@ -25,5 +25,5 @@ @Override - public void actionPerformed(ActionEvent arg0) { + public void actionPerformed(ActionEvent e) { addressEditContainer = new AddressEditContainer(); addressEditContainer.invalidate();