Changeset 8836 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2015-10-08T00:22:36+02:00 (9 years ago)

Author:

Don-vip

Message:

fix Checkstyle issues

Location:

trunk/src/org/openstreetmap/josm/gui/conflict

Files:

• pair/ListMerger.java (modified) (13 diffs)
• pair/properties/PropertiesMerger.java (modified) (6 diffs)
• pair/tags/TagMerger.java (modified) (4 diffs)
• tags/CombinePrimitiveResolverDialog.java (modified) (2 diffs)
• tags/MultiValueCellEditor.java (modified) (1 diff)
• tags/RelationMemberConflictResolver.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -435 +435 @@
     class CopyStartLeftAction extends CopyAction {
 
-        public CopyStartLeftAction() {
+        CopyStartLeftAction() {
             super(/* ICON(dialogs/conflict/)*/ "copystartleft", tr("> top"),
                 tr("Copy my selected nodes to the start of the merged node list"));
@@ -457 +457 @@
     class CopyEndLeftAction extends CopyAction {
 
-        public CopyEndLeftAction() {
+        CopyEndLeftAction() {
             super(/* ICON(dialogs/conflict/)*/ "copyendleft", tr("> bottom"),
                 tr("Copy my selected elements to the end of the list of merged elements."));
@@ -479 +479 @@
     class CopyBeforeCurrentLeftAction extends CopyAction {
 
-        public CopyBeforeCurrentLeftAction() {
+        CopyBeforeCurrentLeftAction() {
             super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentleft", tr("> before"),
                     tr("Copy my selected elements before the first selected element in the list of merged elements."));
@@ -509 +509 @@
     class CopyAfterCurrentLeftAction extends CopyAction {
 
-        public CopyAfterCurrentLeftAction() {
+        CopyAfterCurrentLeftAction() {
             super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentleft", tr("> after"),
                     tr("Copy my selected elements after the first selected element in the list of merged elements."));
@@ -535 +535 @@
     class CopyStartRightAction extends CopyAction {
 
-        public CopyStartRightAction() {
+        CopyStartRightAction() {
             super(/* ICON(dialogs/conflict/)*/ "copystartright", tr("< top"),
                 tr("Copy their selected element to the start of the list of merged elements."));
@@ -553 +553 @@
     class CopyEndRightAction extends CopyAction {
 
-        public CopyEndRightAction() {
+        CopyEndRightAction() {
             super(/* ICON(dialogs/conflict/)*/ "copyendright", tr("< bottom"),
                 tr("Copy their selected elements to the end of the list of merged elements."));
@@ -571 +571 @@
     class CopyBeforeCurrentRightAction extends CopyAction {
 
-        public CopyBeforeCurrentRightAction() {
+        CopyBeforeCurrentRightAction() {
             super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentright", tr("< before"),
                     tr("Copy their selected elements before the first selected element in the list of merged elements."));
@@ -597 +597 @@
     class CopyAfterCurrentRightAction extends CopyAction {
 
-        public CopyAfterCurrentRightAction() {
+        CopyAfterCurrentRightAction() {
             super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentright", tr("< after"),
                     tr("Copy their selected element after the first selected element in the list of merged elements"));
@@ -623 +623 @@
     class CopyAllLeft extends AbstractAction implements Observer, PropertyChangeListener {
 
-        public CopyAllLeft() {
+        CopyAllLeft() {
             ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallleft");
             putValue(Action.SMALL_ICON, icon);
@@ -652 +652 @@
     class CopyAllRight extends AbstractAction implements Observer, PropertyChangeListener {
 
-        public CopyAllRight() {
+        CopyAllRight() {
             ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallright");
             putValue(Action.SMALL_ICON, icon);
@@ -681 +681 @@
     class MoveUpMergedAction extends AbstractAction implements ListSelectionListener {
 
-        public MoveUpMergedAction() {
+        MoveUpMergedAction() {
             ImageIcon icon = ImageProvider.get("dialogs/conflict", "moveup");
             putValue(Action.SMALL_ICON, icon);
@@ -715 +715 @@
     class MoveDownMergedAction extends AbstractAction implements ListSelectionListener {
 
-        public MoveDownMergedAction() {
+        MoveDownMergedAction() {
             ImageIcon icon = ImageProvider.get("dialogs/conflict", "movedown");
             putValue(Action.SMALL_ICON, icon);
@@ -749 +749 @@
     class RemoveMergedAction extends AbstractAction implements ListSelectionListener {
 
-        public RemoveMergedAction() {
+        RemoveMergedAction() {
             ImageIcon icon = ImageProvider.get("dialogs/conflict", "remove");
             putValue(Action.SMALL_ICON, icon);

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -392 +392 @@
 
     class KeepMyCoordinatesAction extends AbstractAction implements Observer {
-        public KeepMyCoordinatesAction() {
+        KeepMyCoordinatesAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine"));
             putValue(Action.SHORT_DESCRIPTION, tr("Keep my coordinates"));
@@ -409 +409 @@
 
     class KeepTheirCoordinatesAction extends AbstractAction implements Observer {
-        public KeepTheirCoordinatesAction() {
+        KeepTheirCoordinatesAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir"));
             putValue(Action.SHORT_DESCRIPTION, tr("Keep their coordinates"));
@@ -426 +426 @@
 
     class UndecideCoordinateConflictAction extends AbstractAction implements Observer {
-        public UndecideCoordinateConflictAction() {
+        UndecideCoordinateConflictAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagundecide"));
             putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between different coordinates"));
@@ -443 +443 @@
 
     class KeepMyDeletedStateAction extends AbstractAction implements Observer {
-        public KeepMyDeletedStateAction() {
+        KeepMyDeletedStateAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine"));
             putValue(Action.SHORT_DESCRIPTION, tr("Keep my deleted state"));
@@ -460 +460 @@
 
     class KeepTheirDeletedStateAction extends AbstractAction implements Observer {
-        public KeepTheirDeletedStateAction() {
+        KeepTheirDeletedStateAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir"));
             putValue(Action.SHORT_DESCRIPTION, tr("Keep their deleted state"));
@@ -477 +477 @@
 
     class UndecideDeletedStateConflictAction extends AbstractAction implements Observer {
-        public UndecideDeletedStateConflictAction() {
+        UndecideDeletedStateConflictAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagundecide"));
             putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between deleted state"));

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

@@ -270 +270 @@
      */
     class KeepMineAction extends AbstractAction implements ListSelectionListener {
-        public KeepMineAction() {
+        KeepMineAction() {
             ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeepmine");
             if (icon != null) {
@@ -302 +302 @@
      */
     class KeepTheirAction extends AbstractAction implements ListSelectionListener {
-        public KeepTheirAction() {
+        KeepTheirAction() {
             ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeeptheir");
             if (icon != null) {
@@ -339 +339 @@
         private final Set<Adjustable> synchronizedAdjustables;
 
-        public AdjustmentSynchronizer() {
+        AdjustmentSynchronizer() {
             synchronizedAdjustables = new HashSet<>();
         }
@@ -400 +400 @@
     class UndecideAction extends AbstractAction implements ListSelectionListener  {
 
-        public UndecideAction() {
+        UndecideAction() {
             ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagundecide");
             if (icon != null) {

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -406 +406 @@
     class CancelAction extends AbstractAction {
 
-        public CancelAction() {
+        CancelAction() {
             putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution"));
             putValue(Action.NAME, tr("Cancel"));
@@ -465 +465 @@
         private double dividerLocation;
 
-        public AutoAdjustingSplitPane(int newOrientation) {
+        AutoAdjustingSplitPane(int newOrientation) {
             super(newOrientation);
             addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, this);

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

@@ -196 +196 @@
          * Construct a new {@link EditorCellRenderer}.
          */
-        public EditorCellRenderer() {
+        EditorCellRenderer() {
             setOpaque(true);
         }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

@@ -154 +154 @@
 
     class ApplyRoleAction extends AbstractAction {
-        public ApplyRoleAction() {
+        ApplyRoleAction() {
             putValue(NAME, tr("Apply"));
             putValue(SMALL_ICON, ImageProvider.get("ok"));