Merge branch 'develop'

trixon · Apr 4, 2020 · f17549e · f17549e
2 parents 8a15ffd + ec27c61
commit f17549e
Show file tree

Hide file tree

Showing 664 changed files with 18,472 additions and 7,973 deletions.
diff --git a/.gitignore b/.gitignore
@@ -85,4 +85,8 @@ $RECYCLE.BIN/
 
 
 # End of https://www.gitignore.io/api/java,linux,maven,netbeans,windows
-!/application/lib/com/bulenkov/darcula/1.0.0/darcula-1.0.0.jar
+
+!/app-nb/branding/src/main/nbm-branding/core/core.jar/
+!/app-nb/branding/src/main/nbm-branding/modules/org-netbeans-core-io-ui.jar/
+!/app-nb/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/
+!/app-nb/branding/src/main/nbm-branding/modules/org-netbeans-core.jar/
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # mapton
 Some kind of map application
 
-![alt tag](https://mapton.org/wp-content/uploads/2019/06/2019-06-23-200212_1280x800_scrot.png)
-![alt tag](https://mapton.org/wp-content/uploads/2019/06/2019-06-27-201602_1280x800_scrot.png)
+![alt tag](https://mapton.org/files/screenshots/appstream01.png)
+![alt tag](https://mapton.org/files/screenshots/appstream02.png)
diff --git a/core/nb-configuration.xml → app-nb/application/nb-configuration.xml b/core/nb-configuration.xml → app-nb/application/nb-configuration.xml
diff --git a/application/pom.xml → app-nb/application/pom.xml b/application/pom.xml → app-nb/application/pom.xml
@@ -4,21 +4,24 @@
     <parent>
         <groupId>org.mapton</groupId>
         <artifactId>mapton-parent</artifactId>
-        <version>1.1.3</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>2.0.0</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>mapton</artifactId>
+    <artifactId>mapton-app-nb</artifactId>
     <packaging>nbm-application</packaging>
 
-    <name>mapton</name>
-
     <properties>
         <all.clusters>${project.build.directory}/${brandingToken}</all.clusters>
     </properties>
 
     <dependencies>
         <!-- NetBeans -->
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-windows</artifactId>
+            <version>${netbeans.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.netbeans.cluster</groupId>
             <artifactId>platform</artifactId>
@@ -81,6 +84,10 @@
                     <groupId>org.netbeans.modules</groupId>
                     <artifactId>org-netbeans-modules-favorites</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.netbeans.modules</groupId>
+                    <artifactId>org-openide-util-ui-svg</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -90,10 +97,19 @@
             <artifactId>mapton-branding</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>mapton-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mapton-base</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>core-nb</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -113,6 +129,18 @@
             <artifactId>me-worldwind</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>me-mapjfx</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+
+        <!--Mapton/POI providers-->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>poi-bookmarks</artifactId>
+        </dependency>
 
         <!--Mapton/Search engines-->
         <dependency>
@@ -135,6 +163,10 @@
             <artifactId>se-nominatim</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>se-poi</artifactId>
+        </dependency>
 
         <!--Mapton/Transformation engines-->
         <dependency>
@@ -151,7 +183,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>wms-emxsys</artifactId>
+            <artifactId>wms-bing</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -168,18 +200,23 @@
         <!--Mapton/Other-->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>reports</artifactId>
-            <version>${project.version}</version>
+            <artifactId>editors-nb</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>wikipedia</artifactId>
-            <version>${project.version}</version>
+            <artifactId>poi-nb</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>datasources</artifactId>
-            <version>${project.version}</version>
+            <artifactId>poi-ww</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>reports-nb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>wikipedia</artifactId>
         </dependency>
 
         <!--Mapton/Add-ons-->
@@ -195,32 +232,26 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>addon-mapollage</artifactId>
+            <artifactId>addon-photos-nb</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>addon-mapollage-ww</artifactId>
+            <artifactId>addon-photos-ww</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <!--Mapton/Unstable-->
-        <!--
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ww-datasources</artifactId>
+            <artifactId>addon-xkcd-nb</artifactId>
             <version>${project.version}</version>
-        </dependency>-->
+        </dependency>
+
+        <!--Mapton/Unstable-->
         <!--        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>demo</artifactId>
             <version>${project.version}</version>
         </dependency>-->
-        <!--        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>me-mapjfx</artifactId>
-            <version>${project.version}</version>
-        </dependency>-->
 
         <!--Mapton/Ext-->
         <!--        <dependency>
@@ -238,27 +269,8 @@
             <groupId>se.trixon.almond</groupId>
             <artifactId>almond-nbp-actions-osx</artifactId>
         </dependency>
-        <dependency>
-            <groupId>se.trixon.almond</groupId>
-            <artifactId>almond-nbp-darcula</artifactId>
-        </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>lib</id>
-            <name>lib</name>
-            <releases>
-                <enabled>true</enabled>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <url>file:${project.basedir}/lib</url>
-        </repository>
-    </repositories>
-
     <build>
         <plugins>
             <plugin>
@@ -270,6 +282,7 @@
                     <installerLicenseFile>../LICENSE</installerLicenseFile>
                     <etcConfFile>src/main/resources/mapton.conf</etcConfFile>
                     <installerPack200Enable>false</installerPack200Enable>
+                    <finalName>mapton-${mapton.version}</finalName>
                     <!--<additionalArguments>-J-Xmx2048m</additionalArguments>-->
                     <!--<additionalArguments>&#045;&#045;locale en:US</additionalArguments>-->
                     <!--<additionalArguments>&#045;&#045;nosplash</additionalArguments>-->
@@ -279,34 +292,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>deployment</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.netbeans.utilities</groupId>
-                        <artifactId>nbm-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>extra</id>
-                                <goals>
-                                    <goal>autoupdate</goal>
-                                    <goal>webstart-app</goal>
-                                    <goal>build-installers</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/app-nb/application/src/main/resources/mapton.conf b/app-nb/application/src/main/resources/mapton.conf
@@ -0,0 +1,15 @@
+# ${HOME} will be replaced by user home directory according to platform
+default_userdir="${HOME}/.${APPNAME}/2.0"
+default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/2.0"
+
+# options used by the launcher by default, can be overridden by explicit
+# command line switches
+# for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea
+#default_options="--branding mapton -J-Xss2m -J-Dnetbeans.logger.console=true -J-ea"
+default_options="--branding mapton -J-Xss2m -J-Dnetbeans.logger.console=true -J--add-exports=jdk.unsupported.desktop/*=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.scene.traversal=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.collections=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.runtime=ALL-UNNAMED -J--add-exports=javafx.web/com.sun.webkit=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED -J--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED"
+#default_options="--branding mapton --nosplash -J-Xss2m -J-Dnetbeans.logger.console=true -J-ea -J-Djdk.gtk.version=2.2 -J--add-exports=javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.scene.traversal=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.collections=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.runtime=ALL-UNNAMED -J--add-exports=javafx.web/com.sun.webkit=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED -J--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED -J--add-opens=javafx.controls/javafx.scene.control=ALL-UNNAMED"
+# default location of JDK/JRE, can be overridden by using --jdkhome <dir> switch
+#jdkhome="/path/to/jdk"
+
+# clusters' paths separated by path.separator (semicolon on Windows, colon on Unices)
+#extra_clusters=
diff --git a/application/nb-configuration.xml → app-nb/branding/nb-configuration.xml b/application/nb-configuration.xml → app-nb/branding/nb-configuration.xml
diff --git a/branding/pom.xml → app-nb/branding/pom.xml b/branding/pom.xml → app-nb/branding/pom.xml
@@ -4,8 +4,8 @@
     <parent>
         <groupId>org.mapton</groupId>
         <artifactId>mapton-parent</artifactId>
-        <version>1.1.3</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>2.0.0</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>mapton-branding</artifactId>

diff --git a/...g/netbeans/core/startup/Bundle.properties → ...g/netbeans/core/startup/Bundle.properties b/...g/netbeans/core/startup/Bundle.properties → ...g/netbeans/core/startup/Bundle.properties
@@ -2,7 +2,7 @@ currentVersion=Mapton
 LBL_splash_window_title=Starting Mapton
 SPLASH_HEIGHT=316
 SPLASH_WIDTH=500
-SplashProgressBarBounds=108,210,450,6
+SplashProgressBarBounds=108,210,282,6
 SplashRunningTextBounds=0,304,500,12
 SplashRunningTextFontSize=14
 SplashShowProgressBar=true
diff --git a/...randing/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif b/...randing/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif
diff --git a/...nding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame32.gif b/...nding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame32.gif
diff --git a/...nding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame48.gif b/...nding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame48.gif
diff --git a/...anding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/splash.gif b/...anding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/splash.gif
diff --git a/...nding/modules/org-netbeans-core-io-ui.jar/org/netbeans/core/io/ui/Bundle_sv_SE.properties b/...nding/modules/org-netbeans-core-io-ui.jar/org/netbeans/core/io/ui/Bundle_sv_SE.properties
@@ -0,0 +1 @@
+LBL_IO_WINDOW=Utmatning
diff --git a/...g/netbeans/core/windows/Bundle.properties → ...g/netbeans/core/windows/Bundle.properties b/...g/netbeans/core/windows/Bundle.properties → ...g/netbeans/core/windows/Bundle.properties
@@ -13,3 +13,4 @@
 #TopComponent.Undocking.Enabled=true
 #View.TopComponent.Closing.Enabled=true
 Splitter.Respect.MinimumSize.Enabled=false
+TopComponent.Resizing.Enabled=true
diff --git a/...ns/core/windows/view/ui/Bundle.properties → ...ns/core/windows/view/ui/Bundle.properties b/...ns/core/windows/view/ui/Bundle.properties → ...ns/core/windows/view/ui/Bundle.properties
diff --git a/...in/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/actions/Bundle.properties b/...in/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/actions/Bundle.properties
@@ -0,0 +1 @@
+MSG_ShortLogTab_name=System log
diff --git a/...-branding/modules/org-netbeans-core.jar/org/netbeans/core/actions/Bundle_sv_SE.properties b/...-branding/modules/org-netbeans-core.jar/org/netbeans/core/actions/Bundle_sv_SE.properties
@@ -0,0 +1 @@
+MSG_ShortLogTab_name=Systemlogg
diff --git a/...ar/org/netbeans/core/ui/Bundle.properties → ...ar/org/netbeans/core/ui/Bundle.properties b/...ar/org/netbeans/core/ui/Bundle.properties → ...ar/org/netbeans/core/ui/Bundle.properties
diff --git a/branding/src/main/nbm/manifest.mf → app-nb/branding/src/main/nbm/manifest.mf b/branding/src/main/nbm/manifest.mf → app-nb/branding/src/main/nbm/manifest.mf
diff --git a/...ces/org/mapton/branding/Bundle.properties → ...ces/org/mapton/branding/Bundle.properties b/...ces/org/mapton/branding/Bundle.properties → ...ces/org/mapton/branding/Bundle.properties
diff --git a/app-nb/core-nb/nb-configuration.xml b/app-nb/core-nb/nb-configuration.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+    This file contains additional configuration written by modules in the NetBeans IDE.
+    The configuration is intended to be shared among all the users of project and
+    therefore it is assumed to be part of version control checkout.
+    Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    -->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+        Properties that influence various parts of the IDE, especially code formatting and the like.
+        You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+        That way multiple projects can share the same settings (useful for formatting rules for example).
+        Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        -->
+        <netbeans.compile.on.save>all</netbeans.compile.on.save>
+    </properties>
+</project-shared-configuration>