Changeset 18844 in josm

Timestamp:

2023-09-25T20:27:10+02:00 (9 months ago)

Author:

taylor.smock

Message:

Fix some recently introduced issues

• Fix some issues with updated presets, see r18843
• Fix a HeadlessException issue in TagEditHelperTest#testTicket23191

Location:

trunk

Files:

• resources/data/defaultpresets.xml (modified) (1 diff)
• resources/data/validator/deprecated.mapcss (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelperTest.java (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -8864 +8864 @@
             <link wiki="Tag:natural=earth_bank" />
             <space />
-            <label text="A steep earth bank, with significant vertical, or near vertical (leave the lower face to the right of the way)." />
+            <label text="A steep earth bank, with a significant vertical, or near vertical (leave the lower face to the right of the way)." />
             <space />
             <key key="natural" value="earth_bank" />
             <text key="depth" text="Depth (meters)" />
-            <combo key="earth_bank" values="gully,scarp,cut_bank,grassy_steep_slope" />
+            <combo key="earth_bank" values="gully,scarp,cut_bank,grassy_steep_slope" text="Type"/>
 
             <preset_link preset_name="Cliff" text="Similar but different tags:" />

trunk/resources/data/validator/deprecated.mapcss

@@ -73 +73 @@
   fixAdd: "wetland=marsh";
 }
-#23185
+/* #23185 */
 *[landuse=reservoir][!reservoir_type],
 *[landuse=reservoir][reservoir_type=water_storage] {

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelperTest.java

@@ -125 +125 @@
     void testTicket23191() {
         TestUtils.assumeWorkingJMockit();
+        new WindowMocker();
         final TagEditHelper tagEditHelper = newTagEditHelper();
         final DataSet original = new DataSet();