From 52ddd787accc8beb312884620d229f31cf156596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Karlstr=C3=B6m?= Date: Sat, 4 Apr 2020 08:04:30 +0200 Subject: [PATCH 01/11] Edit pom --- app-nb/application/pom.xml | 2 +- app-nb/branding/pom.xml | 2 +- app-nb/core-nb/pom.xml | 2 +- .../src/main/resources/org/mapton/core_nb/about.properties | 2 +- app-nb/modules-add-ons/geonames-ww/pom.xml | 2 +- app-nb/modules-add-ons/photos-nb/pom.xml | 2 +- app-nb/modules-add-ons/xkcd-nb/pom.xml | 2 +- app-nb/modules/editors-nb/pom.xml | 2 +- app-nb/modules/poi-nb/pom.xml | 2 +- app-nb/modules/reports-nb/pom.xml | 2 +- app-wb/application/pom.xml | 2 +- app-wb/core-wb/pom.xml | 2 +- app-wb/modules-add-ons/notes-wb/pom.xml | 2 +- app-wb/modules/reports-wb/pom.xml | 2 +- demo/pom.xml | 2 +- modules-add-ons/notes/pom.xml | 2 +- modules-add-ons/photos-ww/pom.xml | 2 +- modules-ext/gdal/pom.xml | 2 +- modules/wikipedia/pom.xml | 2 +- modules/ww-datasources/pom.xml | 2 +- pom.xml | 6 +++--- shared/api/pom.xml | 2 +- shared/base/pom.xml | 2 +- shared/me-gmapsfx/pom.xml | 2 +- shared/me-jxmapviewer2/pom.xml | 2 +- shared/me-mapjfx/pom.xml | 2 +- shared/me-worldwind/pom.xml | 2 +- shared/poi-bookmarks/pom.xml | 2 +- shared/poi-ww/pom.xml | 2 +- shared/se-bookmarks/pom.xml | 2 +- shared/se-geonames/pom.xml | 2 +- shared/se-google/pom.xml | 2 +- shared/se-nominatim/pom.xml | 2 +- shared/se-poi/pom.xml | 2 +- shared/te-swetrans/pom.xml | 2 +- shared/wms-bing/pom.xml | 2 +- shared/wms-eox/pom.xml | 2 +- shared/wms-lantmateriet/pom.xml | 2 +- shared/wms-nasa/pom.xml | 2 +- 39 files changed, 41 insertions(+), 41 deletions(-) diff --git a/app-nb/application/pom.xml b/app-nb/application/pom.xml index 1cab7a4a6..8b0516a0e 100644 --- a/app-nb/application/pom.xml +++ b/app-nb/application/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml diff --git a/app-nb/branding/pom.xml b/app-nb/branding/pom.xml index ae41d9a46..fcc49ac03 100644 --- a/app-nb/branding/pom.xml +++ b/app-nb/branding/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml diff --git a/app-nb/core-nb/pom.xml b/app-nb/core-nb/pom.xml index 7c0e6835a..c06bad2ad 100644 --- a/app-nb/core-nb/pom.xml +++ b/app-nb/core-nb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml core-nb diff --git a/app-nb/core-nb/src/main/resources/org/mapton/core_nb/about.properties b/app-nb/core-nb/src/main/resources/org/mapton/core_nb/about.properties index 6eb1c8676..b9ab5a9b1 100644 --- a/app-nb/core-nb/src/main/resources/org/mapton/core_nb/about.properties +++ b/app-nb/core-nb/src/main/resources/org/mapton/core_nb/about.properties @@ -21,7 +21,7 @@ app.licenseUriTitle=Apache, Version 2.0 app.name=Mapton app.uri=https://mapton.org app.uriTitle=mapton.org -app.version=2.0.0 +app.version=2.0.1-SNAPSHOT authors=Patrik Karlstr\u00f6m libraries=Almond-NBP;Apache Commons (csv, io, lang3, logging, text);Apache NetBeans Platform 11.3;OpenHMS SqlBuilder;H2 Database Engine;NASA WorldWind;JXMapViewer2;MapJfx;j2html;jsoup;GMapsFX;Material Design Icons thanksTo=Magnus Myhrberg;eox.at diff --git a/app-nb/modules-add-ons/geonames-ww/pom.xml b/app-nb/modules-add-ons/geonames-ww/pom.xml index d8a8b98b9..22b75880d 100644 --- a/app-nb/modules-add-ons/geonames-ww/pom.xml +++ b/app-nb/modules-add-ons/geonames-ww/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../../pom.xml addon-geonames-ww diff --git a/app-nb/modules-add-ons/photos-nb/pom.xml b/app-nb/modules-add-ons/photos-nb/pom.xml index a4b7510c1..fc4ca10ab 100644 --- a/app-nb/modules-add-ons/photos-nb/pom.xml +++ b/app-nb/modules-add-ons/photos-nb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../../pom.xml addon-photos-nb diff --git a/app-nb/modules-add-ons/xkcd-nb/pom.xml b/app-nb/modules-add-ons/xkcd-nb/pom.xml index 84f422605..c061e7573 100644 --- a/app-nb/modules-add-ons/xkcd-nb/pom.xml +++ b/app-nb/modules-add-ons/xkcd-nb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../../pom.xml addon-xkcd-nb diff --git a/app-nb/modules/editors-nb/pom.xml b/app-nb/modules/editors-nb/pom.xml index f3f14ee5c..32c921ada 100644 --- a/app-nb/modules/editors-nb/pom.xml +++ b/app-nb/modules/editors-nb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../../pom.xml editors-nb diff --git a/app-nb/modules/poi-nb/pom.xml b/app-nb/modules/poi-nb/pom.xml index 8a9d62bdd..8a30383f7 100644 --- a/app-nb/modules/poi-nb/pom.xml +++ b/app-nb/modules/poi-nb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../../pom.xml poi-nb diff --git a/app-nb/modules/reports-nb/pom.xml b/app-nb/modules/reports-nb/pom.xml index cbd226aae..199a39b1f 100644 --- a/app-nb/modules/reports-nb/pom.xml +++ b/app-nb/modules/reports-nb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../../pom.xml reports-nb diff --git a/app-wb/application/pom.xml b/app-wb/application/pom.xml index baa876c7b..306e120c2 100644 --- a/app-wb/application/pom.xml +++ b/app-wb/application/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml diff --git a/app-wb/core-wb/pom.xml b/app-wb/core-wb/pom.xml index cfe14efbe..2def589e9 100644 --- a/app-wb/core-wb/pom.xml +++ b/app-wb/core-wb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml core-wb diff --git a/app-wb/modules-add-ons/notes-wb/pom.xml b/app-wb/modules-add-ons/notes-wb/pom.xml index d377c9aa3..622cd81b0 100644 --- a/app-wb/modules-add-ons/notes-wb/pom.xml +++ b/app-wb/modules-add-ons/notes-wb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../../pom.xml addon-notes-wb diff --git a/app-wb/modules/reports-wb/pom.xml b/app-wb/modules/reports-wb/pom.xml index a8c1e81c3..3dbd69587 100644 --- a/app-wb/modules/reports-wb/pom.xml +++ b/app-wb/modules/reports-wb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../../pom.xml reports-wb diff --git a/demo/pom.xml b/demo/pom.xml index f7d316b8d..8bbeef1b2 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../pom.xml demo diff --git a/modules-add-ons/notes/pom.xml b/modules-add-ons/notes/pom.xml index cef3fcc2e..192655c23 100644 --- a/modules-add-ons/notes/pom.xml +++ b/modules-add-ons/notes/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml addon-notes diff --git a/modules-add-ons/photos-ww/pom.xml b/modules-add-ons/photos-ww/pom.xml index 399b14da1..bec9fc69f 100644 --- a/modules-add-ons/photos-ww/pom.xml +++ b/modules-add-ons/photos-ww/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml addon-photos-ww diff --git a/modules-ext/gdal/pom.xml b/modules-ext/gdal/pom.xml index f326b9934..f4dff0f04 100644 --- a/modules-ext/gdal/pom.xml +++ b/modules-ext/gdal/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml ext-gdal diff --git a/modules/wikipedia/pom.xml b/modules/wikipedia/pom.xml index c09e2acfc..d2242be6b 100644 --- a/modules/wikipedia/pom.xml +++ b/modules/wikipedia/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml wikipedia diff --git a/modules/ww-datasources/pom.xml b/modules/ww-datasources/pom.xml index 1071fe716..158a1b6a5 100644 --- a/modules/ww-datasources/pom.xml +++ b/modules/ww-datasources/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml ww-datasources diff --git a/pom.xml b/pom.xml index 45c095d75..00ac1475e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT pom mapton-parent @@ -555,8 +555,8 @@ all mapton UTF-8 - 11.0.5 - 2.0.0 + 11.0.6-SNAPSHOT + 2.0.1-SNAPSHOT 14 Some kind of map application diff --git a/shared/api/pom.xml b/shared/api/pom.xml index e948f554f..d90467cea 100644 --- a/shared/api/pom.xml +++ b/shared/api/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml mapton-api diff --git a/shared/base/pom.xml b/shared/base/pom.xml index f727c89b9..58f3eb46f 100644 --- a/shared/base/pom.xml +++ b/shared/base/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml mapton-base diff --git a/shared/me-gmapsfx/pom.xml b/shared/me-gmapsfx/pom.xml index 4801deacc..836b8a8fe 100644 --- a/shared/me-gmapsfx/pom.xml +++ b/shared/me-gmapsfx/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml me-gmapsfx diff --git a/shared/me-jxmapviewer2/pom.xml b/shared/me-jxmapviewer2/pom.xml index 1cb0154eb..7d9b1fe82 100644 --- a/shared/me-jxmapviewer2/pom.xml +++ b/shared/me-jxmapviewer2/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml me-jxmapviewer2 diff --git a/shared/me-mapjfx/pom.xml b/shared/me-mapjfx/pom.xml index 5ccc9163f..da2d42998 100644 --- a/shared/me-mapjfx/pom.xml +++ b/shared/me-mapjfx/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml me-mapjfx diff --git a/shared/me-worldwind/pom.xml b/shared/me-worldwind/pom.xml index e013b46d2..b87700f1a 100644 --- a/shared/me-worldwind/pom.xml +++ b/shared/me-worldwind/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml me-worldwind diff --git a/shared/poi-bookmarks/pom.xml b/shared/poi-bookmarks/pom.xml index 0ea7fb863..f89d6144d 100644 --- a/shared/poi-bookmarks/pom.xml +++ b/shared/poi-bookmarks/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml poi-bookmarks diff --git a/shared/poi-ww/pom.xml b/shared/poi-ww/pom.xml index 51afd534c..23cf33fa2 100644 --- a/shared/poi-ww/pom.xml +++ b/shared/poi-ww/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml poi-ww diff --git a/shared/se-bookmarks/pom.xml b/shared/se-bookmarks/pom.xml index 1decc8907..48440789d 100644 --- a/shared/se-bookmarks/pom.xml +++ b/shared/se-bookmarks/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml se-bookmarks diff --git a/shared/se-geonames/pom.xml b/shared/se-geonames/pom.xml index 93472b7cd..126cce554 100644 --- a/shared/se-geonames/pom.xml +++ b/shared/se-geonames/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml se-geonames diff --git a/shared/se-google/pom.xml b/shared/se-google/pom.xml index 12a190368..422436f14 100644 --- a/shared/se-google/pom.xml +++ b/shared/se-google/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml se-google diff --git a/shared/se-nominatim/pom.xml b/shared/se-nominatim/pom.xml index 19ec0f395..cbe82149e 100644 --- a/shared/se-nominatim/pom.xml +++ b/shared/se-nominatim/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml se-nominatim diff --git a/shared/se-poi/pom.xml b/shared/se-poi/pom.xml index 2207b5c12..cef54f12c 100644 --- a/shared/se-poi/pom.xml +++ b/shared/se-poi/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml se-poi diff --git a/shared/te-swetrans/pom.xml b/shared/te-swetrans/pom.xml index 11044b0bc..7424e62cb 100644 --- a/shared/te-swetrans/pom.xml +++ b/shared/te-swetrans/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml te-swetrans diff --git a/shared/wms-bing/pom.xml b/shared/wms-bing/pom.xml index f38545e8e..b6feb7dc8 100644 --- a/shared/wms-bing/pom.xml +++ b/shared/wms-bing/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml wms-bing diff --git a/shared/wms-eox/pom.xml b/shared/wms-eox/pom.xml index 2474cc24e..b01632ee3 100644 --- a/shared/wms-eox/pom.xml +++ b/shared/wms-eox/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml wms-eox diff --git a/shared/wms-lantmateriet/pom.xml b/shared/wms-lantmateriet/pom.xml index 6235688c7..1427e4aa5 100644 --- a/shared/wms-lantmateriet/pom.xml +++ b/shared/wms-lantmateriet/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml wms-lantmateriet diff --git a/shared/wms-nasa/pom.xml b/shared/wms-nasa/pom.xml index b76363cbc..9c9262731 100644 --- a/shared/wms-nasa/pom.xml +++ b/shared/wms-nasa/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.0 + 2.0.1-SNAPSHOT ../../pom.xml wms-nasa From 5ce07d46ed236f991869dd093f52bc6300746fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Karlstr=C3=B6m?= Date: Mon, 6 Apr 2020 15:00:40 +0200 Subject: [PATCH 02/11] core-nb: Fix NPE, MapTopComponent action --- .../mapton/core_nb/actions/BaseAction.java | 3 +- .../org/mapton/core_nb/tool/app/MapTool.java | 84 +++++++++---------- 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/app-nb/core-nb/src/main/java/org/mapton/core_nb/actions/BaseAction.java b/app-nb/core-nb/src/main/java/org/mapton/core_nb/actions/BaseAction.java index 7404bf146..3f7ca939a 100644 --- a/app-nb/core-nb/src/main/java/org/mapton/core_nb/actions/BaseAction.java +++ b/app-nb/core-nb/src/main/java/org/mapton/core_nb/actions/BaseAction.java @@ -17,7 +17,6 @@ import java.awt.event.ActionListener; import org.mapton.api.MOptions; -import org.openide.awt.Actions; import org.openide.windows.WindowManager; import se.trixon.almond.nbp.Almond; import se.trixon.almond.nbp.fx.FxTopComponent; @@ -46,7 +45,7 @@ protected void toggleTopComponent(String id) { if (tc.isOpened()) { tc.requestActive(); } else { - Actions.forID("Window", "org.mapton.core_nb.ui.MapTopComponent").actionPerformed(null); + Almond.openAndActivateTopComponent("MapTopComponent"); } } diff --git a/app-nb/core-nb/src/main/java/org/mapton/core_nb/tool/app/MapTool.java b/app-nb/core-nb/src/main/java/org/mapton/core_nb/tool/app/MapTool.java index d451ff0d5..fd2a75a5c 100644 --- a/app-nb/core-nb/src/main/java/org/mapton/core_nb/tool/app/MapTool.java +++ b/app-nb/core-nb/src/main/java/org/mapton/core_nb/tool/app/MapTool.java @@ -1,42 +1,42 @@ -/* - * Copyright 2019 Patrik Karlström. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.mapton.core_nb.tool.app; - -import org.controlsfx.control.action.Action; -import org.mapton.api.MToolApp; -import org.openide.awt.Actions; -import org.openide.util.lookup.ServiceProvider; -import se.trixon.almond.util.Dict; -import se.trixon.almond.util.fx.FxActionSwing; -import se.trixon.almond.util.icons.material.MaterialIcon; - -/** - * - * @author Patrik Karlström - */ -@ServiceProvider(service = MToolApp.class) -public class MapTool implements MToolApp { - - @Override - public Action getAction() { - FxActionSwing action = new FxActionSwing(Dict.MAP.toString(), () -> { - Actions.forID("Window", "org.mapton.core_nb.ui.MapTopComponent").actionPerformed(null); - }); - action.setGraphic(MaterialIcon._Maps.MAP.getImageView(ICON_SIZE)); - - return action; - } -} +/* + * Copyright 2019 Patrik Karlström. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.mapton.core_nb.tool.app; + +import org.controlsfx.control.action.Action; +import org.mapton.api.MToolApp; +import org.openide.util.lookup.ServiceProvider; +import se.trixon.almond.nbp.Almond; +import se.trixon.almond.util.Dict; +import se.trixon.almond.util.fx.FxActionSwing; +import se.trixon.almond.util.icons.material.MaterialIcon; + +/** + * + * @author Patrik Karlström + */ +@ServiceProvider(service = MToolApp.class) +public class MapTool implements MToolApp { + + @Override + public Action getAction() { + FxActionSwing action = new FxActionSwing(Dict.MAP.toString(), () -> { + Almond.openAndActivateTopComponent("MapTopComponent"); + }); + action.setGraphic(MaterialIcon._Maps.MAP.getImageView(ICON_SIZE)); + + return action; + } +} From db2c7e1f2a087130c3a4232a5f8e99096bcdf2ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Karlstr=C3=B6m?= Date: Mon, 6 Apr 2020 15:42:35 +0200 Subject: [PATCH 03/11] Edit pom --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 00ac1475e..d5fd0dc58 100644 --- a/pom.xml +++ b/pom.xml @@ -487,7 +487,7 @@ org.postgresql postgresql - 42.2.11 + 42.2.12 de.micromata.jak @@ -512,7 +512,7 @@ com.sothawo mapjfx - 2.13.1 + 2.14.0 com.github.pcmehlitz From d9fa3daf6d551943e72e45ab464a4c2f7bc151bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Karlstr=C3=B6m?= Date: Mon, 6 Apr 2020 16:11:17 +0200 Subject: [PATCH 04/11] core-nb: Fix fullscreen issue --- .../core-nb/src/main/java/org/mapton/core_nb/Initializer.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-nb/core-nb/src/main/java/org/mapton/core_nb/Initializer.java b/app-nb/core-nb/src/main/java/org/mapton/core_nb/Initializer.java index a2a799b3f..8448fcf05 100644 --- a/app-nb/core-nb/src/main/java/org/mapton/core_nb/Initializer.java +++ b/app-nb/core-nb/src/main/java/org/mapton/core_nb/Initializer.java @@ -18,6 +18,7 @@ import java.beans.PropertyChangeEvent; import java.util.prefs.BackingStoreException; import java.util.prefs.Preferences; +import javafx.application.Platform; import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JLayeredPane; @@ -74,6 +75,8 @@ public void run() { System.setProperty("netbeans.winsys.no_toolbars", "true"); System.setProperty("netbeans.winsys.status_line.path", "AppStatusPanel.instance"); + Platform.setImplicitExit(false); + boolean fullscreen = mOptions.isFullscreen(); boolean mapOnly = mOptions.isMapOnly(); FxHelper.setDarkThemeEnabled(mOptions.is(KEY_UI_LAF_DARK)); From 46704070569345d2e1ce9ae444631b2487f3e88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Karlstr=C3=B6m?= Date: Fri, 10 Apr 2020 09:52:33 +0200 Subject: [PATCH 05/11] me-jxmapviewer: Fix tile loading image --- .../java/org/mapton/jxmapviewer2/MapKit.java | 4 ++-- .../org/mapton/jxmapviewer2/mapton32.png | Bin 0 -> 3171 bytes 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 shared/me-jxmapviewer2/src/main/resources/org/mapton/jxmapviewer2/mapton32.png diff --git a/shared/me-jxmapviewer2/src/main/java/org/mapton/jxmapviewer2/MapKit.java b/shared/me-jxmapviewer2/src/main/java/org/mapton/jxmapviewer2/MapKit.java index 0c867856e..2182b4b2a 100644 --- a/shared/me-jxmapviewer2/src/main/java/org/mapton/jxmapviewer2/MapKit.java +++ b/shared/me-jxmapviewer2/src/main/java/org/mapton/jxmapviewer2/MapKit.java @@ -113,8 +113,8 @@ private File getCachedFile(URI uri) { setTileFactory(mTileFactory); try { - mMap.setLoadingImage(ImageIO.read(Mapton.class.getResource("mapton32.png"))); - } catch (IOException ex) { + mMap.setLoadingImage(ImageIO.read(MapKit.class.getResource("mapton32.png"))); + } catch (Exception ex) { //nvm - use default } diff --git a/shared/me-jxmapviewer2/src/main/resources/org/mapton/jxmapviewer2/mapton32.png b/shared/me-jxmapviewer2/src/main/resources/org/mapton/jxmapviewer2/mapton32.png new file mode 100644 index 0000000000000000000000000000000000000000..ac1d95e126443121a63e6a90fd29325e30dad7c1 GIT binary patch literal 3171 zcmV-p44m_cP)nZVyiya z8%`W}a4{U$Onr7?AwtLT{eVr?`=IL8d0*Snn@pJ+*t&(MG~Fl(&j?30OSNJSObV=gQjOdDKnZslxK2 z)Ipg;m_!K^!bgHK8{{YvlvB)&kcXtT7UM%Zl1YCPit6J92iDlJJ!SM`Ng{HqKIZc0wUTtdrBk*p+#dT9l z?8D^_3_R&^BVLyrGVSR!yq|+727PzXv)0J!Z=JJ8SlW^&x`l&77?u6r^VGd01BH)L_t(oM~zooY#ikk{{Fe{?A^OwukV*6 zkdTX`Tp%GNTv|%0ifA92iih^4YEw|@Lsbb{q)IJPRTZgKg@mdK^`#OIR8U?(EmfNm z2mul(F$uYli(|*@_1fO`UcBDjx%T_VF#;t8WG^PTT}=ZwG?-pu?@e*UWi zk9_aoftlITmdAeibl+^TwBGZf3RSxpi9`y9CO*srQ*W5g{2NCmilr~IwD`Q6MmO%> z@}+zBKYYi&ecv1#85(@=--sxx~42cT{P*np$0Sv7PPju5j4W3uzFL?;H0@qmrXcQuVrmNwx3V~=uMbtE~ z(sqzfM6c``&OY??pO3xsNhChyKxXXr&8ngO-EF(WzVCBE{_HbaGX_1@LBwdn_vnCD zff6_fgvz}Nho}U+RcF)@MMK&$5NG6LnIwFEYL1UgHi7MfxoO?^zjo-!7e7YgV+WE0 z+miyyt3s%I1BNRUF7CUb1Bw=bl`xU-T7ruPI*v;ehz%XE13F49q;Z{5565EIF_1$# z-HpMX1WZfE++rPX8g?$oiNU&X~)4b@tVsHiZM z1etEbGU#9@iTR4jR0u4#eRyUK<%%F-4Q%ac^SXn!(4iJ)&!Tfuq(qP8GhI|UIUvMy03}8iMRw9T;nHnVtoscCW0$;f+f^^J) z-(eXV3R?gR$X05_(q-8=hnrJX>#TEVf25?(!C!OWrq zBkG~q3Q()3IoVrkj0JJ3L;~>5Fg%#Y;Tg~XR~5mn3*`das_s&0*%^nreNdr zWF2>r#Dy6Lhn_rwiE|}3FxesK0!7SM130$lh|K7%lb$O^*+8Wa)FK02sd{eFET)B=D#TMS1sbC;wVqNbrB|46~clF?>&z{2+$)`x7 z6Cn_A`YS8%s5ac=oVi-m_jMfE1!NLDtSp->iWmZlNyW8E7`9oG=2DH)J5_sWC*?0OEGEUvi2HQHtD>0ZLQ(=A+?Um>}r>eEK3Gpn5A_bF|>S3P2R z!S~;v>TtND281JkK(iV{t0C{_L%s%`a+^vtsd~#0G@ug|J0LIUNR{W7u7pi&B$o!; zC43GeAGA&UbAl2nd$lw!wTAs*wZTaUg4eZdS~_ZO7F%Y_Qea*N~ zjz@K~SwcyV(%M9@yv(Yl6GX1Vd7vGbNVDr@cx_#87p~S@`1c7PixqYh*}K_SLI$qR zEi%<5I`Nu%?EPZH>h8X|zASczeLyw2OHq;ypLec$75+&SH4Y{0C-5jhZJ9PXvrt1! zQ{_y+j>t3^MCXHP6U7p>PpoQ;q8S8Yb^IXxBnp42&rbX`oCj9mKCNhKBNQVEmE7f5 zxG6+~(~sAIYX|VydXusu(rFGG26T#w#c#QIhKwA@#&Le$!PTOi%+}@|Le7s8Ry&V; zPY$Th$koGnpi)?vH&a7w$HD&4vg`?Kk&`Ua0p(hspbT=dap8&%5#j8|5m@d%^BmJT z$ne2(Q$eF4kEIhb7|E^G;N&Th{#|YMzkVzxX0c5l*0TuATPA*v*k!?fKG@n3q{MUp&>^zAxTMcdbD!j=6*al z-iP%RrorAkx|o72f38sV>pN|dlbYd$oZ%Y_o}&0XTAMk}y10J(+?UhT$lgtS>=4=aEz);r zRnw%Bv5#l@CctQGE$(e9At@fRU5M$x4_+iYpRE<%J9{I;Yu7&4fwddcqx*Bz@BOUd zI~dtER!X1ei}jM73jE7V*Q`*@Q#Af2eE(?m>N|^{Wq9qk{{b{)qTHH8-Nyg`002ov JPDHLkV1kwz2Ri@& literal 0 HcmV?d00001 From 5cbe8ecca67e136906f4cdf16c68d36cf7ec154e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Karlstr=C3=B6m?= Date: Fri, 10 Apr 2020 10:15:29 +0200 Subject: [PATCH 06/11] Edit pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d5fd0dc58..616e83f5d 100644 --- a/pom.xml +++ b/pom.xml @@ -517,7 +517,7 @@ com.github.pcmehlitz worldwind-pcm - 2.1.0.198 + 2.1.0.202 org.jsoup From b0c861c557716515f07761944d424bed546692c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Karlstr=C3=B6m?= Date: Sun, 12 Apr 2020 07:28:47 +0200 Subject: [PATCH 07/11] core-nb: Remove Style button default title --- .../core-nb/src/main/java/org/mapton/core_nb/ui/MapToolBar.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-nb/core-nb/src/main/java/org/mapton/core_nb/ui/MapToolBar.java b/app-nb/core-nb/src/main/java/org/mapton/core_nb/ui/MapToolBar.java index a3c72740c..22004139d 100644 --- a/app-nb/core-nb/src/main/java/org/mapton/core_nb/ui/MapToolBar.java +++ b/app-nb/core-nb/src/main/java/org/mapton/core_nb/ui/MapToolBar.java @@ -213,7 +213,7 @@ private void initActionsFx() { setTooltip(mToolboxAction, new KeyCodeCombination(KeyCode.T, KeyCombination.SHORTCUT_DOWN)); //Style - mStyleAction = new Action(String.format("%s & %s", Dict.TYPE.toString(), Dict.STYLE.toString()), event -> { + mStyleAction = new Action(event -> { if (shouldOpen(mStylePopOver)) { BorderPane pane = (BorderPane) mStylePopOver.getContentNode(); pane.setCenter(Mapton.getEngine().getStyleView()); From cd8037196a28acec76407a04800e5ae8b50f097e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Karlstr=C3=B6m?= Date: Sun, 12 Apr 2020 08:23:47 +0200 Subject: [PATCH 08/11] me-worldwind: Catch fitToBounds exception --- .../main/java/org/mapton/worldwind/WorldWindMapEngine.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shared/me-worldwind/src/main/java/org/mapton/worldwind/WorldWindMapEngine.java b/shared/me-worldwind/src/main/java/org/mapton/worldwind/WorldWindMapEngine.java index 2366513ca..b64b7d345 100644 --- a/shared/me-worldwind/src/main/java/org/mapton/worldwind/WorldWindMapEngine.java +++ b/shared/me-worldwind/src/main/java/org/mapton/worldwind/WorldWindMapEngine.java @@ -123,7 +123,12 @@ public void fitToBounds(MLatLonBox latLonBox) { if (!mInitialized) { return; } - fitToBounds(toSector(latLonBox)); + + try { + fitToBounds(toSector(latLonBox)); + } catch (NullPointerException e) { + //nvm + } } @Override From 35195ac4710fa45b5ad837eeb3619fd37e8d12c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Karlstr=C3=B6m?= Date: Sun, 12 Apr 2020 08:24:55 +0200 Subject: [PATCH 09/11] geonames-ww: Plot only countries with more than two cities --- .../geonames_ww/GeoNamesLayerBundle.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app-nb/modules-add-ons/geonames-ww/src/main/java/org/mapton/addon/geonames_ww/GeoNamesLayerBundle.java b/app-nb/modules-add-ons/geonames-ww/src/main/java/org/mapton/addon/geonames_ww/GeoNamesLayerBundle.java index a177a24ed..756af724b 100644 --- a/app-nb/modules-add-ons/geonames-ww/src/main/java/org/mapton/addon/geonames_ww/GeoNamesLayerBundle.java +++ b/app-nb/modules-add-ons/geonames-ww/src/main/java/org/mapton/addon/geonames_ww/GeoNamesLayerBundle.java @@ -88,14 +88,19 @@ private void refresh() { int minValue = 0; int maxValue = 100000; - for (Country country : countries) { - AnalyticGrid analyticGrid = new AnalyticGrid(mLayer, altitude, minValue, maxValue); - analyticGrid.setNullOpacity(0.0); - analyticGrid.setZeroOpacity(0.3); - analyticGrid.setZeroValueSearchRange(5); - analyticGrid.setGridData(getGridData(country)); + countries.stream() + .filter(country -> (country.getGeonames().size() > 1)) + .map(country -> { + AnalyticGrid analyticGrid = new AnalyticGrid(mLayer, altitude, minValue, maxValue); + analyticGrid.setNullOpacity(0.0); + analyticGrid.setZeroOpacity(0.3); + analyticGrid.setZeroValueSearchRange(5); + analyticGrid.setGridData(getGridData(country)); + + return analyticGrid; + }).forEachOrdered(analyticGrid -> { mLayer.addRenderable(analyticGrid.getSurface()); - } + }); LayerBundleManager.getInstance().redraw(); } From 3bb6a3ddf54266af3b5496eae63a37aa53005dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Karlstr=C3=B6m?= Date: Sun, 12 Apr 2020 08:50:51 +0200 Subject: [PATCH 10/11] Edit about --- .../src/main/resources/org/mapton/core_nb/about.properties | 6 +++--- .../base/src/main/resources/org/mapton/base/News.properties | 1 + .../main/resources/org/mapton/base/News_sv_SE.properties | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app-nb/core-nb/src/main/resources/org/mapton/core_nb/about.properties b/app-nb/core-nb/src/main/resources/org/mapton/core_nb/about.properties index b9ab5a9b1..566cc3831 100644 --- a/app-nb/core-nb/src/main/resources/org/mapton/core_nb/about.properties +++ b/app-nb/core-nb/src/main/resources/org/mapton/core_nb/about.properties @@ -14,14 +14,14 @@ # limitations under the License. # app.copyright=\u00a9 2018\u20132020 Patrik Karlstr\u00f6m -app.date=2020-04-04 +app.date=2020-04-12 app.description=Some kind of map application app.licenseUri=https://www.apache.org/licenses/LICENSE-2.0.html app.licenseUriTitle=Apache, Version 2.0 app.name=Mapton app.uri=https://mapton.org app.uriTitle=mapton.org -app.version=2.0.1-SNAPSHOT +app.version=2.0.1 authors=Patrik Karlstr\u00f6m libraries=Almond-NBP;Apache Commons (csv, io, lang3, logging, text);Apache NetBeans Platform 11.3;OpenHMS SqlBuilder;H2 Database Engine;NASA WorldWind;JXMapViewer2;MapJfx;j2html;jsoup;GMapsFX;Material Design Icons -thanksTo=Magnus Myhrberg;eox.at +thanksTo=Magnus Myhrberg;eox.at;Peter C Mehlitz diff --git a/shared/base/src/main/resources/org/mapton/base/News.properties b/shared/base/src/main/resources/org/mapton/base/News.properties index c630c745b..dca1b176f 100644 --- a/shared/base/src/main/resources/org/mapton/base/News.properties +++ b/shared/base/src/main/resources/org/mapton/base/News.properties @@ -13,5 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # +2020-04-12=Release 2.0.1 - Update of JOGL (OpenGL) dependencies, and a couple of minor fixes.. 2020-04-04=Release 2.0.0 - A major rewrite of the user interface. 2019-12-22=Add this news reader. diff --git a/shared/base/src/main/resources/org/mapton/base/News_sv_SE.properties b/shared/base/src/main/resources/org/mapton/base/News_sv_SE.properties index 8cf7f8358..d67ad194a 100644 --- a/shared/base/src/main/resources/org/mapton/base/News_sv_SE.properties +++ b/shared/base/src/main/resources/org/mapton/base/News_sv_SE.properties @@ -15,3 +15,4 @@ # 2020-04-04=Utg\u00e5va 2.0.0 - En \u00f6vergripande omskrivning av anv\u00e4ndargr\u00e4nssnittet. 2019-12-22=L\u00e4gg till denna nyhetsl\u00e4sare. +2020-04-12=Utg\u00e5va 2.0.1 - Uppdatering av beroenden f\u00f6r JOGL (OpenGL), och n\u00e5gra mindre fixar. From 5bc5a9f3aa57a37da7fd2810386cdd92cc0e91a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Karlstr=C3=B6m?= Date: Sun, 12 Apr 2020 09:02:03 +0200 Subject: [PATCH 11/11] Edit pom --- app-nb/application/pom.xml | 2 +- app-nb/branding/pom.xml | 2 +- app-nb/core-nb/pom.xml | 2 +- app-nb/modules-add-ons/geonames-ww/pom.xml | 2 +- app-nb/modules-add-ons/photos-nb/pom.xml | 2 +- app-nb/modules-add-ons/xkcd-nb/pom.xml | 2 +- app-nb/modules/editors-nb/pom.xml | 2 +- app-nb/modules/poi-nb/pom.xml | 2 +- app-nb/modules/reports-nb/pom.xml | 2 +- app-wb/application/pom.xml | 2 +- app-wb/core-wb/pom.xml | 2 +- app-wb/modules-add-ons/notes-wb/pom.xml | 2 +- app-wb/modules/reports-wb/pom.xml | 2 +- demo/pom.xml | 2 +- modules-add-ons/notes/pom.xml | 2 +- modules-add-ons/photos-ww/pom.xml | 2 +- modules-ext/gdal/pom.xml | 2 +- modules/wikipedia/pom.xml | 2 +- modules/ww-datasources/pom.xml | 2 +- pom.xml | 6 +++--- shared/api/pom.xml | 2 +- shared/base/pom.xml | 2 +- shared/me-gmapsfx/pom.xml | 2 +- shared/me-jxmapviewer2/pom.xml | 2 +- shared/me-mapjfx/pom.xml | 2 +- shared/me-worldwind/pom.xml | 2 +- shared/poi-bookmarks/pom.xml | 2 +- shared/poi-ww/pom.xml | 2 +- shared/se-bookmarks/pom.xml | 2 +- shared/se-geonames/pom.xml | 2 +- shared/se-google/pom.xml | 2 +- shared/se-nominatim/pom.xml | 2 +- shared/se-poi/pom.xml | 2 +- shared/te-swetrans/pom.xml | 2 +- shared/wms-bing/pom.xml | 2 +- shared/wms-eox/pom.xml | 2 +- shared/wms-lantmateriet/pom.xml | 2 +- shared/wms-nasa/pom.xml | 2 +- 38 files changed, 40 insertions(+), 40 deletions(-) diff --git a/app-nb/application/pom.xml b/app-nb/application/pom.xml index 8b0516a0e..fc2bfe3a4 100644 --- a/app-nb/application/pom.xml +++ b/app-nb/application/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml diff --git a/app-nb/branding/pom.xml b/app-nb/branding/pom.xml index fcc49ac03..87c4e7a69 100644 --- a/app-nb/branding/pom.xml +++ b/app-nb/branding/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml diff --git a/app-nb/core-nb/pom.xml b/app-nb/core-nb/pom.xml index c06bad2ad..3dba7149c 100644 --- a/app-nb/core-nb/pom.xml +++ b/app-nb/core-nb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml core-nb diff --git a/app-nb/modules-add-ons/geonames-ww/pom.xml b/app-nb/modules-add-ons/geonames-ww/pom.xml index 22b75880d..f5d1ad8d5 100644 --- a/app-nb/modules-add-ons/geonames-ww/pom.xml +++ b/app-nb/modules-add-ons/geonames-ww/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../../pom.xml addon-geonames-ww diff --git a/app-nb/modules-add-ons/photos-nb/pom.xml b/app-nb/modules-add-ons/photos-nb/pom.xml index fc4ca10ab..9e26dfd8b 100644 --- a/app-nb/modules-add-ons/photos-nb/pom.xml +++ b/app-nb/modules-add-ons/photos-nb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../../pom.xml addon-photos-nb diff --git a/app-nb/modules-add-ons/xkcd-nb/pom.xml b/app-nb/modules-add-ons/xkcd-nb/pom.xml index c061e7573..c58668445 100644 --- a/app-nb/modules-add-ons/xkcd-nb/pom.xml +++ b/app-nb/modules-add-ons/xkcd-nb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../../pom.xml addon-xkcd-nb diff --git a/app-nb/modules/editors-nb/pom.xml b/app-nb/modules/editors-nb/pom.xml index 32c921ada..5ca4bf6d8 100644 --- a/app-nb/modules/editors-nb/pom.xml +++ b/app-nb/modules/editors-nb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../../pom.xml editors-nb diff --git a/app-nb/modules/poi-nb/pom.xml b/app-nb/modules/poi-nb/pom.xml index 8a30383f7..2de136f9c 100644 --- a/app-nb/modules/poi-nb/pom.xml +++ b/app-nb/modules/poi-nb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../../pom.xml poi-nb diff --git a/app-nb/modules/reports-nb/pom.xml b/app-nb/modules/reports-nb/pom.xml index 199a39b1f..3135786fc 100644 --- a/app-nb/modules/reports-nb/pom.xml +++ b/app-nb/modules/reports-nb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../../pom.xml reports-nb diff --git a/app-wb/application/pom.xml b/app-wb/application/pom.xml index 306e120c2..d610766db 100644 --- a/app-wb/application/pom.xml +++ b/app-wb/application/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml diff --git a/app-wb/core-wb/pom.xml b/app-wb/core-wb/pom.xml index 2def589e9..4fc547971 100644 --- a/app-wb/core-wb/pom.xml +++ b/app-wb/core-wb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml core-wb diff --git a/app-wb/modules-add-ons/notes-wb/pom.xml b/app-wb/modules-add-ons/notes-wb/pom.xml index 622cd81b0..e0c363bef 100644 --- a/app-wb/modules-add-ons/notes-wb/pom.xml +++ b/app-wb/modules-add-ons/notes-wb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../../pom.xml addon-notes-wb diff --git a/app-wb/modules/reports-wb/pom.xml b/app-wb/modules/reports-wb/pom.xml index 3dbd69587..2fb36f5f8 100644 --- a/app-wb/modules/reports-wb/pom.xml +++ b/app-wb/modules/reports-wb/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../../pom.xml reports-wb diff --git a/demo/pom.xml b/demo/pom.xml index 8bbeef1b2..d53010235 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../pom.xml demo diff --git a/modules-add-ons/notes/pom.xml b/modules-add-ons/notes/pom.xml index 192655c23..dda781a67 100644 --- a/modules-add-ons/notes/pom.xml +++ b/modules-add-ons/notes/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml addon-notes diff --git a/modules-add-ons/photos-ww/pom.xml b/modules-add-ons/photos-ww/pom.xml index bec9fc69f..d056098a5 100644 --- a/modules-add-ons/photos-ww/pom.xml +++ b/modules-add-ons/photos-ww/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml addon-photos-ww diff --git a/modules-ext/gdal/pom.xml b/modules-ext/gdal/pom.xml index f4dff0f04..2ae3b550b 100644 --- a/modules-ext/gdal/pom.xml +++ b/modules-ext/gdal/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml ext-gdal diff --git a/modules/wikipedia/pom.xml b/modules/wikipedia/pom.xml index d2242be6b..5618aa842 100644 --- a/modules/wikipedia/pom.xml +++ b/modules/wikipedia/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml wikipedia diff --git a/modules/ww-datasources/pom.xml b/modules/ww-datasources/pom.xml index 158a1b6a5..b817f247a 100644 --- a/modules/ww-datasources/pom.xml +++ b/modules/ww-datasources/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml ww-datasources diff --git a/pom.xml b/pom.xml index 616e83f5d..9723dca8a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 pom mapton-parent @@ -555,8 +555,8 @@ all mapton UTF-8 - 11.0.6-SNAPSHOT - 2.0.1-SNAPSHOT + 11.0.5 + 2.0.1 14 Some kind of map application diff --git a/shared/api/pom.xml b/shared/api/pom.xml index d90467cea..6137434cf 100644 --- a/shared/api/pom.xml +++ b/shared/api/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml mapton-api diff --git a/shared/base/pom.xml b/shared/base/pom.xml index 58f3eb46f..e6d328a14 100644 --- a/shared/base/pom.xml +++ b/shared/base/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml mapton-base diff --git a/shared/me-gmapsfx/pom.xml b/shared/me-gmapsfx/pom.xml index 836b8a8fe..384b76a3a 100644 --- a/shared/me-gmapsfx/pom.xml +++ b/shared/me-gmapsfx/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml me-gmapsfx diff --git a/shared/me-jxmapviewer2/pom.xml b/shared/me-jxmapviewer2/pom.xml index 7d9b1fe82..945b56b76 100644 --- a/shared/me-jxmapviewer2/pom.xml +++ b/shared/me-jxmapviewer2/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml me-jxmapviewer2 diff --git a/shared/me-mapjfx/pom.xml b/shared/me-mapjfx/pom.xml index da2d42998..138abefa4 100644 --- a/shared/me-mapjfx/pom.xml +++ b/shared/me-mapjfx/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml me-mapjfx diff --git a/shared/me-worldwind/pom.xml b/shared/me-worldwind/pom.xml index b87700f1a..64dcd5272 100644 --- a/shared/me-worldwind/pom.xml +++ b/shared/me-worldwind/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml me-worldwind diff --git a/shared/poi-bookmarks/pom.xml b/shared/poi-bookmarks/pom.xml index f89d6144d..543af670d 100644 --- a/shared/poi-bookmarks/pom.xml +++ b/shared/poi-bookmarks/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml poi-bookmarks diff --git a/shared/poi-ww/pom.xml b/shared/poi-ww/pom.xml index 23cf33fa2..989d60b63 100644 --- a/shared/poi-ww/pom.xml +++ b/shared/poi-ww/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml poi-ww diff --git a/shared/se-bookmarks/pom.xml b/shared/se-bookmarks/pom.xml index 48440789d..853854f02 100644 --- a/shared/se-bookmarks/pom.xml +++ b/shared/se-bookmarks/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml se-bookmarks diff --git a/shared/se-geonames/pom.xml b/shared/se-geonames/pom.xml index 126cce554..11b89a698 100644 --- a/shared/se-geonames/pom.xml +++ b/shared/se-geonames/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml se-geonames diff --git a/shared/se-google/pom.xml b/shared/se-google/pom.xml index 422436f14..7f475ab9a 100644 --- a/shared/se-google/pom.xml +++ b/shared/se-google/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml se-google diff --git a/shared/se-nominatim/pom.xml b/shared/se-nominatim/pom.xml index cbe82149e..303536d19 100644 --- a/shared/se-nominatim/pom.xml +++ b/shared/se-nominatim/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml se-nominatim diff --git a/shared/se-poi/pom.xml b/shared/se-poi/pom.xml index cef54f12c..a8fadd944 100644 --- a/shared/se-poi/pom.xml +++ b/shared/se-poi/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml se-poi diff --git a/shared/te-swetrans/pom.xml b/shared/te-swetrans/pom.xml index 7424e62cb..92af86650 100644 --- a/shared/te-swetrans/pom.xml +++ b/shared/te-swetrans/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml te-swetrans diff --git a/shared/wms-bing/pom.xml b/shared/wms-bing/pom.xml index b6feb7dc8..6a2898a80 100644 --- a/shared/wms-bing/pom.xml +++ b/shared/wms-bing/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml wms-bing diff --git a/shared/wms-eox/pom.xml b/shared/wms-eox/pom.xml index b01632ee3..23daf9e4e 100644 --- a/shared/wms-eox/pom.xml +++ b/shared/wms-eox/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml wms-eox diff --git a/shared/wms-lantmateriet/pom.xml b/shared/wms-lantmateriet/pom.xml index 1427e4aa5..2bc29b00a 100644 --- a/shared/wms-lantmateriet/pom.xml +++ b/shared/wms-lantmateriet/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml wms-lantmateriet diff --git a/shared/wms-nasa/pom.xml b/shared/wms-nasa/pom.xml index 9c9262731..5d8fadbfe 100644 --- a/shared/wms-nasa/pom.xml +++ b/shared/wms-nasa/pom.xml @@ -4,7 +4,7 @@ org.mapton mapton-parent - 2.0.1-SNAPSHOT + 2.0.1 ../../pom.xml wms-nasa