Context Navigation

FixAddresses

Timestamp:

2016-08-05T19:26:51+02:00 (8 years ago)

Author:

donvip

Message:

fix error-prone warnings

Location:

Files:

r32445	r32771
742	742	if (arg0 == null) return 1;
743	743
744		return ~~new Integer(score).compareTo(new Integer~~(arg0.score));
	744	return Integer.valueOf(score).compareTo(Integer.valueOf(arg0.score));
745	745	}
746	746	}

r30348	r32771
25	25	*/
26	26	public static class Factory implements PreferenceSettingFactory {
	27	@Override
27	28	public PreferenceSetting createPreferenceSetting() {
28	29	return new FixAddressesPreferences();

-              r32445
+              r32771
             Collection<? extends OsmPrimitive> selection) {
         // Enable button if there is either a selection or at least a data set
+        setEnabled( selection != null && !selection.isEmpty() ||
+                    (getLayerManager().getEditDataSet() != null));
+        setEnabled((selection != null && !selection.isEmpty()) || getLayerManager().getEditDataSet() != null);
+    }

r32445	r32771
195	195
196	196	// TODO: Put in separate file
197		private class GuessStreetValueHandler extends GuessedValueHandler {
	197	private static class GuessStreetValueHandler extends GuessedValueHandler {
198	198	public GuessStreetValueHandler(String tag) {
199	199	this(tag, null);

r30348	r32771
66	66	public void visit(IAllKnowingTrashHeap trashHeap, IProblemVisitor visitor);
67	67
	68	@Override
68	69	int compareTo(IOSMEntity o);
69	70	}

-              r30348
+              r32771
+        }
+        @Override
         public void mouseClicked(MouseEvent e) {
             TableColumnModel colModel = table.getColumnModel();
 …
      * Internal base class to sort items by different columns.
      */
     protected abstract class ColumnSorter<E> implements Comparator<E> {
+    protected static abstract class ColumnSorter<E> implements Comparator<E> {
         private int column;
         private boolean ascending;

r30348	r32771
117	117	* Internal class StreetModelSorter.
118	118	*/
119		class IncompleteAddressModelSorter extends ColumnSorter<OSMAddress> {
	119	static class IncompleteAddressModelSorter extends ColumnSorter<OSMAddress> {
120	120
121	121	/**

-              r30348
+              r32771
      * Internal class StreetModelSorter.
      */
     class StreetModelSorter extends ColumnSorter<OSMStreet> {
+    static class StreetModelSorter extends ColumnSorter<OSMStreet> {
         public StreetModelSorter(int column, boolean asc) {
 …
+        }
+        @Override
         public int compare(OSMStreet arg0, OSMStreet arg1) {
             if (arg0 == null || arg1 == null) return 0;
 …
+                }
             case 2:
                 return new Integer(arg0.getNumberOfAddresses()).
                                 compareTo(new Integer(arg1.getNumberOfAddresses()));
+                return Integer.valueOf(arg0.getNumberOfAddresses()).
+                                compareTo(Integer.valueOf(arg1.getNumberOfAddresses()));
             default:
+            }

r30348	r32771
128	128	* Internal class StreetModelSorter.
129	129	*/
130		class UnresolvedAddressModelSorter extends ColumnSorter<OSMAddress> {
	130	static class UnresolvedAddressModelSorter extends ColumnSorter<OSMAddress> {
131	131
132	132	public UnresolvedAddressModelSorter(int column, boolean asc) {

Note: See TracChangeset for help on using the changeset viewer.