Index: trunk/.classpath
===================================================================
--- trunk/.classpath (revision 14018)
+++ trunk/.classpath (revision 14019)
@@ -3,34 +3,165 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/.settings/org.codehaus.groovy.eclipse.core.prefs
===================================================================
--- trunk/.settings/org.codehaus.groovy.eclipse.core.prefs (revision 14019)
+++ trunk/.settings/org.codehaus.groovy.eclipse.core.prefs (revision 14019)
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+groovy.classpath.use.groovy,lib=false
Index: trunk/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- trunk/.settings/org.eclipse.jdt.groovy.core.prefs (revision 14018)
+++ trunk/.settings/org.eclipse.jdt.groovy.core.prefs (revision 14019)
@@ -1,2 +1,3 @@
eclipse.preferences.version=1
-groovy.compiler.level=24
+groovy.compiler.level=25
+groovy.script.filters=**/*.dsld,y,**/*.gradle,n
Index: trunk/build.xml
===================================================================
--- trunk/build.xml (revision 14018)
+++ trunk/build.xml (revision 14019)
@@ -39,5 +39,4 @@
-
@@ -75,4 +74,9 @@
+
+
+
+
+
@@ -80,5 +84,5 @@
-
+
@@ -468,5 +472,5 @@
-
+
@@ -801,5 +805,5 @@
-
+
@@ -810,5 +814,5 @@
-
+
Index: trunk/scripts/SyncEditorLayerIndex.groovy
===================================================================
--- trunk/scripts/SyncEditorLayerIndex.groovy (revision 14018)
+++ trunk/scripts/SyncEditorLayerIndex.groovy (revision 14019)
@@ -18,4 +18,5 @@
*/
import java.text.DecimalFormat
+
import javax.json.Json
import javax.json.JsonArray
@@ -33,4 +34,6 @@
import org.openstreetmap.josm.io.imagery.ImageryReader
import org.openstreetmap.josm.spi.preferences.Config
+
+import groovy.cli.commons.CliBuilder
class SyncEditorLayerIndex {
@@ -727,5 +730,5 @@
} catch(IllegalArgumentException err) {
def desc = getDescription(e)
- myprintln("* Invalid data in ELI geometry for $desc: ${err.getMessage()}")
+ myprintln("* Invalid data in ELI geometry for $desc: ${err.getMessage()}")
}
if (s == null || !josmUrls.containsKey(url)) {
Index: trunk/scripts/TagInfoExtract.groovy
===================================================================
--- trunk/scripts/TagInfoExtract.groovy (revision 14018)
+++ trunk/scripts/TagInfoExtract.groovy (revision 14019)
@@ -53,4 +53,5 @@
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
+import groovy.cli.commons.CliBuilder
import groovy.json.JsonBuilder
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy (revision 14018)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy (revision 14019)
@@ -20,6 +20,4 @@
class ChildOrParentSelectorTest {
static private Logger logger = Logger.getLogger(ChildOrParentSelectorTest.class.getName());
-
- def shouldFail = new GroovyTestCase().&shouldFail
def DataSet ds;
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy (revision 14018)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy (revision 14019)
@@ -2,4 +2,5 @@
package org.openstreetmap.josm.gui.mappaint.mapcss;
+import static groovy.test.GroovyAssert.shouldFail
import static org.junit.Assert.*
@@ -16,6 +17,4 @@
class KeyConditionTest {
-
- def shouldFail = new GroovyTestCase().&shouldFail
def DataSet ds;
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy (revision 14018)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy (revision 14019)
@@ -1,4 +1,6 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.mappaint.mapcss;
+
+import static groovy.test.GroovyAssert.shouldFail
import org.junit.*
@@ -15,8 +17,5 @@
import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser
-
class KeyValueConditionTest {
-
- def shouldFail = new GroovyTestCase().&shouldFail
def DataSet ds;
Index: trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy (revision 14018)
+++ trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy (revision 14019)
@@ -1,4 +1,9 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io
+
+import static groovy.test.GroovyAssert.shouldFail
+
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
import org.junit.Test
@@ -6,9 +11,5 @@
import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlParser
-import java.time.OffsetDateTime
-import java.time.ZoneOffset
-
class ChangesetQueryUrlParserTest {
- final shouldFail = new GroovyTestCase().&shouldFail
@Test
Index: trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy (revision 14018)
+++ trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy (revision 14019)
@@ -2,4 +2,5 @@
package org.openstreetmap.josm.io;
+import static groovy.test.GroovyAssert.shouldFail
import static org.junit.Assert.*
@@ -30,6 +31,4 @@
public void testParse_NOK_Cases() {
def DiffResultProcessor processor = new DiffResultProcessor([])
-
- final shouldFail = new GroovyTestCase().&shouldFail
shouldFail(IllegalArgumentException) {
Index: trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.groovy (revision 14018)
+++ trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.groovy (revision 14019)
@@ -1,4 +1,5 @@
package org.openstreetmap.josm.io;
+import static groovy.test.GroovyAssert.shouldFail
import static org.junit.Assert.*
@@ -38,6 +39,4 @@
def Changeset cs = new Changeset(1)
OsmChangeBuilder builder = new OsmChangeBuilder(cs)
-
- final shouldFail = new GroovyTestCase().&shouldFail
// should be OK
Index: trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy (revision 14018)
+++ trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy (revision 14019)
@@ -1,4 +1,6 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
+
+import static groovy.test.GroovyAssert.shouldFail
import java.nio.charset.StandardCharsets
@@ -15,5 +17,4 @@
class OsmChangesetContentParserTest {
- final shouldFail = new GroovyTestCase().&shouldFail
@Test
Index: trunk/test/unit/org/openstreetmap/josm/io/ParseWithChangesetReaderTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/ParseWithChangesetReaderTest.groovy (revision 14018)
+++ trunk/test/unit/org/openstreetmap/josm/io/ParseWithChangesetReaderTest.groovy (revision 14019)
@@ -2,4 +2,5 @@
package org.openstreetmap.josm.io;
+import static groovy.test.GroovyAssert.shouldFail
import static org.junit.Assert.*
@@ -167,6 +168,4 @@
"""
- final shouldFail = new GroovyTestCase().&shouldFail
-
shouldFail(IllegalDataException) {
DataSet ds = getDataSet(doc)
@@ -184,6 +183,4 @@
"""
-
- final shouldFail = new GroovyTestCase().&shouldFail
shouldFail(IllegalDataException) {
@@ -203,6 +200,4 @@
"""
- final shouldFail = new GroovyTestCase().&shouldFail
-
shouldFail(IllegalDataException) {
DataSet ds = getDataSet(doc)