Ignore:
Timestamp:
2018-02-09T23:53:38+01:00 (7 years ago)
Author:
donvip
Message:

code cleanup, move actions to more appropriate menus

Location:
applications/editors/josm/plugins/FixAddresses
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs

    r32970 r34058  
    1616org.eclipse.jdt.core.compiler.debug.localVariable=generate
    1717org.eclipse.jdt.core.compiler.debug.sourceFile=generate
     18org.eclipse.jdt.core.compiler.problem.APILeak=warning
    1819org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
    1920org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
    … …  
    4748org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
    4849org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
    49 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
     50org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
    5051org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
    5152org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
    … …  
    5354org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
    5455org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
     56org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
    5557org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
    5658org.eclipse.jdt.core.compiler.problem.nullReference=warning
    … …  
    5961org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
    6062org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
     63org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
    6164org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
    6265org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
    … …  
    7578org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
    7679org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
     80org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
    7781org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
    7882org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
    … …  
    8185org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
    8286org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
     87org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
     88org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
     89org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
    8390org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
    8491org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java

    r33718 r34058  
    737737
    738738        @Override
    739         public int compareTo(StreetScore arg0) {
    740             if (arg0 == null) return 1;
    741 
    742             return Integer.valueOf(score).compareTo(Integer.valueOf(arg0.score));
     739        public int compareTo(StreetScore o) {
     740            if (o == null) return 1;
     741
     742            return Integer.valueOf(score).compareTo(Integer.valueOf(o.score));
    743743        }
    744744    }

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java

    r33718 r34058  
    2929        SelectIncompleteAddressesAction incAddrAction = new SelectIncompleteAddressesAction();
    3030
    31         // ... and add them to the tools menu in main
    32         MainMenu.add(MainApplication.getMenu().toolsMenu, action, false, 0);
    33         MainMenu.add(MainApplication.getMenu().toolsMenu, incAddrAction);
     31        // ... and add them to JOSM menus
     32        MainMenu.add(MainApplication.getMenu().dataMenu, action, false);
     33        MainMenu.add(MainApplication.getMenu().selectionMenu, incAddrAction);
    3434
    3535        // create preferences instance

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java

    r32970 r34058  
    4444
    4545    @Override
    46     public void actionPerformed(ActionEvent arg0) {
     46    public void actionPerformed(ActionEvent e) {
    4747        if (addressEditContainer != null) {
    4848            addressEditContainer.attachToDataSet(newSelection);

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java

    r33963 r34058  
    4545import org.openstreetmap.josm.plugins.fixAddresses.StringUtils;
    4646import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction;
     47import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AddressActions;
    4748import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ApplyAllGuessesAction;
    48 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AddressActions;
    4949import org.openstreetmap.josm.tools.ImageProvider;
    5050
    … …  
    381381
    382382        @Override
    383         public void keyPressed(KeyEvent arg0) {
     383        public void keyPressed(KeyEvent e) {
    384384        }
    385385
    386386        @Override
    387         public void keyReleased(KeyEvent arg0) {
     387        public void keyReleased(KeyEvent e) {
    388388        }
    389389
    390390        @Override
    391         public void keyTyped(KeyEvent arg0) {
    392             JTable table = (JTable) arg0.getSource();
     391        public void keyTyped(KeyEvent e) {
     392            JTable table = (JTable) e.getSource();
    393393
    394394            if (table == null) return;
    … …  
    404404            }
    405405
    406             char firstChar = Character.toLowerCase(arg0.getKeyChar());
     406            char firstChar = Character.toLowerCase(e.getKeyChar());
    407407
    408408            // visit every row and find a matching entry

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java

    r32970 r34058  
    174174
    175175        @Override
    176         public abstract int compare(E arg0, E arg1);
     176        public abstract int compare(E o1, E o2);
    177177    }
    178178}

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java

    r32970 r34058  
    7878
    7979    @Override
    80     public Class<?> getColumnClass(int arg0) {
    81         return COLUMN_CLASSES[arg0];
     80    public Class<?> getColumnClass(int columnIndex) {
     81        return COLUMN_CLASSES[columnIndex];
    8282    }
    8383
    … …  
    131131
    132132        @Override
    133         public int compare(OSMAddress arg0, OSMAddress arg1) {
     133        public int compare(OSMAddress o1, OSMAddress o2) {
    134134            int cc = 0;
    135135
    136136            switch (getColumn()) {
    137137            case 0:
    138                 cc = arg0.getCountry().compareTo(arg1.getCountry());
     138                cc = o1.getCountry().compareTo(o2.getCountry());
    139139                break;
    140140            case 1:
    141                 cc = arg0.getCity().compareTo(arg1.getCity());
     141                cc = o1.getCity().compareTo(o2.getCity());
    142142                break;
    143143            case 2:
    144                 cc = arg0.getPostalCode().compareTo(arg1.getPostalCode());
     144                cc = o1.getPostalCode().compareTo(o2.getPostalCode());
    145145                break;
    146146            case 3:
    147                 cc = arg0.getStreetName().compareTo(arg1.getStreetName());
     147                cc = o1.getStreetName().compareTo(o2.getStreetName());
    148148                break;
    149149            case 4:
    150                 cc = arg0.getHouseNumber().compareTo(arg1.getHouseNumber());
     150                cc = o1.getHouseNumber().compareTo(o2.getHouseNumber());
    151151                break;
    152152            default:

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java

    r32970 r34058  
    109109
    110110        @Override
    111         public int compare(OSMStreet arg0, OSMStreet arg1) {
    112             if (arg0 == null || arg1 == null) return 0;
     111        public int compare(OSMStreet o1, OSMStreet o2) {
     112            if (o1 == null || o2 == null) return 0;
    113113
    114114            switch (getColumn()) {
    115115            case 0:
    116                 if (arg0.getType() != null) {
    117                     return arg0.getType().compareTo(arg1.getType());
     116                if (o1.getType() != null) {
     117                    return o1.getType().compareTo(o2.getType());
    118118                } else {
    119                     return arg1.hasName() ? -1 : 0;
     119                    return o2.hasName() ? -1 : 0;
    120120                }
    121121            case 1:
    122                 if (arg0.hasName()) {
    123                     return arg0.getName().compareTo(arg1.getName());
     122                if (o1.hasName()) {
     123                    return o1.getName().compareTo(o2.getName());
    124124                } else {
    125                     return arg1.hasName() ? -1 : 0;
     125                    return o2.hasName() ? -1 : 0;
    126126                }
    127127            case 2:
    128                 return Integer.valueOf(arg0.getNumberOfAddresses()).
    129                                 compareTo(Integer.valueOf(arg1.getNumberOfAddresses()));
     128                return Integer.valueOf(o1.getNumberOfAddresses()).
     129                                compareTo(Integer.valueOf(o2.getNumberOfAddresses()));
    130130            default:
    131131            }

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java

    r32970 r34058  
    8181
    8282    @Override
    83     public Class<?> getColumnClass(int arg0) {
    84         return COLUMN_CLASSES[arg0];
     83    public Class<?> getColumnClass(int columnIndex) {
     84        return COLUMN_CLASSES[columnIndex];
    8585    }
    8686
    … …  
    131131
    132132        @Override
    133         public int compare(OSMAddress arg0, OSMAddress arg1) {
     133        public int compare(OSMAddress o1, OSMAddress o2) {
    134134            int cc = 0;
    135135            switch (getColumn()) {
    136136            case 0:
    137                 cc = arg0.getStreetName().compareTo(arg1.getStreetName());
     137                cc = o1.getStreetName().compareTo(o2.getStreetName());
    138138                break;
    139139            case 1:
    140                 cc = arg0.getHouseNumber().compareTo(arg1.getHouseNumber());
     140                cc = o1.getHouseNumber().compareTo(o2.getHouseNumber());
    141141                break;
    142142            case 2:
    143                 cc = arg0.getCity().compareTo(arg1.getCity());
     143                cc = o1.getCity().compareTo(o2.getCity());
    144144                break;
    145145            case 3:
    146                 cc = arg0.getPostalCode().compareTo(arg1.getPostalCode());
     146                cc = o1.getPostalCode().compareTo(o2.getPostalCode());
    147147                break;
    148148            case 4:
    149                 cc = arg0.getName().compareTo(arg1.getName());
     149                cc = o1.getName().compareTo(o2.getName());
    150150                break;
    151151            default:

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java

    r33718 r34058  
    8383
    8484    @Override
    85     public void actionPerformed(ActionEvent arg0) {
     85    public void actionPerformed(ActionEvent e) {
    8686        if (event != null) { // use the event acquired previously.
    8787            addressEditActionPerformed(event);

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java

    r32970 r34058  
    124124
    125125    @Override
    126     public void mouseEntered(MouseEvent arg0) {
     126    public void mouseEntered(MouseEvent e) {
    127127    }
    128128
    129129    @Override
    130     public void mouseExited(MouseEvent arg0) {
     130    public void mouseExited(MouseEvent e) {
    131131    }
    132132
    133133    @Override
    134     public void mousePressed(MouseEvent arg0) {
     134    public void mousePressed(MouseEvent e) {
    135135    }
    136136
    137137    @Override
    138     public void mouseReleased(MouseEvent arg0) {
     138    public void mouseReleased(MouseEvent e) {
    139139    }
    140140}

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java

    r32445 r34058  
    2525
    2626    @Override
    27     public void actionPerformed(ActionEvent arg0) {
     27    public void actionPerformed(ActionEvent e) {
    2828        addressEditContainer = new AddressEditContainer();
    2929        addressEditContainer.invalidate();
Note: See TracChangeset for help on using the changeset viewer.