Changeset 16034 in josm

Timestamp:

2020-03-04T20:57:31+01:00 (5 years ago)

Author:

simon04

Message:

Fix typo "preferred"

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/util/MultiLineFlowLayout.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/util/MultiLineFlowLayoutTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -118 +118 @@
 
             // Only return cached size, item is not shown
-            if (!list.isShowing() && item.prefferedWidth != -1 && item.prefferedHeight != -1) {
+            if (!list.isShowing() && item.preferredWidth != -1 && item.preferredHeight != -1) {
                 if (index == -1) {
-                    lbl.setPreferredSize(new Dimension(item.prefferedWidth, 10));
+                    lbl.setPreferredSize(new Dimension(item.preferredWidth, 10));
                 } else {
-                    lbl.setPreferredSize(new Dimension(item.prefferedWidth, item.prefferedHeight));
+                    lbl.setPreferredSize(new Dimension(item.preferredWidth, item.preferredHeight));
                 }
                 return lbl;
@@ -144 +144 @@
 
             // Cache size
-            item.prefferedWidth = lbl.getPreferredSize().width;
-            item.prefferedHeight = lbl.getPreferredSize().height;
+            item.preferredWidth = lbl.getPreferredSize().width;
+            item.preferredHeight = lbl.getPreferredSize().height;
 
             // We do not want the editor to have the maximum height of all
@@ -229 +229 @@
 
         /** Cached width (currently only for Combo) to speed up preset dialog initialization */
-        public int prefferedWidth = -1; // NOSONAR
+        public int preferredWidth = -1; // NOSONAR
         /** Cached height (currently only for Combo) to speed up preset dialog initialization */
-        public int prefferedHeight = -1; // NOSONAR
+        public int preferredHeight = -1; // NOSONAR
 
         /**

trunk/src/org/openstreetmap/josm/gui/util/MultiLineFlowLayout.java

@@ -10 +10 @@
 
 /**
- * This is an extension of the flow layout that preferes wrapping the text instead of increasing the component width
+ * This is an extension of the flow layout that prefers wrapping the text instead of increasing the component width
  * when there is not enough space.
  * <p>
- * This allows for a better preffered size computation.
+ * This allows for a better preferred size computation.
  * It should be used in all places where a flow layout fills the full width of the parent container.
  * <p>

trunk/test/unit/org/openstreetmap/josm/gui/util/MultiLineFlowLayoutTest.java

@@ -52 +52 @@
 
         container.invalidate();
-        Dimension preffered = container.getPreferredSize();
-        assertEquals(TEST_WIDHT, preffered.width);
-        assertEquals(100, preffered.height);
+        Dimension preferredSize = container.getPreferredSize();
+        assertEquals(TEST_WIDHT, preferredSize.width);
+        assertEquals(100, preferredSize.height);
 
         Dimension minimum = container.getMinimumSize();
@@ -70 +70 @@
         container.setBorder(BorderFactory.createEmptyBorder(3, 0, 7, 0));
         container.invalidate();
-        Dimension preffered = container.getPreferredSize();
-        assertEquals(TEST_WIDHT, preffered.width);
-        assertEquals(110, preffered.height);
+        Dimension preferredSize = container.getPreferredSize();
+        assertEquals(TEST_WIDHT, preferredSize.width);
+        assertEquals(110, preferredSize.height);
 
         // This should force wrapping
         container.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 40));
         container.invalidate();
-        preffered = container.getPreferredSize();
-        assertEquals(TEST_WIDHT, preffered.width);
-        assertEquals(200, preffered.height);
+        preferredSize = container.getPreferredSize();
+        assertEquals(TEST_WIDHT, preferredSize.width);
+        assertEquals(200, preferredSize.height);
     }
 
@@ -91 +91 @@
         container.setLayout(new MultiLineFlowLayout(FlowLayout.LEADING, 20, 10));
         container.invalidate();
-        Dimension preffered = container.getPreferredSize();
-        assertEquals(TEST_WIDHT, preffered.width);
-        assertEquals(230, preffered.height);
+        Dimension preferredSize = container.getPreferredSize();
+        assertEquals(TEST_WIDHT, preferredSize.width);
+        assertEquals(230, preferredSize.height);
     }