Changeset 9059 in josm


Ignore:
Timestamp:
2015-11-23T01:09:15+01:00 (8 years ago)
Author:
Don-vip
Message:

checkstyle

Location:
trunk
Files:
107 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/Main.java

    r8959 r9059  
    14521452         */
    14531453        void toOtherApplication();
     1454
    14541455        /**
    1455          * Called when the user comes from a window of another application
    1456          * back to JOSM.
     1456         * Called when the user comes from a window of another application back to JOSM.
    14571457         */
    14581458        void fromOtherApplication();

  • trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java

    r6380 r9059  
    33package org.openstreetmap.josm.actions;
    44
     5import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
    56import static org.openstreetmap.josm.tools.I18n.tr;
    6 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
    77
    88import java.awt.event.ActionEvent;
    99import java.awt.event.KeyEvent;
    1010import java.util.Collection;
     11
    1112import org.openstreetmap.josm.Main;
    12 
    1313import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1414import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
    1515import org.openstreetmap.josm.tools.Shortcut;
    1616
    17 public final class DuplicateAction extends JosmAction{
     17public final class DuplicateAction extends JosmAction {
    1818
     19    /**
     20     * Constructs a new {@code DuplicateAction}.
     21     */
    1922    public DuplicateAction() {
    2023        super(tr("Duplicate"), "duplicate",

  • trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

    r8846 r9059  
    4040 * @since 3715
    4141 */
    42 public class ImageryAdjustAction extends MapMode implements MouseListener, MouseMotionListener, AWTEventListener{
     42public class ImageryAdjustAction extends MapMode implements MouseListener, MouseMotionListener, AWTEventListener {
    4343    private static volatile ImageryOffsetDialog offsetDialog;
    4444    private static Cursor cursor = ImageProvider.getCursor("normal", "move");

  • trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java

    r6380 r9059  
    1212public class UnselectAllAction extends JosmAction {
    1313
     14    /**
     15     * Constructs a new {@code UnselectAllAction}.
     16     */
    1417    public UnselectAllAction() {
    1518        super(tr("Unselect All"), "unselectall", tr("Unselect all objects."),
    … …  
    2629        getCurrentDataSet().setSelected();
    2730    }
     31
    2832    /**
    2933     * Refreshes the enabled state
    30      *
    3134     */
    3235    @Override

  • trunk/src/org/openstreetmap/josm/actions/UploadAction.java

    r8931 r9059  
    4444 * @author imi
    4545 */
    46 public class UploadAction extends JosmAction{
     46public class UploadAction extends JosmAction {
    4747    /**
    4848     * The list of upload hooks. These hooks will be called one after the other

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

    r8931 r9059  
    10561056        }
    10571057    }
     1058
    10581059    /**
    10591060     * Takes the data from computeHelperLine to determine which ways/nodes should be highlighted

  • trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

    r8931 r9059  
    357357        }
    358358    }
     359
    359360    /**
    360361     * Toggles dual alignment mode.

  • trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

    r8855 r9059  
    7575        return "";
    7676    }
     77
    7778    /**
    7879     * Call selectMapMode(this) on the parent mapFrame.

  • trunk/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java

    r8510 r9059  
    4343        // selected non-new relations
    4444        this.relations = Utils.filter(getRelations(primitives), new Predicate<Relation>() {
    45             @Override public boolean evaluate(Relation r) {
     45            @Override
     46            public boolean evaluate(Relation r) {
    4647                return !r.isNew();
    47             }});
     48            }
     49        });
    4850        updateEnabledState();
    4951    }

  • trunk/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java

    r8510 r9059  
    6969            public boolean evaluate(Relation r) {
    7070                return r.hasIncompleteMembers();
    71             }});
     71            }
     72        });
    7273        this.incompleteMembers = buildSetOfIncompleteMembers(relations);
    7374        updateEnabledState();

  • trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

    r8836 r9059  
    190190        return null;
    191191    }
     192
    192193    /**
    193194     * Replies the conflict for the {@link OsmPrimitive} <code>their</code>, null

  • trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java

    r8380 r9059  
    2424     * while others indicate the note being opened, closed or reopened
    2525     */
    26     public enum Action {opened, closed, reopened, commented}
     26    public enum Action {
     27        opened,
     28        closed,
     29        reopened,
     30        commented
     31    }
    2732
    2833    /**

  • trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

    r8510 r9059  
    3232 *
    3333 */
    34 public final class ChangesetCache implements PreferenceChangedListener{
     34public final class ChangesetCache implements PreferenceChangedListener {
    3535    /** the unique instance */
    3636    private static final ChangesetCache instance = new ChangesetCache();

  • trunk/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java

    r8510 r9059  
    77import java.util.Set;
    88
    9 public class DefaultChangesetCacheEvent implements ChangesetCacheEvent{
     9public class DefaultChangesetCacheEvent implements ChangesetCacheEvent {
    1010
    1111    private final Set<Changeset> added;

  • trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java

    r8510 r9059  
    8787            }
    8888
    89             public final void visitAll() {
     89            public void visitAll() {
    9090                for (OsmPrimitive osm : primitives) {
    9191                    firstIteration = true;

  • trunk/src/org/openstreetmap/josm/data/osm/Storage.java

    r8870 r9059  
    128128        this(ha, capacity, false);
    129129    }
     130
    130131    /**
    131132     * constructor

  • trunk/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java

    r6830 r9059  
    99public abstract class AbstractDatasetChangedEvent {
    1010
    11     public enum DatasetEventType {DATA_CHANGED, NODE_MOVED, PRIMITIVES_ADDED, PRIMITIVES_REMOVED,
    12         RELATION_MEMBERS_CHANGED, TAGS_CHANGED, WAY_NODES_CHANGED, CHANGESET_ID_CHANGED}
     11    public enum DatasetEventType {
     12        DATA_CHANGED,
     13        NODE_MOVED,
     14        PRIMITIVES_ADDED,
     15        PRIMITIVES_REMOVED,
     16        RELATION_MEMBERS_CHANGED,
     17        TAGS_CHANGED,
     18        WAY_NODES_CHANGED,
     19        CHANGESET_ID_CHANGED
     20    }
    1321
    1422    protected final DataSet dataSet;

  • trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

    r8836 r9059  
    9999        IN_EDT,
    100100        /**
    101          * Fire in event dispatch thread. If more than one event arrived when event queue is checked, merged them to
    102          * one event
     101         * Fire in event dispatch thread. If more than one event arrived when event queue is checked, merged them to one event
    103102         */
    104         IN_EDT_CONSOLIDATED}
     103        IN_EDT_CONSOLIDATED
     104    }
    105105
    106106    private static class ListenerInfo {

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

    r8510 r9059  
    2727 * @since 1670
    2828 */
    29 public class HistoryDataSet implements LayerChangeListener{
     29public class HistoryDataSet implements LayerChangeListener {
    3030    /** the unique instance */
    3131    private static HistoryDataSet historyDataSet;

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

    r8540 r9059  
    1919 *
    2020 */
    21 public class HistoryRelation extends HistoryOsmPrimitive{
     21public class HistoryRelation extends HistoryOsmPrimitive {
    2222
    2323    private List<RelationMemberData> members = new ArrayList<>();

  • trunk/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java

    r6380 r9059  
    1818     */
    1919    void visit(Node n);
     20
    2021    /**
    2122     * Visiting call for lines.
    … …  
    2425     */
    2526    void visit(Way w);
     27
    2628    /**
    2729     * Visiting call for relations.
    … …  
    3032     */
    3133    void visit(Relation r);
     34
    3235    /**
    3336     * Visiting call for changesets.

  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

    r9032 r9059  
    934934        }
    935935    }
     936
    936937    /**
    937938     * highlights a given point by drawing a rounded rectangle around it. Give the

  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

    r9032 r9059  
    190190
    191191    public static class PolyData {
    192         public enum Intersection {INSIDE, OUTSIDE, CROSSING}
     192        public enum Intersection {
     193            INSIDE,
     194            OUTSIDE,
     195            CROSSING
     196        }
    193197
    194198        private final Path2D.Double poly;

  • trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java

    r8836 r9059  
    282282                pane.setValue(JOptionPane.CLOSED_OPTION);
    283283                dialog.setVisible(false);
    284             }}
    285         );
     284            }
     285        });
    286286
    287287        if (options != null) {

  • trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java

    r8855 r9059  
    4949 *
    5050 */
    51 public final class JosmUserIdentityManager implements PreferenceChangedListener{
     51public final class JosmUserIdentityManager implements PreferenceChangedListener {
    5252
    5353    private static JosmUserIdentityManager instance;

  • trunk/src/org/openstreetmap/josm/gui/MainMenu.java

    r9006 r9059  
    947947            this.presetsMenu = presetsMenu;
    948948        }
     949
    949950        /**
    950951         * Refreshes the enabled state

  • trunk/src/org/openstreetmap/josm/gui/MapFrame.java

    r8958 r9059  
    689689        }
    690690    }
     691
    691692    /**
    692693     * Removes a mapMode change listener

  • trunk/src/org/openstreetmap/josm/gui/MapStatus.java

    r8907 r9059  
    495495               public void run() {
    496496                    staticPopup.hide();
    497                 }});
     497                }
     498            });
    498499        }
    499500
    … …  
    519520                // There is no old popup
    520521                EventQueue.invokeLater(new Runnable() {
    521                      @Override
    522                      public void run() {
    523                          staticPopup.show();
    524                      }});
     522                    @Override
     523                    public void run() {
     524                        staticPopup.show();
     525                    }
     526                });
    525527            }
    526528            this.popupLabels = lbls;

  • trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

    r8870 r9059  
    181181        eventSource.addTemporaryLayer(selectionHintLayer);
    182182    }
     183
    183184    /**
    184185     * Unregister itself from the given event source and hide the selection hint layer.

  • trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

    r9012 r9059  
    8080 * </pre>
    8181 */
    82 public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
     82public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser {
    8383
    8484    /** the current bounding box */
    … …  
    217217     *
    218218     */
    219     private static class TileGridInputPanel extends JPanel implements PropertyChangeListener{
     219    private static class TileGridInputPanel extends JPanel implements PropertyChangeListener {
    220220        public static final String TILE_BOUNDS_PROP = TileGridInputPanel.class.getName() + ".tileBounds";
    221221

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java

    r6890 r9059  
    77import javax.swing.table.TableColumn;
    88
    9 public class RelationMemberListColumnModel extends DefaultTableColumnModel{
     9public class RelationMemberListColumnModel extends DefaultTableColumnModel {
    1010
    1111    protected final void createColumns() {

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java

    r8836 r9059  
    4444        /** Call when need to go to next row */
    4545        void gotoNextDecision();
     46
    4647        /** Call when need to go to previous row */
    4748        void gotoPreviousDecision();

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java

    r6890 r9059  
    77import javax.swing.table.TableColumn;
    88
    9 public class TagConflictResolverColumnModel extends DefaultTableColumnModel{
     9public class TagConflictResolverColumnModel extends DefaultTableColumnModel {
    1010
    1111    protected final void createColumns() {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

    r8836 r9059  
    7373 *
    7474 */
    75 public class ChangesetDialog extends ToggleDialog{
     75public class ChangesetDialog extends ToggleDialog {
    7676    private ChangesetInSelectionListModel inSelectionModel;
    7777    private ChangesetsInActiveDataLayerListModel inActiveDataLayerModel;
    … …  
    291291     * Selects objects for the currently selected changesets.
    292292     */
    293     class SelectObjectsAction extends AbstractAction implements ListSelectionListener, ItemListener{
     293    class SelectObjectsAction extends AbstractAction implements ListSelectionListener, ItemListener {
    294294
    295295        SelectObjectsAction() {
    … …  
    345345     *
    346346     */
    347     class ReadChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener{
     347    class ReadChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener {
    348348        ReadChangesetsAction() {
    349349            putValue(NAME, tr("Download"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

    r8958 r9059  
    422422     * undo / redo switch to reduce duplicate code
    423423     */
    424     protected enum UndoRedoType {UNDO, REDO}
     424    protected enum UndoRedoType {
     425        UNDO,
     426        REDO
     427    }
    425428
    426429    /**

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r8846 r9059  
    6363 *
    6464 */
    65 public final class ConflictDialog extends ToggleDialog implements MapView.EditLayerChangeListener, IConflictListener, SelectionChangedListener{
     65public final class ConflictDialog extends ToggleDialog implements MapView.EditLayerChangeListener, IConflictListener, SelectionChangedListener {
    6666
    6767    /**

  • trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java

    r8989 r9059  
    274274    }
    275275
    276     private static class RelationMemberTableColumnModel extends DefaultTableColumnModel{
     276    private static class RelationMemberTableColumnModel extends DefaultTableColumnModel {
    277277
    278278        protected final void createColumns() {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

    r8840 r9059  
    9999        ELEMENT_SHRINKS         /* else. (Remaining elements have more space.) */
    100100    }
     101
    101102    /**
    102103     * Reconstruct the view, if the configurations of dialogs has changed.

  • trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

    r8870 r9059  
    150150                    filterModel.addFilter(filter);
    151151                }
    152             }});
     152            }
     153        });
    153154        SideButton editButton = new SideButton(new AbstractAction() {
    154155            {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r8855 r9059  
    693693
    694694    public final class ActivateLayerAction extends AbstractAction
    695     implements IEnabledStateUpdating, MapView.LayerChangeListener, MultikeyShortcutAction{
     695    implements IEnabledStateUpdating, MapView.LayerChangeListener, MultikeyShortcutAction {
    696696        private transient Layer layer;
    697697        private transient Shortcut multikeyShortcut;
    … …  
    11501150     * The action to move up the currently selected entries in the list.
    11511151     */
    1152     class MoveUpAction extends AbstractAction implements  IEnabledStateUpdating{
     1152    class MoveUpAction extends AbstractAction implements  IEnabledStateUpdating {
    11531153        MoveUpAction() {
    11541154            putValue(NAME, tr("Move up"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

    r8836 r9059  
    115115                }
    116116                updateButtonStates();
    117             }});
     117            }
     118        });
    118119        displayList.addMouseListener(new MouseAdapter() {
    119120            //center view on selected note on double click

  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r8979 r9059  
    328328     *
    329329     */
    330     static class NewAction extends AbstractAction implements LayerChangeListener{
     330    static class NewAction extends AbstractAction implements LayerChangeListener {
    331331        NewAction() {
    332332            putValue(SHORT_DESCRIPTION, tr("Create a new relation"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

    r8846 r9059  
    155155    }
    156156
    157     class SelectUsersPrimitivesAction extends AbstractAction implements ListSelectionListener{
     157    class SelectUsersPrimitivesAction extends AbstractAction implements ListSelectionListener {
    158158
    159159        /**

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java

    r8836 r9059  
    399399     *
    400400     */
    401     class RemoveFromCacheAction extends AbstractAction implements ListSelectionListener{
     401    class RemoveFromCacheAction extends AbstractAction implements ListSelectionListener {
    402402        RemoveFromCacheAction() {
    403403            putValue(NAME, tr("Remove from cache"));
    … …  
    427427     *
    428428     */
    429     class CloseSelectedChangesetsAction extends AbstractAction implements ListSelectionListener{
     429    class CloseSelectedChangesetsAction extends AbstractAction implements ListSelectionListener {
    430430        CloseSelectedChangesetsAction() {
    431431            putValue(NAME, tr("Close"));
    … …  
    469469     *
    470470     */
    471     class DownloadSelectedChangesetsAction extends AbstractAction implements ListSelectionListener{
     471    class DownloadSelectedChangesetsAction extends AbstractAction implements ListSelectionListener {
    472472        DownloadSelectedChangesetsAction() {
    473473            putValue(NAME, tr("Update changeset"));
    … …  
    498498     *
    499499     */
    500     class DownloadSelectedChangesetContentAction extends AbstractAction implements ListSelectionListener{
     500    class DownloadSelectedChangesetContentAction extends AbstractAction implements ListSelectionListener {
    501501        DownloadSelectedChangesetContentAction() {
    502502            putValue(NAME, tr("Download changeset content"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java

    r8510 r9059  
    2525 *
    2626 */
    27 public class ChangesetCacheManagerModel extends AbstractTableModel implements ChangesetCacheListener{
     27public class ChangesetCacheManagerModel extends AbstractTableModel implements ChangesetCacheListener {
    2828
    2929    /** the name of the property for the currently selected changeset in the detail view */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java

    r8510 r9059  
    2929 *
    3030 */
    31 public class ChangesetContentDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask{
     31public class ChangesetContentDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask {
    3232
    3333    /** the list of changeset ids to download */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

    r8836 r9059  
    191191     *
    192192     */
    193     class DownloadChangesetContentAction extends AbstractAction{
     193    class DownloadChangesetContentAction extends AbstractAction {
    194194        DownloadChangesetContentAction() {
    195195            putValue(NAME, tr("Download content"));
    … …  
    317317    }
    318318
    319     class SelectInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener{
     319    class SelectInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener {
    320320
    321321        SelectInCurrentLayerAction() {
    … …  
    367367    }
    368368
    369     class ZoomInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener{
     369    class ZoomInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener {
    370370
    371371        ZoomInCurrentLayerAction() {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java

    r8836 r9059  
    139139     *
    140140     */
    141     private static class ChangesetContentEntry implements ChangesetDataSetEntry{
     141    private static class ChangesetContentEntry implements ChangesetDataSetEntry {
    142142        private final ChangesetModificationType modificationType;
    143143        private final HistoryOsmPrimitive primitive;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

    r8855 r9059  
    326326     *
    327327     */
    328     class UpdateChangesetAction extends AbstractAction{
     328    class UpdateChangesetAction extends AbstractAction {
    329329        UpdateChangesetAction() {
    330330            putValue(NAME, tr("Update changeset"));
    … …  
    354354     *
    355355     */
    356     class SelectInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{
     356    class SelectInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener {
    357357
    358358        SelectInCurrentLayerAction() {
    … …  
    415415     *
    416416     */
    417     class ZoomInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{
     417    class ZoomInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener {
    418418
    419419        ZoomInCurrentLayerAction() {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDownloadTask.java

    r8510 r9059  
    66import org.openstreetmap.josm.data.osm.Changeset;
    77
    8 public interface ChangesetDownloadTask extends Runnable{
     8public interface ChangesetDownloadTask extends Runnable {
    99    Set<Changeset> getDownloadedChangesets();
    1010

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java

    r8510 r9059  
    3434 *
    3535 */
    36 public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask{
     36public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask {
    3737
    3838    /**

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java

    r6084 r9059  
    1111import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1212
    13 public class ChangesetInSelectionListModel extends ChangesetListModel implements SelectionChangedListener, EditLayerChangeListener{
     13public class ChangesetInSelectionListModel extends ChangesetListModel implements SelectionChangedListener, EditLayerChangeListener {
    1414
    1515    public ChangesetInSelectionListModel(DefaultListSelectionModel selectionModel) {
    1616        super(selectionModel);
    1717    }
     18
    1819    /* ---------------------------------------------------------------------------- */
    1920    /* Interface SelectionChangeListener                                            */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java

    r8855 r9059  
    1818 *
    1919 */
    20 public class ChangesetTagsPanel extends JPanel implements PropertyChangeListener{
     20public class ChangesetTagsPanel extends JPanel implements PropertyChangeListener {
    2121
    2222    private TagEditorModel model;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java

    r8836 r9059  
    7676     * Downloads the single changeset from the OSM API
    7777     */
    78     class DownloadAction extends AbstractAction implements DocumentListener{
     78    class DownloadAction extends AbstractAction implements DocumentListener {
    7979
    8080        DownloadAction() {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java

    r8510 r9059  
    3535 * @since 2689
    3636 */
    37 public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetDownloadTask{
     37public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetDownloadTask {
    3838
    3939    /** the changeset query */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r8996 r9059  
    708708        List<Relation> sortedRelations = new ArrayList<>(roles.keySet());
    709709        Collections.sort(sortedRelations, new Comparator<Relation>() {
    710             @Override public int compare(Relation o1, Relation o2) {
     710            @Override
     711            public int compare(Relation o1, Relation o2) {
    711712                int comp = Boolean.valueOf(o1.isDisabledAndHidden()).compareTo(o2.isDisabledAndHidden());
    712713                return comp != 0 ? comp : DefaultNameFormatter.getInstance().getRelationComparator().compare(o1, o2);
    713             }}
    714                 );
     714            }
     715        });
    715716
    716717        for (Relation r: sortedRelations) {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

    r8856 r9059  
    217217     * Recursively.
    218218     */
    219     class DownloadAllChildRelationsAction extends AbstractAction{
     219    class DownloadAllChildRelationsAction extends AbstractAction {
    220220        DownloadAllChildRelationsAction() {
    221221            putValue(SHORT_DESCRIPTION, tr("Download all child relations (recursively)"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r8863 r9059  
    8383import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
    8484import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
     85import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    8586import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
    86 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    8787import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
    8888import org.openstreetmap.josm.io.OnlineResource;
    … …  
    12081208    }
    12091209
    1210     class DeleteCurrentRelationAction extends AbstractAction implements PropertyChangeListener{
     1210    class DeleteCurrentRelationAction extends AbstractAction implements PropertyChangeListener {
    12111211        DeleteCurrentRelationAction() {
    12121212            putValue(SHORT_DESCRIPTION, tr("Delete the currently edited relation"));
    … …  
    15651565    }
    15661566
    1567     class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener, TableModelListener{
     1567    class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener, TableModelListener {
    15681568        DownloadSelectedIncompleteMembersAction() {
    15691569            putValue(SHORT_DESCRIPTION, tr("Download selected incomplete members"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

    r8836 r9059  
    123123
    124124    private transient ListSelectionListener highlighterListener = new ListSelectionListener() {
    125             @Override
    126             public void valueChanged(ListSelectionEvent lse) {
    127                 if (Main.isDisplayingMapView()) {
    128                     Collection<RelationMember> sel = getMemberTableModel().getSelectedMembers();
    129                     final List<OsmPrimitive> toHighlight = new ArrayList<>();
    130                     for (RelationMember r: sel) {
    131                         if (r.getMember().isUsable()) {
    132                             toHighlight.add(r.getMember());
     125        @Override
     126        public void valueChanged(ListSelectionEvent lse) {
     127            if (Main.isDisplayingMapView()) {
     128                Collection<RelationMember> sel = getMemberTableModel().getSelectedMembers();
     129                final List<OsmPrimitive> toHighlight = new ArrayList<>();
     130                for (RelationMember r: sel) {
     131                    if (r.getMember().isUsable()) {
     132                        toHighlight.add(r.getMember());
     133                    }
     134                }
     135                SwingUtilities.invokeLater(new Runnable() {
     136                    @Override
     137                    public void run() {
     138                        if (Main.isDisplayingMapView() && highlightHelper.highlightOnly(toHighlight)) {
     139                            Main.map.mapView.repaint();
    133140                        }
    134141                    }
    135                     SwingUtilities.invokeLater(new Runnable() {
    136                         @Override
    137                         public void run() {
    138                             if (Main.isDisplayingMapView() && highlightHelper.highlightOnly(toHighlight)) {
    139                                 Main.map.mapView.repaint();
    140                             }
    141                         }
    142                     });
    143                 }
    144             }};
     142                });
     143            }
     144        }
     145    };
    145146
    146147    private void initHighlighting() {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java

    r8510 r9059  
    5151 *
    5252 */
    53 public class ParentRelationLoadingTask extends PleaseWaitRunnable{
     53public class ParentRelationLoadingTask extends PleaseWaitRunnable {
    5454    private boolean canceled;
    5555    private Exception lastException;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java

    r8846 r9059  
    2020 *
    2121 */
    22 public class RelationDialogManager extends WindowAdapter implements MapView.LayerChangeListener{
     22public class RelationDialogManager extends WindowAdapter implements MapView.LayerChangeListener {
    2323
    2424    /** keeps track of open relation editors */
    … …  
    103103        openDialogs = new HashMap<>();
    104104    }
     105
    105106    /**
    106107     * Register the relation editor for a relation managed by a

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

    r8454 r9059  
    138138        }
    139139    }
     140
    140141    /**
    141142     * Replies the currently edited relation

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java

    r8510 r9059  
    1616import org.openstreetmap.josm.tools.CheckParameterUtil;
    1717
    18 public class SelectionTableModel extends AbstractTableModel implements SelectionChangedListener, MapView.LayerChangeListener{
     18public class SelectionTableModel extends AbstractTableModel implements SelectionChangedListener, MapView.LayerChangeListener {
    1919
    2020    /** this selection table model only displays selected primitives in this layer */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java

    r8840 r9059  
    3131public class RelationNodeMap {
    3232
    33     private static class NodesWays{
     33    private static class NodesWays {
    3434        public final Map<Node, Set<Integer>> nodes = new TreeMap<>();
    3535        public final Map<Integer, Set<Node>> ways = new TreeMap<>();

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java

    r8510 r9059  
    213213        return determineDirection(ref_i, ref_direction, k, false);
    214214    }
     215
    215216    /**
    216217     * Determines the direction of way k with respect to the way ref_i.

  • trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

    r8836 r9059  
    208208    }
    209209
    210     class RemoveAction extends AbstractAction implements ListSelectionListener{
     210    class RemoveAction extends AbstractAction implements ListSelectionListener {
    211211        /**
    212212         * Constructs a new {@code RemoveAction}.

  • trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java

    r8840 r9059  
    188188    }
    189189
    190     class LatValueChecker extends FocusAdapter implements ActionListener{
     190    class LatValueChecker extends FocusAdapter implements ActionListener {
    191191        private JosmTextField tfLatValue;
    192192

  • trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

    r8932 r9059  
    163163            public void actionPerformed(ActionEvent e) {
    164164                 Main.pref.put("download.autorun", cbStartup.isSelected());
    165             }});
     165            }
     166        });
    166167
    167168        pnl.add(cbNewLayer, GBC.std().anchor(GBC.WEST).insets(5, 5, 5, 5));

  • trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

    r8836 r9059  
    167167     *
    168168     */
    169     private static class LatLonViewer extends JPanel implements Observer{
     169    private static class LatLonViewer extends JPanel implements Observer {
    170170
    171171        private JLabel lblLat;

  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

    r8836 r9059  
    3636 *
    3737 */
    38 public class HistoryBrowserDialog extends JDialog implements HistoryDataSetListener{
     38public class HistoryBrowserDialog extends JDialog implements HistoryDataSetListener {
    3939
    4040    /** the embedded browser */

  • trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

    r8846 r9059  
    4444 * @since 1709
    4545 */
    46 public class VersionInfoPanel extends JPanel implements Observer{
     46public class VersionInfoPanel extends JPanel implements Observer {
    4747    private PointInTimeType pointInTimeType;
    4848    private transient HistoryBrowserModel model;

  • trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java

    r8951 r9059  
    4444 * @since 1709
    4545 */
    46 public class VersionTable extends JTable implements Observer{
     46public class VersionTable extends JTable implements Observer {
    4747    private VersionTablePopupMenu popupMenu;
    4848    private final transient HistoryBrowserModel model;

  • trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java

    r8836 r9059  
    4747 * </ul>
    4848 */
    49 public class ChangesetManagementPanel extends JPanel implements ListDataListener{
     49public class ChangesetManagementPanel extends JPanel implements ListDataListener {
    5050    public static final String SELECTED_CHANGESET_PROP = ChangesetManagementPanel.class.getName() + ".selectedChangeset";
    5151    public static final String CLOSE_CHANGESET_AFTER_UPLOAD = ChangesetManagementPanel.class.getName() + ".closeChangesetAfterUpload";
    … …  
    317317     *
    318318     */
    319     class CloseChangesetAction extends AbstractAction implements ItemListener{
     319    class CloseChangesetAction extends AbstractAction implements ItemListener {
    320320        CloseChangesetAction() {
    321321            putValue(SMALL_ICON, ImageProvider.get("closechangeset"));

  • trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java

    r8846 r9059  
    344344     *   If both text fields contain characters, submits the form by calling owner's {@link OKAction}.
    345345     */
    346     private static class TFKeyListener implements KeyListener{
     346    private static class TFKeyListener implements KeyListener {
    347347        protected CredentialDialog owner; // owner Dependency Injection to call OKAction
    348348        protected JTextField currentTF;

  • trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

    r8836 r9059  
    2929 * Shows progress bar when downloading
    3030 */
    31 public class DownloadFileTask extends PleaseWaitRunnable{
     31public class DownloadFileTask extends PleaseWaitRunnable {
    3232    private final String address;
    3333    private final File file;

  • trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java

    r8510 r9059  
    2121
    2222// FIXME this class should extend HtmlPanel instead (duplicated code in here)
    23 public class UploadParameterSummaryPanel extends JPanel implements HyperlinkListener, PropertyChangeListener{
     23public class UploadParameterSummaryPanel extends JPanel implements HyperlinkListener, PropertyChangeListener {
    2424    private transient UploadStrategySpecification spec = new UploadStrategySpecification();
    2525    private int numObjects;

  • trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

    r9004 r9059  
    497497
    498498    }
     499
    499500    /**
    500501     * Creates popup menu items and binds to mouse actions
    … …  
    678679                * 2);
    679680    }
     681
    680682    /**
    681683     * Checks zoom level against settings

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

    r8811 r9059  
    654654            return !equal(a, b);
    655655        }
     656
    656657        /**
    657658         * Determines whether the JOSM search with {@code searchStr} applies to the object.

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

    r8846 r9059  
    121121         *
    122122         */
    123         private  class MatchingReferrerFinder extends AbstractVisitor{
     123        private class MatchingReferrerFinder extends AbstractVisitor {
    124124            private Environment e;
    125125

  • trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

    r8836 r9059  
    336336     * Starts the authorisation process
    337337     */
    338     class RunAuthorisationAction extends AbstractAction implements DocumentListener{
     338    class RunAuthorisationAction extends AbstractAction implements DocumentListener {
    339339        RunAuthorisationAction() {
    340340            putValue(NAME, tr("Authorize now"));

  • trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java

    r8836 r9059  
    3939 * @since 2746
    4040 */
    41 public class ManualAuthorizationUI extends AbstractAuthorizationUI{
     41public class ManualAuthorizationUI extends AbstractAuthorizationUI {
    4242
    4343    private JosmTextField tfAccessTokenKey;

  • trunk/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java

    r8510 r9059  
    1515import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
    1616
    17 public class OsmPrivilegesPanel extends VerticallyScrollablePanel{
     17public class OsmPrivilegesPanel extends VerticallyScrollablePanel {
    1818
    1919    private JCheckBox cbWriteApi;

  • trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java

    r8836 r9059  
    382382     * Action for retrieving a request token
    383383     */
    384     class RetrieveRequestTokenAction extends AbstractAction{
     384    class RetrieveRequestTokenAction extends AbstractAction {
    385385
    386386        RetrieveRequestTokenAction() {

  • trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

    r8846 r9059  
    322322            public boolean identify(TabPreferenceSetting tps, Object name) {
    323323                return name != null && tps != null && tps.getIconName() != null && name.equals(tps.getIconName());
    324             }}, name);
     324            }
     325        }, name);
    325326    }
    326327
    … …  
    330331            public boolean identify(TabPreferenceSetting tps, Object clazz) {
    331332                return tps.getClass().isAssignableFrom((Class<?>) clazz);
    332             }}, clazz);
     333            }
     334        }, clazz);
    333335    }
    334336
    … …  
    342344                    public boolean identify(TabPreferenceSetting tps, Object unused) {
    343345                        return tps.equals(tab);
    344                     }}, null);
     346                    }
     347                }, null);
    345348                return tab.selectSubTab(sub);
    346349            }

  • trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

    r8850 r9059  
    265265            // XML style is not bundled anymore
    266266            list.remove(Utils.find(list, new Predicate<SourceEntry>() {
    267                         @Override
    268                         public boolean evaluate(SourceEntry se) {
    269                             return "resource://styles/standard/elemstyles.xml".equals(se.url);
    270                         }}));
     267                            @Override
     268                            public boolean evaluate(SourceEntry se) {
     269                                return "resource://styles/standard/elemstyles.xml".equals(se.url);
     270                            }
     271                        }));
    271272
    272273            return changed;

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java

    r8870 r9059  
    9393
    9494                @Override
    95                 public final boolean isValid() {
     95                public boolean isValid() {
    9696                    try {
    9797                        CustomProjection test = new CustomProjection();
    … …  
    110110                    return true;
    111111                }
    112 
    113112            };
    114113

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java

    r8510 r9059  
    2828 *
    2929 */
    30 public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel implements PropertyChangeListener{
     30public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel implements PropertyChangeListener {
    3131
    3232    /** indicates whether we use basic authentication */

  • trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java

    r8846 r9059  
    2424    private final CancelHandler cancelHandler;
    2525
    26     protected enum State {INIT, IN_TASK, IN_SUBTASK, FINISHED}
     26    protected enum State {
     27        INIT,
     28        IN_TASK,
     29        IN_SUBTASK,
     30        FINISHED
     31    }
    2732
    2833    protected State state = State.INIT;

  • trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java

    r8840 r9059  
    1717 *
    1818 */
    19 public class TagCellEditor extends AbstractCellEditor implements TableCellEditor{
     19public class TagCellEditor extends AbstractCellEditor implements TableCellEditor {
    2020
    2121    protected AutoCompletingTextField editor;

  • trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

    r8840 r9059  
    6161        this.colSelectionModel  = new DefaultListSelectionModel();
    6262    }
     63
    6364    /**
    6465     * Creates a new tag editor model.
    … …  
    301302        }
    302303    }
     304
    303305    /**
    304306     * deletes the tags given by tagIndices

  • trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

    r8840 r9059  
    282282     * Action to be run when the user adds a new tag.
    283283     *
    284      *
    285      */
    286     class AddAction extends RunnableAction implements PropertyChangeListener{
     284     */
     285    class AddAction extends RunnableAction implements PropertyChangeListener {
    287286        AddAction() {
    288287            putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
    … …  
    316315    }
    317316
    318      /**
     317    /**
    319318     * Action to be run when the user wants to paste tags from buffer
    320319     */
    321     class PasteAction extends RunnableAction implements PropertyChangeListener{
     320    class PasteAction extends RunnableAction implements PropertyChangeListener {
    322321        PasteAction() {
    323322            putValue(SMALL_ICON, ImageProvider.get("", "pastetags"));

  • trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java

    r8840 r9059  
    3232 *
    3333 */
    34 public abstract class AbstractTextComponentValidator implements ActionListener, FocusListener, DocumentListener, PropertyChangeListener{
     34public abstract class AbstractTextComponentValidator implements ActionListener, FocusListener, DocumentListener, PropertyChangeListener {
    3535    private static final Border ERROR_BORDER = BorderFactory.createLineBorder(Color.RED, 1);
    3636    private static final Color ERROR_BACKGROUND =  new Color(255, 224, 224);

  • trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java

    r8840 r9059  
    164164    }
    165165
    166     private static class LongitudeValidator extends AbstractTextComponentValidator{
     166    private static class LongitudeValidator extends AbstractTextComponentValidator {
    167167
    168168        public static void decorate(JTextComponent tc) {

  • trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java

    r8929 r9059  
    173173            }
    174174        }
     175
    175176        /** Rotate to the next allowed state.*/
    176177        private void nextState() {

  • trunk/src/org/openstreetmap/josm/gui/widgets/SelectAllOnFocusGainedDecorator.java

    r8510 r9059  
    88import javax.swing.text.JTextComponent;
    99
    10 public class SelectAllOnFocusGainedDecorator extends FocusAdapter{
     10public class SelectAllOnFocusGainedDecorator extends FocusAdapter {
    1111
    1212    public static void decorate(JTextComponent tc) {

  • trunk/src/org/openstreetmap/josm/io/CachedFile.java

    r8929 r9059  
    484484        return connectFollowingRedirect(downloadUrl, httpAccept, ifModifiedSince, null);
    485485    }
     486
    486487    /**
    487488     * Opens a connection for downloading a resource.

  • trunk/src/org/openstreetmap/josm/io/GpxReader.java

    r8856 r9059  
    4444public class GpxReader implements GpxConstants {
    4545
    46     private enum State { init, gpx, metadata, wpt, rte, trk, ext, author, link, trkseg, copyright}
     46    private enum State {
     47        init,
     48        gpx,
     49        metadata,
     50        wpt,
     51        rte,
     52        trk,
     53        ext,
     54        author,
     55        link,
     56        trkseg,
     57        copyright
     58    }
    4759
    4860    private String version;

  • trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

    r8855 r9059  
    5656 * </pre>
    5757 */
    58 public class MultiFetchServerObjectReader extends OsmServerReader{
     58public class MultiFetchServerObjectReader extends OsmServerReader {
    5959    /**
    6060     * the max. number of primitives retrieved in one step. Assuming IDs with 7 digits,

  • trunk/src/org/openstreetmap/josm/io/NoteReader.java

    r8851 r9059  
    4040     * needs to know which one it is handling.
    4141     */
    42     private enum NoteParseMode {API, DUMP}
     42    private enum NoteParseMode {
     43        API,
     44        DUMP
     45    }
    4346
    4447    /**

  • trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java

    r8509 r9059  
    2626        return username;
    2727    }
     28
    2829    /**
    2930     * Sets the user name
    … …  
    3334        this.username = username;
    3435    }
     36
    3537    /**
    3638     * Replies the password
    … …  
    4042        return password;
    4143    }
     44
    4245    /**
    4346     * Sets the password
    … …  
    4750        this.password = Utils.copyArray(password);
    4851    }
     52
    4953    /**
    5054     * Determines if authentication request has been canceled by user
    … …  
    5458        return canceled;
    5559    }
     60
    5661    /**
    5762     * Sets the cancelation status (authentication request canceled by user)
    … …  
    6166        this.canceled = canceled;
    6267    }
     68
    6369    /**
    6470     * Determines if authentication credentials should be saved
    … …  
    6874        return saveCredentials;
    6975    }
     76
    7077    /**
    7178     * Sets the saving status (authentication credentials to save)

  • trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java

    r8938 r9059  
    3333 *
    3434 */
    35 public class PluginDownloadTask extends PleaseWaitRunnable{
     35public class PluginDownloadTask extends PleaseWaitRunnable {
    3636
    3737    /**

  • trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

    r8944 r9059  
    11641164            public boolean accept(File dir, String name) {
    11651165                return name.endsWith(".jar.new");
    1166             }});
     1166            }
     1167        });
    11671168        if (files == null)
    11681169            return;

  • trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java

    r8510 r9059  
    3232         */
    3333        T get(LatLon ll);
     34
    3435        /**
    3536         * Look up the property for a coordinate rectangle.

  • trunk/src/org/openstreetmap/josm/tools/Geometry.java

    r9038 r9059  
    4343    }
    4444
    45     public enum PolygonIntersection {FIRST_INSIDE_SECOND, SECOND_INSIDE_FIRST, OUTSIDE, CROSSING}
     45    public enum PolygonIntersection {
     46        FIRST_INSIDE_SECOND,
     47        SECOND_INSIDE_FIRST,
     48        OUTSIDE,
     49        CROSSING
     50    }
    4651
    4752    /**

  • trunk/src/org/openstreetmap/josm/tools/Shortcut.java

    r8952 r9059  
    208208        }
    209209    }
     210
    210211    /**
    211212     * use this to set a buttons's mnemonic
    … …  
    216217        }
    217218    }
     219
    218220    /**
    219221     * Sets the mnemonic key on a text component.
    … …  
    224226        }
    225227    }
     228
    226229    /**
    227230     * use this to set a actions's accelerator

  • trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

    r8582 r9059  
    252252        }
    253253    }
     254
    254255    /**
    255256     * Formats a time to be displayed to current user, based on user preferences.

  • trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java

    r8514 r9059  
    1515
    1616@Ignore
    17 public class PropertiesMergerTest extends JFrame{
     17public class PropertiesMergerTest extends JFrame {
    1818
    1919    private PropertiesMerger merger;
Note: See TracChangeset for help on using the changeset viewer.