Changeset 6666 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair

Timestamp:

2014-01-10T19:24:34+01:00 (10 years ago)

Author:

Don-vip

Message:

see #9508 - refactor validator preferences + handling of JScrollPane policies ("vertical as needed" / "horizontal as needed" are default policies)

Location:

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

Files:

• ListMerger.java (modified) (6 diffs)
• tags/TagMerger.java (modified) (1 diff)

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

@@ -15 +15 @@
 import java.beans.PropertyChangeListener;
 import java.util.Collection;
-import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
@@ -87 +86 @@
     protected JScrollPane embeddInScrollPane(JTable table) {
         JScrollPane pane = new JScrollPane(table);
-        pane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        pane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
         if (adjustmentSynchronizer == null) {
             adjustmentSynchronizer = new AdjustmentSynchronizer();
@@ -480 +477 @@
 
         public CopyBeforeCurrentLeftAction() {
-            super("copybeforecurrentleft", tr("> before"), 
+            super("copybeforecurrentleft", tr("> before"),
                     tr("Copy my selected elements before the first selected element in the list of merged elements."));
         }
@@ -510 +507 @@
 
         public CopyAfterCurrentLeftAction() {
-            super("copyaftercurrentleft", tr("> after"), 
+            super("copyaftercurrentleft", tr("> after"),
                     tr("Copy my selected elements after the first selected element in the list of merged elements."));
         }
@@ -570 +567 @@
 
         public CopyBeforeCurrentRightAction() {
-            super("copybeforecurrentright", tr("< before"), 
+            super("copybeforecurrentright", tr("< before"),
                     tr("Copy their selected elements before the first selected element in the list of merged elements."));
         }
@@ -596 +593 @@
 
         public CopyAfterCurrentRightAction() {
-            super("copyaftercurrentright", tr("< after"), 
+            super("copyaftercurrentright", tr("< after"),
                     tr("Copy their selected element after the first selected element in the list of merged elements"));
         }

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

@@ -52 +52 @@
     protected JScrollPane embeddInScrollPane(JTable table) {
         JScrollPane pane = new JScrollPane(table);
-        pane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        pane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-
         adjustmentSynchronizer.synchronizeAdjustment(pane.getVerticalScrollBar());
         return pane;