diff --git a/commons/advanced/Commons_Advanced/pom.xml b/commons/advanced/Commons_Advanced/pom.xml index b6fc332d..aa5b50f1 100644 --- a/commons/advanced/Commons_Advanced/pom.xml +++ b/commons/advanced/Commons_Advanced/pom.xml @@ -10,7 +10,7 @@ net.anwiba.commons anwiba-commons-maven-advanced - 1.0.64 + 1.0.68 diff --git a/commons/advanced/Commons_Http/pom.xml b/commons/advanced/Commons_Http/pom.xml index 46625a75..10630519 100644 --- a/commons/advanced/Commons_Http/pom.xml +++ b/commons/advanced/Commons_Http/pom.xml @@ -10,7 +10,7 @@ net.anwiba.commons anwiba-commons-maven-advanced - 1.0.64 + 1.0.68 diff --git a/commons/advanced/Commons_Image/pom.xml b/commons/advanced/Commons_Image/pom.xml index b96868bb..e125efd8 100644 --- a/commons/advanced/Commons_Image/pom.xml +++ b/commons/advanced/Commons_Image/pom.xml @@ -9,7 +9,7 @@ net.anwiba.commons anwiba-commons-maven-advanced - 1.0.64 + 1.0.68 diff --git a/commons/advanced/Commons_Json/pom.xml b/commons/advanced/Commons_Json/pom.xml index edc3dc6d..9de5ecb9 100644 --- a/commons/advanced/Commons_Json/pom.xml +++ b/commons/advanced/Commons_Json/pom.xml @@ -10,7 +10,7 @@ net.anwiba.commons anwiba-commons-maven-advanced - 1.0.64 + 1.0.68 @@ -27,6 +27,13 @@ ${net.anwiba.commons.version} + + net.anwiba.commons + anwiba-commons-resource + ${net.anwiba.commons.version} + test + + net.anwiba.commons anwiba-commons-reflaction @@ -137,4 +144,4 @@ - + \ No newline at end of file diff --git a/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/AbstractJsonObjectsUnmarshaller.java b/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/AbstractJsonObjectsUnmarshaller.java index cdd91b00..6b95a54e 100644 --- a/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/AbstractJsonObjectsUnmarshaller.java +++ b/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/AbstractJsonObjectsUnmarshaller.java @@ -13,6 +13,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -68,7 +69,8 @@ protected List _unmarshal(final InputStream stream) throws IOException, E { final ObjectReader reader = this.mapper.readerFor(this.clazz).with(injectableValues); final JsonToken token = parser.nextToken(); if (token != JsonToken.START_ARRAY) { - return reader.readValue(parser); + final T value = reader.readValue(parser); + return Arrays.asList(value); } // and then each time, advance to opening START_OBJECT final List results = new ArrayList<>(); diff --git a/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/JsonObjectUnmarshaller.java b/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/JsonObjectUnmarshaller.java index 4a5c5763..db6c89b7 100644 --- a/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/JsonObjectUnmarshaller.java +++ b/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/JsonObjectUnmarshaller.java @@ -32,12 +32,8 @@ public JsonObjectUnmarshaller(final Class clazz) { } public JsonObjectUnmarshaller(final Class clazz, final Map injectionValues) { - super(clazz, Void.class, injectionValues, new IJsonObjectMarshallingExceptionFactory() { - - @Override - public IOException create(final Void response) { - throw new RuntimeException("Unreachable code reached"); //$NON-NLS-1$ - } + super(clazz, Void.class, injectionValues, response -> { + throw new RuntimeException("Unreachable code reached"); //$NON-NLS-1$ }); } } diff --git a/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/JsonObjectsUnmarshaller.java b/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/JsonObjectsUnmarshaller.java new file mode 100644 index 00000000..bbb63446 --- /dev/null +++ b/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/JsonObjectsUnmarshaller.java @@ -0,0 +1,21 @@ +// Copyright (c) 2012 by Andreas W. Bartels (bartels@anwiba.net) +package net.anwiba.commons.json; + +import java.io.IOException; +import java.util.Map; + +import net.anwiba.commons.lang.map.HasMapBuilder; + +public class JsonObjectsUnmarshaller extends AbstractJsonObjectsUnmarshaller { + + public JsonObjectsUnmarshaller(final Class clazz) { + this(clazz, new HasMapBuilder().build()); + } + + public JsonObjectsUnmarshaller(final Class clazz, final Map injectionValues) { + super(clazz, Void.class, injectionValues, response -> { + throw new RuntimeException("Unreachable code reached"); //$NON-NLS-1$ + }); + } + +} diff --git a/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/JsonObjectsUnmarshallerBuilder.java b/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/JsonObjectsUnmarshallerBuilder.java new file mode 100644 index 00000000..2ae99fa6 --- /dev/null +++ b/commons/advanced/Commons_Json/src/main/java/net/anwiba/commons/json/JsonObjectsUnmarshallerBuilder.java @@ -0,0 +1,45 @@ +/* + * #%L + * anwiba commons advanced + * %% + * Copyright (C) 2007 - 2016 Andreas Bartels + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 2.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% + */ + +package net.anwiba.commons.json; + +import java.util.HashMap; +import java.util.Map; + +public class JsonObjectsUnmarshallerBuilder { + + private final Class clazz; + final Map injectionValues = new HashMap<>(); + + public JsonObjectsUnmarshallerBuilder(final Class clazz) { + this.clazz = clazz; + } + + public JsonObjectsUnmarshallerBuilder addInjectionValues(final String property, final C value) { + this.injectionValues.put(property, value); + return this; + } + + public JsonObjectsUnmarshaller build() { + return new JsonObjectsUnmarshaller<>(this.clazz, this.injectionValues); + } +} diff --git a/commons/advanced/Commons_Json/src/main/schema/net/anwiba/commons/json/schema/v1_0/property.jssd b/commons/advanced/Commons_Json/src/main/schema/net/anwiba/commons/json/schema/v1_0/property.jssd index 113bed15..6dd1ff00 100644 --- a/commons/advanced/Commons_Json/src/main/schema/net/anwiba/commons/json/schema/v1_0/property.jssd +++ b/commons/advanced/Commons_Json/src/main/schema/net/anwiba/commons/json/schema/v1_0/property.jssd @@ -1,4 +1,5 @@ -@JssdFactory +@JssdFactory(type="typeinfo",types="booleanProperty:boolean,integerProperty:integer,numberProperty:number,objectProperty:object,stringProperty:string") +@JssdIgnoreUnknownMember { "name": null, "title": null, diff --git a/commons/advanced/Commons_Json/src/test/java/net/anwiba/commons/json/JsonObjectUnmarshallerTest.java b/commons/advanced/Commons_Json/src/test/java/net/anwiba/commons/json/JsonObjectUnmarshallerTest.java new file mode 100644 index 00000000..806dab61 --- /dev/null +++ b/commons/advanced/Commons_Json/src/test/java/net/anwiba/commons/json/JsonObjectUnmarshallerTest.java @@ -0,0 +1,53 @@ +/* + * #%L + * + * %% + * Copyright (C) 2007 - 2017 Andreas W. Bartels (bartels@anwiba.de) + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 2.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% + */ +package net.anwiba.commons.json; + +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; + +import java.io.IOException; + +import org.junit.Test; + +import net.anwiba.commons.json.schema.v1_0.ObjectProperty; +import net.anwiba.commons.json.schema.v1_0.Property; + +public class JsonObjectUnmarshallerTest { + + @Test + public void object() throws IOException { + final JsonObjectUnmarshaller unmarshaller = new JsonObjectUnmarshallerBuilder<>( + ObjectProperty.class).build(); + final ObjectProperty response = unmarshaller.unmarshal(TestResources.object); + assertThat(response, notNullValue()); + assertThat(response, instanceOf(ObjectProperty.class)); + } + + @Test + public void property() throws IOException { + final JsonObjectUnmarshaller unmarshaller = new JsonObjectUnmarshallerBuilder<>(Property.class).build(); + final Property response = unmarshaller.unmarshal(TestResources.object); + assertThat(response, notNullValue()); + assertThat(response, instanceOf(ObjectProperty.class)); + } + +} \ No newline at end of file diff --git a/commons/advanced/Commons_Json/src/test/java/net/anwiba/commons/json/JsonObjectsUnmarshallerTest.java b/commons/advanced/Commons_Json/src/test/java/net/anwiba/commons/json/JsonObjectsUnmarshallerTest.java new file mode 100644 index 00000000..4dc8e871 --- /dev/null +++ b/commons/advanced/Commons_Json/src/test/java/net/anwiba/commons/json/JsonObjectsUnmarshallerTest.java @@ -0,0 +1,83 @@ +/* + * #%L + * + * %% + * Copyright (C) 2007 - 2017 Andreas W. Bartels (bartels@anwiba.de) + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 2.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% + */ +package net.anwiba.commons.json; + +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; + +import java.io.IOException; +import java.util.List; + +import org.junit.Test; + +import net.anwiba.commons.json.schema.v1_0.ObjectProperty; +import net.anwiba.commons.json.schema.v1_0.Property; + +public class JsonObjectsUnmarshallerTest { + + @Test + public void property() throws IOException { + final JsonObjectsUnmarshaller unmarshaller = new JsonObjectsUnmarshallerBuilder<>(Property.class).build(); + final List response = unmarshaller.unmarshal(TestResources.object); + assertThat(response, notNullValue()); + assertThat(response.size(), equalTo(1)); + assertThat(response.get(0), notNullValue()); + assertThat(response.get(0), instanceOf(ObjectProperty.class)); + } + + @Test + public void object() throws IOException { + final JsonObjectsUnmarshaller unmarshaller = new JsonObjectsUnmarshallerBuilder<>( + ObjectProperty.class).build(); + final List response = unmarshaller.unmarshal(TestResources.object); + assertThat(response, notNullValue()); + assertThat(response.size(), equalTo(1)); + assertThat(response.get(0), notNullValue()); + assertThat(response.get(0), instanceOf(ObjectProperty.class)); + } + + @Test + public void properties() throws IOException { + final JsonObjectsUnmarshaller unmarshaller = new JsonObjectsUnmarshallerBuilder<>(Property.class).build(); + final List response = unmarshaller.unmarshal(TestResources.objects); + assertThat(response, notNullValue()); + assertThat(response.size(), equalTo(2)); + assertThat(response.get(0), notNullValue()); + assertThat(response.get(0), instanceOf(ObjectProperty.class)); + assertThat(response.get(1), notNullValue()); + assertThat(response.get(1), instanceOf(ObjectProperty.class)); + } + + @Test + public void objects() throws IOException { + final JsonObjectsUnmarshaller unmarshaller = new JsonObjectsUnmarshallerBuilder<>( + ObjectProperty.class).build(); + final List response = unmarshaller.unmarshal(TestResources.objects); + assertThat(response, notNullValue()); + assertThat(response.size(), equalTo(2)); + assertThat(response.get(0), notNullValue()); + assertThat(response.get(0), instanceOf(ObjectProperty.class)); + assertThat(response.get(1), notNullValue()); + assertThat(response.get(1), instanceOf(ObjectProperty.class)); + } + +} \ No newline at end of file diff --git a/commons/advanced/Commons_Json/src/test/java/net/anwiba/commons/json/TestResources.java b/commons/advanced/Commons_Json/src/test/java/net/anwiba/commons/json/TestResources.java new file mode 100644 index 00000000..fe16fa23 --- /dev/null +++ b/commons/advanced/Commons_Json/src/test/java/net/anwiba/commons/json/TestResources.java @@ -0,0 +1,18 @@ +package net.anwiba.commons.json; + +import net.anwiba.commons.resource.annotation.Location; +import net.anwiba.commons.resource.reflaction.AbstractResourceFactory; + +public class TestResources extends AbstractResourceFactory { + + static { + initialize(TestResources.class); + } + + @Location("object.json") + public static String object; + + @Location("objects.json") + public static String objects; + +} \ No newline at end of file diff --git a/commons/advanced/Commons_Json/src/test/resources/net/anwiba/commons/json/object.json b/commons/advanced/Commons_Json/src/test/resources/net/anwiba/commons/json/object.json new file mode 100644 index 00000000..14a71786 --- /dev/null +++ b/commons/advanced/Commons_Json/src/test/resources/net/anwiba/commons/json/object.json @@ -0,0 +1,8 @@ +{ + "type": "object", + "name": "size", + "properties" : { + "value": {"type": "integer", "name": "value"}, + "unit": {"type": "string", "name": "unit"} + } +} \ No newline at end of file diff --git a/commons/advanced/Commons_Json/src/test/resources/net/anwiba/commons/json/objects.json b/commons/advanced/Commons_Json/src/test/resources/net/anwiba/commons/json/objects.json new file mode 100644 index 00000000..9cbdc268 --- /dev/null +++ b/commons/advanced/Commons_Json/src/test/resources/net/anwiba/commons/json/objects.json @@ -0,0 +1,18 @@ +[ +{ + "type": "object", + "name": "size", + "properties" : { + "value": {"type": "integer", "name": "value"}, + "unit": {"type": "string", "name": "unit"} + } +}, +{ + "type": "object", + "name": "description", + "properties" : { + "value": {"type": "string", "name": "value"}, + "language": {"type": "string", "name": "language"} + } +} +] \ No newline at end of file diff --git a/commons/advanced/Commons_Message/pom.xml b/commons/advanced/Commons_Message/pom.xml index 5aba01e7..dd73a3e7 100644 --- a/commons/advanced/Commons_Message/pom.xml +++ b/commons/advanced/Commons_Message/pom.xml @@ -9,7 +9,7 @@ net.anwiba.commons anwiba-commons-maven-advanced - 1.0.64 + 1.0.68 diff --git a/commons/advanced/Commons_Model/pom.xml b/commons/advanced/Commons_Model/pom.xml index f03c67b1..86b5c154 100644 --- a/commons/advanced/Commons_Model/pom.xml +++ b/commons/advanced/Commons_Model/pom.xml @@ -9,7 +9,7 @@ net.anwiba.commons anwiba-commons-maven-advanced - 1.0.64 + 1.0.68 diff --git a/commons/advanced/Commons_NLS/pom.xml b/commons/advanced/Commons_NLS/pom.xml index 08a1ff22..0607e649 100644 --- a/commons/advanced/Commons_NLS/pom.xml +++ b/commons/advanced/Commons_NLS/pom.xml @@ -9,7 +9,7 @@ net.anwiba.commons anwiba-commons-maven-advanced - 1.0.64 + 1.0.68 diff --git a/commons/advanced/Commons_Preferences/pom.xml b/commons/advanced/Commons_Preferences/pom.xml index 5590cf20..29c676fc 100644 --- a/commons/advanced/Commons_Preferences/pom.xml +++ b/commons/advanced/Commons_Preferences/pom.xml @@ -9,7 +9,7 @@ net.anwiba.commons anwiba-commons-maven-advanced - 1.0.64 + 1.0.68 diff --git a/commons/advanced/Commons_Process/pom.xml b/commons/advanced/Commons_Process/pom.xml index cce330e4..bdf1d0c5 100644 --- a/commons/advanced/Commons_Process/pom.xml +++ b/commons/advanced/Commons_Process/pom.xml @@ -9,7 +9,7 @@ net.anwiba.commons anwiba-commons-maven-advanced - 1.0.64 + 1.0.68 diff --git a/commons/advanced/Commons_Workflow/pom.xml b/commons/advanced/Commons_Workflow/pom.xml index cc007a4a..67c9dd7e 100644 --- a/commons/advanced/Commons_Workflow/pom.xml +++ b/commons/advanced/Commons_Workflow/pom.xml @@ -9,7 +9,7 @@ net.anwiba.commons anwiba-commons-maven-advanced - 1.0.64 + 1.0.68 diff --git a/commons/advanced/Commons_Workflow/src/main/java/net/anwiba/commons/workflow/IWorkflowBuilder.java b/commons/advanced/Commons_Workflow/src/main/java/net/anwiba/commons/workflow/IWorkflowBuilder.java index 227f9e3e..eda543ac 100644 --- a/commons/advanced/Commons_Workflow/src/main/java/net/anwiba/commons/workflow/IWorkflowBuilder.java +++ b/commons/advanced/Commons_Workflow/src/main/java/net/anwiba/commons/workflow/IWorkflowBuilder.java @@ -8,32 +8,40 @@ * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation, either version 2.1 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * + * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * . * #L% */ -package net.anwiba.commons.workflow; - -import net.anwiba.commons.lang.functional.IApplicable; -import net.anwiba.commons.lang.functional.IFunction; -import net.anwiba.commons.workflow.state.IState; -import net.anwiba.commons.workflow.transition.ITransition; - -public interface IWorkflowBuilder { - - void add(ITransition transition); - - void add(IApplicable> applicable, IExecutable executable); - - void add(IApplicable> applicable, IFunction, IExecutable, RuntimeException> factory); - - IWorkflow build(); - +package net.anwiba.commons.workflow; + +import net.anwiba.commons.lang.functional.IApplicable; +import net.anwiba.commons.lang.functional.IFunction; +import net.anwiba.commons.workflow.state.IState; +import net.anwiba.commons.workflow.transition.ITransition; + +public interface IWorkflowBuilder { + + IWorkflowBuilder add(ITransition transition); + + IWorkflowBuilder add(IApplicable> applicable, IExecutable executable); + + IWorkflowBuilder add( + IApplicable> applicable, + IFunction, IExecutable, RuntimeException> factory); + + IWorkflowBuilder setEventDispatchThreadExecuter(); + + IWorkflowBuilder setClosureDelegatorFactory(IExecuterFactory closureDelegatorFactory); + + IWorkflowBuilder setWorkflowController(IWorkflowController workflowController); + + IWorkflow build(); + } \ No newline at end of file diff --git a/commons/advanced/Commons_Workflow/src/main/java/net/anwiba/commons/workflow/WorkflowBuilder.java b/commons/advanced/Commons_Workflow/src/main/java/net/anwiba/commons/workflow/WorkflowBuilder.java index 4af24a57..0b66c745 100644 --- a/commons/advanced/Commons_Workflow/src/main/java/net/anwiba/commons/workflow/WorkflowBuilder.java +++ b/commons/advanced/Commons_Workflow/src/main/java/net/anwiba/commons/workflow/WorkflowBuilder.java @@ -8,12 +8,12 @@ * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation, either version 2.1 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * + * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * . @@ -32,35 +32,52 @@ public class WorkflowBuilder implements IWorkflowBuilder { - private final IExecuterFactory closureDelegatorFactory = new DefaultDelegatingExecuterFactory<>(); + private IExecuterFactory closureDelegatorFactory = new DefaultDelegatingExecuterFactory<>(); private final List> transitions = new ArrayList<>(); private IWorkflowController workflowController = null; @Override - public void add(final IApplicable> applicable, final IExecutable executable) { + public IWorkflowBuilder add(final IApplicable> applicable, final IExecutable executable) { add(new Transition<>(applicable, s -> executable)); + return this; } @Override - public void add(final ITransition transition) { + public IWorkflowBuilder add(final ITransition transition) { if (this.workflowController != null) { throw new IllegalArgumentException(); } this.transitions.add(transition); + return this; } @Override - public void add( + public IWorkflowBuilder add( final IApplicable> applicable, final IFunction, IExecutable, RuntimeException> factory) { add(new Transition<>(applicable, factory)); + return this; } - public void setWorkflowController(final IWorkflowController workflowController) { + @Override + public IWorkflowBuilder setClosureDelegatorFactory(final IExecuterFactory closureDelegatorFactory) { + this.closureDelegatorFactory = closureDelegatorFactory; + return this; + } + + @Override + public IWorkflowBuilder setWorkflowController(final IWorkflowController workflowController) { if (!this.transitions.isEmpty()) { throw new IllegalArgumentException(); } this.workflowController = workflowController; + return this; + } + + @Override + public IWorkflowBuilder setEventDispatchThreadExecuter() { + this.closureDelegatorFactory = new EventDispatchThreadUsingDelegatingExecuterFactory<>(); + return this; } @Override diff --git a/commons/advanced/pom.xml b/commons/advanced/pom.xml index 97fd014c..808c9b16 100644 --- a/commons/advanced/pom.xml +++ b/commons/advanced/pom.xml @@ -12,7 +12,7 @@ net.anwiba.commons anwiba-commons-maven-default - 1.0.64 + 1.0.68 diff --git a/commons/core/Commons_Core/pom.xml b/commons/core/Commons_Core/pom.xml index 794bb469..feba5fa1 100644 --- a/commons/core/Commons_Core/pom.xml +++ b/commons/core/Commons_Core/pom.xml @@ -10,7 +10,7 @@ net.anwiba.commons anwiba-commons-maven-core - 1.0.64 + 1.0.68 diff --git a/commons/core/Commons_Ensure/pom.xml b/commons/core/Commons_Ensure/pom.xml index 62e69997..11c0f9a8 100644 --- a/commons/core/Commons_Ensure/pom.xml +++ b/commons/core/Commons_Ensure/pom.xml @@ -10,7 +10,7 @@ net.anwiba.commons anwiba-commons-maven-core - 1.0.64 + 1.0.68 diff --git a/commons/core/Commons_Lang/pom.xml b/commons/core/Commons_Lang/pom.xml index eb33b5fe..a87b2c94 100644 --- a/commons/core/Commons_Lang/pom.xml +++ b/commons/core/Commons_Lang/pom.xml @@ -10,7 +10,7 @@ net.anwiba.commons anwiba-commons-maven-core - 1.0.64 + 1.0.68 diff --git a/commons/core/Commons_Logging/pom.xml b/commons/core/Commons_Logging/pom.xml index 18abe9d7..a27aff83 100644 --- a/commons/core/Commons_Logging/pom.xml +++ b/commons/core/Commons_Logging/pom.xml @@ -11,7 +11,7 @@ net.anwiba.commons anwiba-commons-maven-core - 1.0.64 + 1.0.68 diff --git a/commons/core/Commons_Reflaction/pom.xml b/commons/core/Commons_Reflaction/pom.xml index c4be3a89..83d3a926 100644 --- a/commons/core/Commons_Reflaction/pom.xml +++ b/commons/core/Commons_Reflaction/pom.xml @@ -11,7 +11,7 @@ net.anwiba.commons anwiba-commons-maven-core - 1.0.64 + 1.0.68 diff --git a/commons/core/Commons_Resource/pom.xml b/commons/core/Commons_Resource/pom.xml index a878b1dd..3e1417ac 100644 --- a/commons/core/Commons_Resource/pom.xml +++ b/commons/core/Commons_Resource/pom.xml @@ -11,7 +11,7 @@ net.anwiba.commons anwiba-commons-maven-core - 1.0.64 + 1.0.68 diff --git a/commons/core/Commons_Utilities/.attach_pid6800 b/commons/core/Commons_Utilities/.attach_pid6800 new file mode 100644 index 00000000..e69de29b diff --git a/commons/core/Commons_Utilities/pom.xml b/commons/core/Commons_Utilities/pom.xml index 6994eb62..a2870bb7 100644 --- a/commons/core/Commons_Utilities/pom.xml +++ b/commons/core/Commons_Utilities/pom.xml @@ -11,7 +11,7 @@ net.anwiba.commons anwiba-commons-maven-core - 1.0.64 + 1.0.68 diff --git a/commons/core/pom.xml b/commons/core/pom.xml index 5ad10d67..984ae9a5 100644 --- a/commons/core/pom.xml +++ b/commons/core/pom.xml @@ -12,7 +12,7 @@ net.anwiba.commons anwiba-commons-maven-default - 1.0.64 + 1.0.68 diff --git a/commons/pom.xml b/commons/pom.xml index b0d3c6ec..bc11d9c5 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -18,7 +18,7 @@ net.anwiba anwiba-maven-default - 1.0.64 + 1.0.68 diff --git a/commons/swing/core/Commons_Swing_Core/license.key b/commons/swing/core/Commons_Swing_Core/license.key new file mode 100644 index 00000000..171d3098 --- /dev/null +++ b/commons/swing/core/Commons_Swing_Core/license.key @@ -0,0 +1 @@ +RIkXXwFbKqC7T4Eo4d2FNf4kBz9EIrWAKyeEAdHLz5It/VqO0ULBOKS/wlfL0xxKQT0GQi3PDTLwirIxh2cgqq1SSov0WO+AueAkjpXefKWkSxhXZ7GP+R6eeQ2UZ0hkz7jmL5795QmtIhbPII6UuITdt8duKQwHBhNpNt5sNDQPlQYbpN8QMLJYzZ3FJImoxMcPwdnPxTovtpHN/5odekgvLNNU476Ai5jKRtgonO36QyHUJ+Zu/FFe8ygRH+5tKLZXnuXxJHCLmMpG2Cic7ZETysSYwOS8jkoqN9vKvbcMkbvpGZpWjsCz6sTSoafbetwmIMDdyVhbDCC3Li1HhDyLIetLiMD849k6XpN6lIdKGj8cl0VIyTCkXKFy7VP/p37xLd232up/BCvXS33zLbEiLq68mNiQfWrs884fEtyNa9YVcdX0ywG3G4B7WOyjZqWaVkUTn8OgynqhraOF76AfbfJ3ttyM/8ulC1CQMhHkYnL7S02oT/LGBFYw/3778hekl1n62bo= \ No newline at end of file diff --git a/commons/swing/core/Commons_Swing_Core/pom.xml b/commons/swing/core/Commons_Swing_Core/pom.xml index e63c4633..68925d00 100644 --- a/commons/swing/core/Commons_Swing_Core/pom.xml +++ b/commons/swing/core/Commons_Swing_Core/pom.xml @@ -8,7 +8,7 @@ net.anwiba.commons anwiba-commons-maven-swing-core - 1.0.64 + 1.0.68 diff --git a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/ConfigurableDialogLauncher.java b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/ConfigurableDialogLauncher.java index 2084bfbc..67c87e32 100644 --- a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/ConfigurableDialogLauncher.java +++ b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/ConfigurableDialogLauncher.java @@ -145,36 +145,36 @@ public IDialogResult launch(final Component component) { public IDialogResult launch(final Window owner) { final IObjectModel model = new ObjectModel<>(); - try { - final IDialogConfiguration configuration = ConfigurableDialogLauncher.this.dialogConfigurationBuilder.build(); - final ConfigurableDialog dialog = new ProgressDialogLauncher<>((progressMonitor, canceler) -> { - final ConfigurableDialog configurableDialog = new ConfigurableDialog(owner, configuration); - configurableDialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - if (ModalityType.MODELESS.equals(configuration.getModalityType())) { - configurableDialog.addWindowListener(new WindowAdapter() { - - @Override - public void windowClosed(final WindowEvent e) { - ConfigurableDialogLauncher.this.onCloseExecutables.stream().forEach(b -> b.execute()); - } - }); - } - ConfigurableDialogLauncher.this.beforeShowExecutables.stream().forEach(b -> b.execute(configurableDialog)); - return configurableDialog; - }).setTitle(configuration.getTitle()).setText("Initialize").setDescription("").launch(owner); + GuiUtilities.invokeAndWait(() -> { + try { + final IDialogConfiguration configuration = ConfigurableDialogLauncher.this.dialogConfigurationBuilder.build(); + final ConfigurableDialog dialog = new ProgressDialogLauncher<>((progressMonitor, canceler) -> { + final ConfigurableDialog configurableDialog = new ConfigurableDialog(owner, configuration); + configurableDialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + if (ModalityType.MODELESS.equals(configuration.getModalityType())) { + configurableDialog.addWindowListener(new WindowAdapter() { + + @Override + public void windowClosed(final WindowEvent e) { + ConfigurableDialogLauncher.this.onCloseExecutables.stream().forEach(b -> b.execute()); + } + }); + } + ConfigurableDialogLauncher.this.beforeShowExecutables.stream().forEach(b -> b.execute(configurableDialog)); + return configurableDialog; + }).setTitle(configuration.getTitle()).setText("Initialize").setDescription("").launch(owner); - GuiUtilities.invokeAndWait(() -> { dialog.toFront(); dialog.setVisible(true); if (!ModalityType.MODELESS.equals(configuration.getModalityType())) { this.onCloseExecutables.stream().forEach(b -> b.execute()); } model.set(dialog.getResult()); - }); - return model.get(); - } catch (final InterruptedException exception) { - return DialogResult.CANCEL; - } + } catch (final InterruptedException exception) { + model.set(DialogResult.CANCEL); + } + }); + return model.get(); } public ConfigurableDialogLauncher setModelessModality() { diff --git a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/progress/ProgressDialog.java b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/progress/ProgressDialog.java index 2761280d..97e46e51 100755 --- a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/progress/ProgressDialog.java +++ b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/progress/ProgressDialog.java @@ -174,7 +174,7 @@ public void run() { } }); thread.start(); - GuiUtilities.invokeAndWait(() -> dialog.setVisible(true)); + dialog.setVisible(true); final Exception exception = exceptionContainer.get(); if (exception != null) { if (exception instanceof InterruptedException) { diff --git a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/AbstractNoneEditTabbedDialogTab.java b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/AbstractNoneEditTabbedDialogTab.java index 1d4186dc..8b5dbf03 100644 --- a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/AbstractNoneEditTabbedDialogTab.java +++ b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/AbstractNoneEditTabbedDialogTab.java @@ -8,12 +8,12 @@ * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation, either version 2.1 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * + * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * . @@ -23,11 +23,11 @@ import javax.swing.Icon; -import net.anwiba.commons.message.Message; +import net.anwiba.commons.message.IMessage; public abstract class AbstractNoneEditTabbedDialogTab extends AbstractDialogTab { - public AbstractNoneEditTabbedDialogTab(final String title, final Message defaultMessage, final Icon defaultIcon) { + public AbstractNoneEditTabbedDialogTab(final String title, final IMessage defaultMessage, final Icon defaultIcon) { super(title, defaultMessage, defaultIcon); } diff --git a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/IDialogTabFactory.java b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/IDialogTabFactory.java new file mode 100644 index 00000000..3d1a0821 --- /dev/null +++ b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/IDialogTabFactory.java @@ -0,0 +1,29 @@ +/* + * #%L + * + * %% + * Copyright (C) 2007 - 2017 Andreas W. Bartels (bartels@anwiba.de) + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 2.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% + */ +package net.anwiba.commons.swing.dialog.tabbed; + +import net.anwiba.commons.lang.functional.IApplicable; +import net.anwiba.commons.utilities.factory.IFactory; + +public interface IDialogTabFactory extends IFactory, IApplicable { + +} diff --git a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/TableDialogTab.java b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/TableDialogTab.java new file mode 100644 index 00000000..de6ab4fc --- /dev/null +++ b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/TableDialogTab.java @@ -0,0 +1,65 @@ +/* + * #%L + * + * %% + * Copyright (C) 2007 - 2017 Andreas W. Bartels (bartels@anwiba.de) + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 2.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% + */ +package net.anwiba.commons.swing.dialog.tabbed; + +import java.awt.BorderLayout; + +import javax.swing.Icon; +import javax.swing.JPanel; +import javax.swing.JScrollPane; + +import net.anwiba.commons.message.IMessage; +import net.anwiba.commons.swing.table.ObjectListTable; + +public final class TableDialogTab extends AbstractDialogTab { + + public TableDialogTab( + final String title, + final IMessage defaultMessage, + final Icon defaultIcon, + final ObjectListTable table) { + super(title, defaultMessage, defaultIcon); + createView(table); + } + + private void createView(final ObjectListTable table) { + final JPanel contentPane = new JPanel(); + contentPane.setLayout(new BorderLayout()); + contentPane.add(new JScrollPane(table.getComponent())); + setComponent(contentPane); + } + + @Override + public void updateView() { + // nothing to do + } + + @Override + public boolean apply() { + return true; + } + + @Override + public void checkFieldValues() { + // nothing to do + } +} diff --git a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/TextDialogTab.java b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/TextDialogTab.java new file mode 100644 index 00000000..cdcb6e1a --- /dev/null +++ b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/dialog/tabbed/TextDialogTab.java @@ -0,0 +1,75 @@ +/* + * #%L + * anwiba commons swing + * %% + * Copyright (C) 2007 - 2016 Andreas Bartels + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 2.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% + */ +package net.anwiba.commons.swing.dialog.tabbed; + +import java.awt.Dimension; +import java.awt.GridLayout; + +import javax.swing.Icon; +import javax.swing.JEditorPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; + +import net.anwiba.commons.message.IMessage; +import net.anwiba.commons.swing.icon.GuiIcons; +import net.anwiba.commons.swing.utilities.JTextComponentUtilities; + +public class TextDialogTab extends AbstractNoneEditTabbedDialogTab { + + public TextDialogTab(final String header, final String text) { + this(header, null, GuiIcons.INFORMATION_ICON.getLargeIcon(), header, text); + } + + public TextDialogTab( + final String name, + final IMessage message, + final Icon icon, + final String header, + final String text) { + super(name, message, icon); + final JPanel component = new JPanel(); + component.setLayout(new GridLayout(1, 1)); + final String textString = createText(header, text); + final JEditorPane textArea = new JEditorPane("text/html", ""); //$NON-NLS-1$ //$NON-NLS-2$ + JTextComponentUtilities.setTextAndMoveToTop(textArea, textString); + textArea.setMinimumSize(new Dimension(200, 100)); + textArea.setPreferredSize(new Dimension(200, 100)); + textArea.setEditable(false); + final JScrollPane scrollPane = new JScrollPane(textArea); + scrollPane.setPreferredSize(new Dimension(200, 100)); + component.add(scrollPane); + setComponent(component); + } + + private String createText(final String header, final String text) { + final StringBuilder builder = new StringBuilder(); + builder.append(""); //$NON-NLS-1$ + if (header != null) { + builder.append("

"); //$NON-NLS-1$ + builder.append(header); + builder.append("

"); //$NON-NLS-1$ + } + builder.append(text); + builder.append(""); //$NON-NLS-1$ + return builder.toString(); + } +} diff --git a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/list/AbstractObjectListComponentModel.java b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/list/AbstractObjectListComponentModel.java index d92018f1..8b412d6f 100644 --- a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/list/AbstractObjectListComponentModel.java +++ b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/list/AbstractObjectListComponentModel.java @@ -44,19 +44,24 @@ public AbstractObjectListComponentModel(final List objects) { refreshIndex(); } - private synchronized void refreshIndex() { - this.indexByobjectMap.clear(); - for (int i = 0; i < this.objects.size(); i++) { - this.indexByobjectMap.put(getObject(i), Integer.valueOf(i)); + private void refreshIndex() { + synchronized (this) { + this.indexByobjectMap.clear(); + for (int i = 0; i < this.objects.size(); i++) { + this.indexByobjectMap.put(getObject(i), Integer.valueOf(i)); + } } } @Override public int getSize() { - return this.objects.size(); + synchronized (this) { + return this.objects.size(); + } } - public synchronized void add(@SuppressWarnings("unchecked") final T... objects) { + public void add(@SuppressWarnings("unchecked") final T... objects) { + if (objects.length == 0) { return; } @@ -72,7 +77,7 @@ public synchronized void add(@SuppressWarnings("unchecked") final T... objects) fireObjectAdded(Arrays.asList(objects)); } - public synchronized void remove(@SuppressWarnings("unchecked") final T... objects) { + public void remove(@SuppressWarnings("unchecked") final T... objects) { if (objects.length == 0) { return; } diff --git a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/list/ObjectListComponent.java b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/list/ObjectListComponent.java index 5b3950d9..f2bc07c8 100644 --- a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/list/ObjectListComponent.java +++ b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/list/ObjectListComponent.java @@ -32,6 +32,7 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; +import net.anwiba.commons.logging.ILevel; import net.anwiba.commons.model.ISelectionListener; import net.anwiba.commons.model.ISelectionModel; import net.anwiba.commons.model.SelectionEvent; @@ -42,6 +43,8 @@ public class ObjectListComponent implements IComponentProvider { + private static net.anwiba.commons.logging.ILogger logger = net.anwiba.commons.logging.Logging + .getLogger(ObjectListComponent.class); private final JComponent component; private final ISelectionModel selectionModel; private JList list; @@ -108,13 +111,20 @@ public void selectionChanged(final SelectionEvent event) { if (objects.size() == this.objectSelectionModel.size() && objects.containsAll(selectedObjects)) { return; } - this.tableSelectionModel.setValueIsAdjusting(true); - this.tableSelectionModel.clearSelection(); - final int[] indexes = this.listModel.getIndicesOf(selectedObjects); - for (final int index : indexes) { - this.tableSelectionModel.addSelectionInterval(index, index); - } - this.tableSelectionModel.setValueIsAdjusting(false); + + GuiUtilities.invokeLater(() -> { + this.tableSelectionModel.setValueIsAdjusting(true); + this.tableSelectionModel.clearSelection(); + final int[] indexes = this.listModel.getIndicesOf(selectedObjects); + for (final int index : indexes) { + try { + this.tableSelectionModel.addSelectionInterval(index, index); + } catch (final NullPointerException exception) { + logger.log(ILevel.ERROR, exception.getMessage(), exception); + } + } + this.tableSelectionModel.setValueIsAdjusting(false); + }); } private List getObjects(final IListModel tableModel, final ListSelectionModel tableSelectionModel) { diff --git a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/table/filter/ContainsFilter.java b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/table/filter/ContainsFilter.java index 67e136f2..52bc8dff 100644 --- a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/table/filter/ContainsFilter.java +++ b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/table/filter/ContainsFilter.java @@ -8,12 +8,12 @@ * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation, either version 2.1 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * + * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * . @@ -21,14 +21,14 @@ */ package net.anwiba.commons.swing.table.filter; -import net.anwiba.commons.swing.table.IRowFilter; -import net.anwiba.commons.swing.table.IRowMapper; - import java.util.ArrayList; import java.util.List; import javax.swing.table.TableModel; +import net.anwiba.commons.swing.table.IRowFilter; +import net.anwiba.commons.swing.table.IRowMapper; + public class ContainsFilter implements IRowFilter { private final String string; @@ -59,6 +59,6 @@ private boolean accept(final String value) { if (value == null) { return false; } - return value.contains(this.string); + return value.toLowerCase().contains(this.string.toLowerCase()); } } diff --git a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/utilities/JTextComponentUtilities.java b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/utilities/JTextComponentUtilities.java index 59821bfd..a1639a04 100644 --- a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/utilities/JTextComponentUtilities.java +++ b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/utilities/JTextComponentUtilities.java @@ -8,12 +8,12 @@ * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation, either version 2.1 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * + * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * . @@ -21,10 +21,6 @@ */ package net.anwiba.commons.swing.utilities; -import net.anwiba.commons.logging.ILevel; -import net.anwiba.commons.logging.ILogger; -import net.anwiba.commons.logging.Logging; - import java.awt.Component; import java.awt.Font; import java.awt.Graphics; @@ -35,6 +31,10 @@ import javax.swing.text.Document; import javax.swing.text.JTextComponent; +import net.anwiba.commons.logging.ILevel; +import net.anwiba.commons.logging.ILogger; +import net.anwiba.commons.logging.Logging; + public class JTextComponentUtilities { private static ILogger logger = Logging.getLogger(JTextComponentUtilities.class.getName()); @@ -50,8 +50,12 @@ static final class SetTextRunnable implements Runnable { @Override public void run() { - this.textPane.setText(this.text); - this.textPane.setCaretPosition(0); + try { + this.textPane.setText(this.text); + this.textPane.setCaretPosition(0); + } catch (final Exception exception) { + logger.log(ILevel.DEBUG, exception.getMessage(), exception); + } } } diff --git a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/utilities/JTreeUtilities.java b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/utilities/JTreeUtilities.java index fb6fec54..69660f8a 100644 --- a/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/utilities/JTreeUtilities.java +++ b/commons/swing/core/Commons_Swing_Core/src/main/java/net/anwiba/commons/swing/utilities/JTreeUtilities.java @@ -127,10 +127,12 @@ static void internalInsertNode( final DefaultMutableTreeNode root, final DefaultMutableTreeNode node, final int index) { - model.insertNodeInto(node, root, index); - final TreePath treePath = new TreePath(node.getPath()); - tree.getSelectionModel().setSelectionPath(treePath); - tree.scrollPathToVisible(treePath); + synchronized (tree) { + model.insertNodeInto(node, root, index); + final TreePath treePath = new TreePath(node.getPath()); + tree.getSelectionModel().setSelectionPath(treePath); + tree.scrollPathToVisible(treePath); + } } public static void collapse(final JTree tree, final DefaultMutableTreeNode node) { diff --git a/commons/swing/core/Commons_Swing_Icon/pom.xml b/commons/swing/core/Commons_Swing_Icon/pom.xml index 5ffed8b9..e2de3663 100644 --- a/commons/swing/core/Commons_Swing_Icon/pom.xml +++ b/commons/swing/core/Commons_Swing_Icon/pom.xml @@ -9,7 +9,7 @@ net.anwiba.commons anwiba-commons-maven-swing-core - 1.0.64 + 1.0.68 diff --git a/commons/swing/core/gnome-icons/pom.xml b/commons/swing/core/gnome-icons/pom.xml index 7173348f..3745e29f 100644 --- a/commons/swing/core/gnome-icons/pom.xml +++ b/commons/swing/core/gnome-icons/pom.xml @@ -10,7 +10,7 @@ net.anwiba.commons anwiba-commons-maven-swing-core - 1.0.64 + 1.0.68 diff --git a/commons/swing/core/gtk-contrast-high-icons/pom.xml b/commons/swing/core/gtk-contrast-high-icons/pom.xml index a0db9542..4dbb884e 100644 --- a/commons/swing/core/gtk-contrast-high-icons/pom.xml +++ b/commons/swing/core/gtk-contrast-high-icons/pom.xml @@ -10,7 +10,7 @@ net.anwiba.commons anwiba-commons-maven-swing-core - 1.0.64 + 1.0.68 diff --git a/commons/swing/core/oxygen-icons/pom.xml b/commons/swing/core/oxygen-icons/pom.xml index 19151f2e..264d0c83 100644 --- a/commons/swing/core/oxygen-icons/pom.xml +++ b/commons/swing/core/oxygen-icons/pom.xml @@ -9,7 +9,7 @@ net.anwiba.commons anwiba-commons-maven-swing-core - 1.0.64 + 1.0.68 diff --git a/commons/swing/core/pom.xml b/commons/swing/core/pom.xml index f447eb70..23c59fdc 100644 --- a/commons/swing/core/pom.xml +++ b/commons/swing/core/pom.xml @@ -13,7 +13,7 @@ net.anwiba.commons anwiba-commons-maven-swing - 1.0.64 + 1.0.68 diff --git a/commons/swing/pom.xml b/commons/swing/pom.xml index 3ed56843..456bef67 100644 --- a/commons/swing/pom.xml +++ b/commons/swing/pom.xml @@ -13,7 +13,7 @@ net.anwiba.commons anwiba-commons-maven-default - 1.0.64 + 1.0.68 diff --git a/commons/tools/Tools_Definition_Schema_Json/pom.xml b/commons/tools/Tools_Definition_Schema_Json/pom.xml index d2d2ac21..b4920db9 100644 --- a/commons/tools/Tools_Definition_Schema_Json/pom.xml +++ b/commons/tools/Tools_Definition_Schema_Json/pom.xml @@ -11,7 +11,7 @@ net.anwiba.commons.tools anwiba-commons-tools - 1.0.64 + 1.0.68 diff --git a/commons/tools/Tools_Definition_Schema_Json/src/main/java/net/anwiba/tools/definition/schema/json/generator/java/bean/JObjectToBeanConverter.java b/commons/tools/Tools_Definition_Schema_Json/src/main/java/net/anwiba/tools/definition/schema/json/generator/java/bean/JObjectToBeanConverter.java index 489f0632..2749ea5c 100644 --- a/commons/tools/Tools_Definition_Schema_Json/src/main/java/net/anwiba/tools/definition/schema/json/generator/java/bean/JObjectToBeanConverter.java +++ b/commons/tools/Tools_Definition_Schema_Json/src/main/java/net/anwiba/tools/definition/schema/json/generator/java/bean/JObjectToBeanConverter.java @@ -62,6 +62,7 @@ @SuppressWarnings("nls") public class JObjectToBeanConverter { + private static final String NAME = "name"; private static final String SHAPE = "shape"; private static final String INPUT = "input"; private static final String OUTPUT = "output"; @@ -258,9 +259,25 @@ private void addFactoryMethode(final BeanBuilder builder, final Map annotations = new ArrayList<>(); - final StringTokenizer tokenizer = new StringTokenizer(typesParameter.value().toString(), ","); - while (tokenizer.hasMoreTokens()) { - final String token = tokenizer.nextToken(); + final StringTokenizer typeTokenizer = new StringTokenizer(typesParameter.value().toString(), ","); + while (typeTokenizer.hasMoreTokens()) { + final String token = typeTokenizer.nextToken().trim(); + final int index = token.indexOf(':'); + if (index > -1) { + final String value = token.substring(0, index).trim(); + final String name = token.substring(index + 1, token.length()).trim(); + annotations + .add( + annotation(ORG_CODEHAUS_JACKSON_ANNOTATE_JSON_SUB_TYPE_TYPE) + .parameter( + VALUE, + net.anwiba.commons.utilities.string.StringUtilities + .setFirstTrimedCharacterToUpperCase(value), + ValueType.CLASS) + .parameter(NAME, name) + .build()); + continue; + } annotations.add( annotation(ORG_CODEHAUS_JACKSON_ANNOTATE_JSON_SUB_TYPE_TYPE) .parameter( diff --git a/commons/tools/Tools_Definition_Schema_Json/src/test/java/net/anwiba/tools/definition/schema/json/generator/java/bean/JsonBeanGeneratorTest.java b/commons/tools/Tools_Definition_Schema_Json/src/test/java/net/anwiba/tools/definition/schema/json/generator/java/bean/JsonBeanGeneratorTest.java index 005a8563..addf3a7d 100644 --- a/commons/tools/Tools_Definition_Schema_Json/src/test/java/net/anwiba/tools/definition/schema/json/generator/java/bean/JsonBeanGeneratorTest.java +++ b/commons/tools/Tools_Definition_Schema_Json/src/test/java/net/anwiba/tools/definition/schema/json/generator/java/bean/JsonBeanGeneratorTest.java @@ -51,6 +51,21 @@ public void typeInfoFactoryBean() throws CreationException, JssdParserException, assertThat(actual, equalTo(expected)); } + @SuppressWarnings({ "boxing" }) + @Test + public void typeInfoWithNameFactoryBean() throws CreationException, JssdParserException, IOException { + final JsonBeanGenerator generator = new JsonBeanGenerator(NET_ANWIBA_GENERATED_TEST_BEAN, COPYRIGHT, false); + generator.add( + new ByteArrayInputStream(JsonBeanGeneratorTestResources.typeInfoWithNameFactoryBeanDefinition.getBytes()), + "net.anwiba.generated.test.bean.Factory"); + final ByteArrayOutputStream ouputStream = new ByteArrayOutputStream(); + generator.generate(ouputStream); + assertThat(ouputStream.size(), greaterThan(0)); + final String actual = ouputStream.toString(); + final String expected = JsonBeanGeneratorTestResources.typeInfoWithNameFactoryBeanSource; + assertThat(actual, equalTo(expected)); + } + @SuppressWarnings({ "boxing" }) @Test public void valueBean() throws CreationException, JssdParserException, IOException { diff --git a/commons/tools/Tools_Definition_Schema_Json/src/test/java/net/anwiba/tools/definition/schema/json/generator/java/bean/JsonBeanGeneratorTestResources.java b/commons/tools/Tools_Definition_Schema_Json/src/test/java/net/anwiba/tools/definition/schema/json/generator/java/bean/JsonBeanGeneratorTestResources.java index 13c6c8db..4304a549 100644 --- a/commons/tools/Tools_Definition_Schema_Json/src/test/java/net/anwiba/tools/definition/schema/json/generator/java/bean/JsonBeanGeneratorTestResources.java +++ b/commons/tools/Tools_Definition_Schema_Json/src/test/java/net/anwiba/tools/definition/schema/json/generator/java/bean/JsonBeanGeneratorTestResources.java @@ -36,6 +36,12 @@ public class JsonBeanGeneratorTestResources extends AbstractResourceFactory { @Location("typeInfoFactory.source") public static String typeInfoFactoryBeanSource; + @Location("typeInfoWithNameFactory.jssd") + public static String typeInfoWithNameFactoryBeanDefinition; + + @Location("typeInfoWithNameFactory.source") + public static String typeInfoWithNameFactoryBeanSource; + @Location("value.jssd") public static String valueBeanDefinition; diff --git a/commons/tools/Tools_Definition_Schema_Json/src/test/resources/net/anwiba/tools/definition/schema/json/generator/java/bean/typeInfoWithNameFactory.jssd b/commons/tools/Tools_Definition_Schema_Json/src/test/resources/net/anwiba/tools/definition/schema/json/generator/java/bean/typeInfoWithNameFactory.jssd new file mode 100644 index 00000000..e4611dff --- /dev/null +++ b/commons/tools/Tools_Definition_Schema_Json/src/test/resources/net/anwiba/tools/definition/schema/json/generator/java/bean/typeInfoWithNameFactory.jssd @@ -0,0 +1,5 @@ +@JssdFactory(type="typeinfo",types="fuu:foo,bur:bar") +{ + "type" : "Factory", + "id" : null +} \ No newline at end of file diff --git a/commons/tools/Tools_Definition_Schema_Json/src/test/resources/net/anwiba/tools/definition/schema/json/generator/java/bean/typeInfoWithNameFactory.source b/commons/tools/Tools_Definition_Schema_Json/src/test/resources/net/anwiba/tools/definition/schema/json/generator/java/bean/typeInfoWithNameFactory.source new file mode 100644 index 00000000..1cd6148b --- /dev/null +++ b/commons/tools/Tools_Definition_Schema_Json/src/test/resources/net/anwiba/tools/definition/schema/json/generator/java/bean/typeInfoWithNameFactory.source @@ -0,0 +1,39 @@ +-----------------------------------net.anwiba.generated.test.bean.Factory.java----------------------------------- + +package net.anwiba.generated.test.bean; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; + +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonSubTypes({ + @JsonSubTypes.Type(value = Fuu.class, name = "foo"), + @JsonSubTypes.Type(value = Bur.class, name = "bar") +}) +public class Factory { + + private String type = "Factory"; + private String id = null; + + @JsonProperty("type") + public void setType(final String type) { + this.type = type; + } + + @JsonProperty("type") + public String getType() { + return this.type; + } + + @JsonProperty("id") + public void setId(final String id) { + this.id = id; + } + + @JsonProperty("id") + public String getId() { + return this.id; + } + +} diff --git a/commons/tools/Tools_Generator_Java/pom.xml b/commons/tools/Tools_Generator_Java/pom.xml index f5b07c8b..8f40e11f 100644 --- a/commons/tools/Tools_Generator_Java/pom.xml +++ b/commons/tools/Tools_Generator_Java/pom.xml @@ -11,7 +11,7 @@ net.anwiba.commons.tools anwiba-commons-tools - 1.0.64 + 1.0.68 diff --git a/commons/tools/Tools_Generator_Java/src/main/java/net/anwiba/tools/generator/java/bean/configuration/Parameters.java b/commons/tools/Tools_Generator_Java/src/main/java/net/anwiba/tools/generator/java/bean/configuration/Parameters.java index 335fb8b6..a564a6c4 100644 --- a/commons/tools/Tools_Generator_Java/src/main/java/net/anwiba/tools/generator/java/bean/configuration/Parameters.java +++ b/commons/tools/Tools_Generator_Java/src/main/java/net/anwiba/tools/generator/java/bean/configuration/Parameters.java @@ -8,12 +8,12 @@ * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation, either version 2.1 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * + * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * . @@ -21,10 +21,6 @@ */ package net.anwiba.tools.generator.java.bean.configuration; -import net.anwiba.commons.ensure.Conditions; -import net.anwiba.commons.ensure.Ensure; -import net.anwiba.tools.generator.java.bean.value.ValueType; - import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -32,6 +28,10 @@ import java.util.Map; import java.util.Set; +import net.anwiba.commons.ensure.Conditions; +import net.anwiba.commons.ensure.Ensure; +import net.anwiba.tools.generator.java.bean.value.ValueType; + public class Parameters { private final List names = new ArrayList<>(); diff --git a/commons/tools/Tools_Graphml/pom.xml b/commons/tools/Tools_Graphml/pom.xml index 7ae55ceb..9e1cab75 100644 --- a/commons/tools/Tools_Graphml/pom.xml +++ b/commons/tools/Tools_Graphml/pom.xml @@ -10,7 +10,7 @@ net.anwiba.commons.tools anwiba-commons-tools - 1.0.64 + 1.0.68 diff --git a/commons/tools/Tools_Icons/pom.xml b/commons/tools/Tools_Icons/pom.xml index 579e2497..aa6e013f 100644 --- a/commons/tools/Tools_Icons/pom.xml +++ b/commons/tools/Tools_Icons/pom.xml @@ -11,7 +11,7 @@ net.anwiba.commons.tools anwiba-commons-tools - 1.0.64 + 1.0.68 @@ -35,13 +35,13 @@ net.anwiba.commons anwiba-commons-resource - 1.0.64 + 1.0.68 net.anwiba.commons anwiba-commons-utilities - 1.0.64 + 1.0.68 diff --git a/commons/tools/pom.xml b/commons/tools/pom.xml index 806ed053..26eb2dd4 100644 --- a/commons/tools/pom.xml +++ b/commons/tools/pom.xml @@ -14,7 +14,7 @@ net.anwiba.commons anwiba-commons-maven-default - 1.0.64 + 1.0.68 diff --git a/eclipse/Eclipse_Commons/META-INF/MANIFEST.MF b/eclipse/Eclipse_Commons/META-INF/MANIFEST.MF index 706e0df6..7f2f7573 100644 --- a/eclipse/Eclipse_Commons/META-INF/MANIFEST.MF +++ b/eclipse/Eclipse_Commons/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Version: 1.0.64 +Bundle-Version: 1.0.68 Bundle-Vendor: Andreas Bartels Bundle-Name: Commons Bundle-SymbolicName: net.anwiba.eclipse.commons;singleton:=true diff --git a/eclipse/Eclipse_Commons/pom.xml b/eclipse/Eclipse_Commons/pom.xml index c1ae97ad..8e98ba1e 100644 --- a/eclipse/Eclipse_Commons/pom.xml +++ b/eclipse/Eclipse_Commons/pom.xml @@ -12,7 +12,7 @@ net.anwiba.eclipse anwiba-eclipse-maven-default - 1.0.64 + 1.0.68 diff --git a/eclipse/Eclipse_Distribution/pom.xml b/eclipse/Eclipse_Distribution/pom.xml index 1cbfa649..caaba63a 100644 --- a/eclipse/Eclipse_Distribution/pom.xml +++ b/eclipse/Eclipse_Distribution/pom.xml @@ -12,7 +12,7 @@ net.anwiba.eclipse anwiba-eclipse-maven-default - 1.0.64 + 1.0.68 diff --git a/eclipse/Eclipse_Icons/.classpath b/eclipse/Eclipse_Icons/.classpath index d0785517..d91e49c2 100644 --- a/eclipse/Eclipse_Icons/.classpath +++ b/eclipse/Eclipse_Icons/.classpath @@ -8,6 +8,6 @@ - + diff --git a/eclipse/Eclipse_Icons/META-INF/MANIFEST.MF b/eclipse/Eclipse_Icons/META-INF/MANIFEST.MF index 98eedd97..555c379d 100644 --- a/eclipse/Eclipse_Icons/META-INF/MANIFEST.MF +++ b/eclipse/Eclipse_Icons/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Version: 1.0.64 +Bundle-Version: 1.0.68 Bundle-Vendor: Andreas W. Bartels Bundle-Name: GuiIcons Bundle-SymbolicName: net.anwiba.eclipse.icons;singleton:=true @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jdt.ui, org.eclipse.jface.text, org.eclipse.jdt.core, - net.anwiba.eclipse.commons;bundle-version="1.0.64" + net.anwiba.eclipse.commons;bundle-version="1.0.68" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.core.databinding.observable.list, @@ -24,4 +24,4 @@ Import-Package: org.eclipse.core.databinding.observable.list, net.anwiba.commons.process.cancel, net.anwiba.commons.utilities.string Bundle-ClassPath: ., - lib/anwiba-tools-icons-1.0.64.jar + lib/anwiba-tools-icons-1.0.68.jar diff --git a/eclipse/Eclipse_Icons/pom.xml b/eclipse/Eclipse_Icons/pom.xml index d7855058..ad2ae228 100644 --- a/eclipse/Eclipse_Icons/pom.xml +++ b/eclipse/Eclipse_Icons/pom.xml @@ -12,7 +12,7 @@ net.anwiba.eclipse anwiba-eclipse-maven-default - 1.0.64 + 1.0.68 diff --git a/eclipse/Eclipse_Libraries/.classpath b/eclipse/Eclipse_Libraries/.classpath index a4b9289e..43b473a8 100644 --- a/eclipse/Eclipse_Libraries/.classpath +++ b/eclipse/Eclipse_Libraries/.classpath @@ -6,14 +6,14 @@ - - - - - - - - - + + + + + + + + + diff --git a/eclipse/Eclipse_Libraries/META-INF/MANIFEST.MF b/eclipse/Eclipse_Libraries/META-INF/MANIFEST.MF index f50575d6..d11ac316 100644 --- a/eclipse/Eclipse_Libraries/META-INF/MANIFEST.MF +++ b/eclipse/Eclipse_Libraries/META-INF/MANIFEST.MF @@ -1,19 +1,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Version: 1.0.64 +Bundle-Version: 1.0.68 Bundle-Name: Libaries Bundle-SymbolicName: net.anwiba.eclipse.libraries;singleton:=true Bundle-Vendor: Andreas Bartels Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-ClassPath: lib/anwiba-commons-ensure-1.0.64.jar, - lib/anwiba-commons-lang-1.0.64.jar, - lib/anwiba-commons-logging-1.0.64.jar, - lib/anwiba-commons-message-1.0.64.jar, - lib/anwiba-commons-model-1.0.64.jar, - lib/anwiba-commons-process-1.0.64.jar, - lib/anwiba-commons-reflaction-1.0.64.jar, - lib/anwiba-commons-resource-1.0.64.jar, - lib/anwiba-commons-utilities-1.0.64.jar, +Bundle-ClassPath: lib/anwiba-commons-ensure-1.0.68.jar, + lib/anwiba-commons-lang-1.0.68.jar, + lib/anwiba-commons-logging-1.0.68.jar, + lib/anwiba-commons-message-1.0.68.jar, + lib/anwiba-commons-model-1.0.68.jar, + lib/anwiba-commons-process-1.0.68.jar, + lib/anwiba-commons-reflaction-1.0.68.jar, + lib/anwiba-commons-resource-1.0.68.jar, + lib/anwiba-commons-utilities-1.0.68.jar, lib/commons-lang-2.6.jar lib/commons-logging-1.2.jar Eclipse-BuddyPolicy: dependent diff --git a/eclipse/Eclipse_Libraries/pom.xml b/eclipse/Eclipse_Libraries/pom.xml index 07ef10c8..d464c3bd 100644 --- a/eclipse/Eclipse_Libraries/pom.xml +++ b/eclipse/Eclipse_Libraries/pom.xml @@ -13,7 +13,7 @@ net.anwiba.eclipse anwiba-eclipse-maven-default - 1.0.64 + 1.0.68 diff --git a/eclipse/Eclipse_Project_Dependencies/.classpath b/eclipse/Eclipse_Project_Dependencies/.classpath index 30c2c12b..77ba5e7e 100644 --- a/eclipse/Eclipse_Project_Dependencies/.classpath +++ b/eclipse/Eclipse_Project_Dependencies/.classpath @@ -7,6 +7,6 @@ - + diff --git a/eclipse/Eclipse_Project_Dependencies/META-INF/MANIFEST.MF b/eclipse/Eclipse_Project_Dependencies/META-INF/MANIFEST.MF index a5623cce..2db6ff89 100644 --- a/eclipse/Eclipse_Project_Dependencies/META-INF/MANIFEST.MF +++ b/eclipse/Eclipse_Project_Dependencies/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Version: 1.0.64 +Bundle-Version: 1.0.68 Bundle-Name: Dependencies Bundle-SymbolicName: net.anwiba.eclipse.project.dependencies;singleton:=true Bundle-Activator: net.anwiba.eclipse.project.dependency.plugin.DependenciesPlugin @@ -9,8 +9,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.jdt.core, org.eclipse.jface.databinding, - net.anwiba.eclipse.commons;bundle-version="1.0.64", - net.anwiba.eclipse.libraries;bundle-version="1.0.64" + net.anwiba.eclipse.commons;bundle-version="1.0.68", + net.anwiba.eclipse.libraries;bundle-version="1.0.68" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: @@ -35,4 +35,4 @@ Import-Package: net.anwiba.commons.program, net.anwiba.commons.process.cancel Bundle-ClassPath: ., - lib/anwiba-tools-graphml-1.0.64.jar + lib/anwiba-tools-graphml-1.0.68.jar diff --git a/eclipse/Eclipse_Project_Dependencies/pom.xml b/eclipse/Eclipse_Project_Dependencies/pom.xml index ca2ac6a1..ee741389 100644 --- a/eclipse/Eclipse_Project_Dependencies/pom.xml +++ b/eclipse/Eclipse_Project_Dependencies/pom.xml @@ -12,7 +12,7 @@ net.anwiba.eclipse anwiba-eclipse-maven-default - 1.0.64 + 1.0.68 diff --git a/eclipse/pom.xml b/eclipse/pom.xml index 0fe3fedf..73d99471 100644 --- a/eclipse/pom.xml +++ b/eclipse/pom.xml @@ -13,7 +13,7 @@ net.anwiba anwiba-maven-default - 1.0.64 + 1.0.68 diff --git a/maven/pom.xml b/maven/pom.xml index 2438e503..b641f384 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -9,7 +9,7 @@ net.anwiba anwiba-maven-default pom - 1.0.64 + 1.0.68 2007 @@ -825,11 +825,11 @@ UTF-8 - 1.0.64 + 1.0.68 https://github.com/AndreasWBartels ${net.anwiba.version} ${net.anwiba.version} - 1.0.64 + 1.0.68 scm:git:ssh://github.com:AndreasWBartels ${url.net.anwiba}/libraries/tree/master diff --git a/spatial/core/data/Gis_Ckan/pom.xml b/spatial/core/data/Gis_Ckan/pom.xml index 0ad5dcc9..d99e7884 100644 --- a/spatial/core/data/Gis_Ckan/pom.xml +++ b/spatial/core/data/Gis_Ckan/pom.xml @@ -9,7 +9,7 @@ net.anwiba.spatial anwiba-spatial-maven-core-data - 1.0.64 + 1.0.68 diff --git a/spatial/core/data/Gis_Geo_Json/pom.xml b/spatial/core/data/Gis_Geo_Json/pom.xml index 5c7baa18..63aacf4f 100644 --- a/spatial/core/data/Gis_Geo_Json/pom.xml +++ b/spatial/core/data/Gis_Geo_Json/pom.xml @@ -10,7 +10,7 @@ net.anwiba.spatial anwiba-spatial-maven-core-data - 1.0.64 + 1.0.68 diff --git a/spatial/core/data/Gis_Gpsd/pom.xml b/spatial/core/data/Gis_Gpsd/pom.xml index f0b03a7f..6a3b1e9d 100644 --- a/spatial/core/data/Gis_Gpsd/pom.xml +++ b/spatial/core/data/Gis_Gpsd/pom.xml @@ -10,7 +10,7 @@ net.anwiba.spatial anwiba-spatial-maven-core-data - 1.0.64 + 1.0.68 diff --git a/spatial/core/data/Gis_Ors/pom.xml b/spatial/core/data/Gis_Ors/pom.xml index b3a1eb21..d8dc4907 100644 --- a/spatial/core/data/Gis_Ors/pom.xml +++ b/spatial/core/data/Gis_Ors/pom.xml @@ -9,7 +9,7 @@ net.anwiba.spatial anwiba-spatial-maven-core-data - 1.0.64 + 1.0.68 diff --git a/spatial/core/data/Gis_Osm/pom.xml b/spatial/core/data/Gis_Osm/pom.xml index 5d2319d2..ede7ccc1 100644 --- a/spatial/core/data/Gis_Osm/pom.xml +++ b/spatial/core/data/Gis_Osm/pom.xml @@ -10,7 +10,7 @@ net.anwiba.spatial anwiba-spatial-maven-core-data - 1.0.64 + 1.0.68 diff --git a/spatial/core/data/Gis_Topo_Json/pom.xml b/spatial/core/data/Gis_Topo_Json/pom.xml index 95e51bc6..aab1ac6e 100644 --- a/spatial/core/data/Gis_Topo_Json/pom.xml +++ b/spatial/core/data/Gis_Topo_Json/pom.xml @@ -9,7 +9,7 @@ net.anwiba.spatial anwiba-spatial-maven-core-data - 1.0.64 + 1.0.68 diff --git a/spatial/core/data/pom.xml b/spatial/core/data/pom.xml index 14f7c29c..41765a5d 100644 --- a/spatial/core/data/pom.xml +++ b/spatial/core/data/pom.xml @@ -13,7 +13,7 @@ net.anwiba.spatial anwiba-spatial-maven-core - 1.0.64 + 1.0.68 diff --git a/spatial/core/pom.xml b/spatial/core/pom.xml index 4e24951e..298b4019 100644 --- a/spatial/core/pom.xml +++ b/spatial/core/pom.xml @@ -14,7 +14,7 @@ net.anwiba.spatial anwiba-spatial-maven-default - 1.0.64 + 1.0.68 diff --git a/spatial/pom.xml b/spatial/pom.xml index 362461aa..e351a755 100644 --- a/spatial/pom.xml +++ b/spatial/pom.xml @@ -17,7 +17,7 @@ net.anwiba anwiba-maven-default - 1.0.64 + 1.0.68