[osm2garmin] r271 committed - Update Issue 133:...

[osm2g...@googlecode.com]

Revision: 271
Author: mant...@gmail.com
Date: Fri Nov 21 00:21:27 2014 UTC
Log: Update Issue 133:
Updated libraries to work with Java 8.
Heap memory expanded to 4 Gb in 64-bit Java. This should avoid problems
caused by growth of the Planet file.
https://code.google.com/p/osm2garmin/source/detail?r=271

Modified:
/trunk/Osm2garminAPI/pom.xml
/trunk/Osm2garminGUI/pom.xml

/trunk/Osm2garminGUI/src/main/java/org/mantlik/osm2garminspi/Osm2garminPanel.form

/trunk/Osm2garminGUI/src/main/java/org/mantlik/osm2garminspi/Osm2garminPanel.java
/trunk/Osm2garminGUI/src/main/nbm/module.xml
/trunk/application/pom.xml
/trunk/application/src/ConfigurationLogic.java
/trunk/pom.xml
/trunk/template.xml

=======================================
--- /trunk/Osm2garminAPI/pom.xml Mon Sep 24 14:46:24 2012 UTC
+++ /trunk/Osm2garminAPI/pom.xml Fri Nov 21 00:21:27 2014 UTC
@@ -38,7 +38,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -68,10 +67,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
=======================================
--- /trunk/Osm2garminGUI/pom.xml Tue Mar 26 13:26:16 2013 UTC
+++ /trunk/Osm2garminGUI/pom.xml Fri Nov 21 00:21:27 2014 UTC
@@ -139,8 +139,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>

=======================================
---
/trunk/Osm2garminGUI/src/main/java/org/mantlik/osm2garminspi/Osm2garminPanel.form
Sun Apr 7 19:26:36 2013 UTC
+++
/trunk/Osm2garminGUI/src/main/java/org/mantlik/osm2garminspi/Osm2garminPanel.form
Fri Nov 21 00:21:27 2014 UTC
@@ -22,8 +22,8 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
- <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="32767" attributes="0"/>
+ <Component id="jPanel1" max="32767" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -394,7 +394,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="1" attributes="0">
+ <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="0" pref="0" max="32767"
attributes="0"/>
<Component id="thresholdminorItem" min="-2"
pref="43" max="-2" attributes="0"/>
@@ -405,9 +405,15 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="thresholdmediumItem" min="-2"
pref="46" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
- <Component id="jLabel20" min="-2" pref="12"
max="-2" attributes="0"/>
+ <Component id="jLabel20" min="-2" pref="24"
max="-2" attributes="0"/>
</Group>
- <Group type="102" alignment="1" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="skipPlanetUpdateItem"
min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="33" max="-2"
attributes="0"/>
+ <Component id="updateRegionsItem" min="-2"
max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
+ </Group>
+ <Group type="102" attributes="0">
<Group type="103" groupAlignment="0"
attributes="0">
<Group type="102" alignment="0"
attributes="0">
<Component id="jLabel9" min="-2"
max="-2" attributes="0"/>
@@ -436,17 +442,9 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="majorintervalItem" min="-2"
pref="46" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
- <Component id="jLabel15" min="-2" pref="12"
max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="1" max="-2"
attributes="0"/>
- </Group>
- <Group type="102" alignment="0" attributes="0">
- <Component id="skipPlanetUpdateItem"
min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="33" max="-2"
attributes="0"/>
- <Component id="updateRegionsItem" min="-2"
max="-2" attributes="0"/>
- <EmptySpace min="0" pref="0" max="32767"
attributes="0"/>
+ <Component id="jLabel15" min="-2" pref="25"
max="-2" attributes="0"/>
</Group>
</Group>
- <EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
=======================================
---
/trunk/Osm2garminGUI/src/main/java/org/mantlik/osm2garminspi/Osm2garminPanel.java
Sun Apr 7 19:26:36 2013 UTC
+++
/trunk/Osm2garminGUI/src/main/java/org/mantlik/osm2garminspi/Osm2garminPanel.java
Fri Nov 21 00:21:27 2014 UTC
@@ -297,8 +297,8 @@

jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
.addContainerGap()
- .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addGroup(javax.swing.GroupLayout.Alignment.LEADING,
jPanel2Layout.createSequentialGroup()
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel2Layout.createSequentialGroup()
.addGap(0, 0, Short.MAX_VALUE)
.addComponent(thresholdminorItem,
javax.swing.GroupLayout.PREFERRED_SIZE, 43,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -308,8 +308,13 @@
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(thresholdmediumItem,
javax.swing.GroupLayout.PREFERRED_SIZE, 46,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jLabel20,
javax.swing.GroupLayout.PREFERRED_SIZE, 12,
javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(jLabel20,
javax.swing.GroupLayout.PREFERRED_SIZE, 24,
javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(skipPlanetUpdateItem)
+ .addGap(33, 33, 33)
+ .addComponent(updateRegionsItem)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE))
+ .addGroup(jPanel2Layout.createSequentialGroup()
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
.addComponent(jLabel9)
@@ -334,14 +339,7 @@
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(majorintervalItem,
javax.swing.GroupLayout.PREFERRED_SIZE, 46,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jLabel15,
javax.swing.GroupLayout.PREFERRED_SIZE, 12,
javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(1, 1, 1))
- .addGroup(javax.swing.GroupLayout.Alignment.LEADING,
jPanel2Layout.createSequentialGroup()
- .addComponent(skipPlanetUpdateItem)
- .addGap(33, 33, 33)
- .addComponent(updateRegionsItem)
- .addGap(0, 0, Short.MAX_VALUE)))
- .addContainerGap())
+ .addComponent(jLabel15,
javax.swing.GroupLayout.PREFERRED_SIZE, 25,
javax.swing.GroupLayout.PREFERRED_SIZE))))
);
jPanel2Layout.setVerticalGroup(

jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -480,8 +478,8 @@

layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
- .addComponent(jPanel1,
javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE))
+ .addComponent(jPanel1,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE)
+ .addContainerGap())
);
layout.setVerticalGroup(

layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
=======================================
--- /trunk/Osm2garminGUI/src/main/nbm/module.xml Tue Mar 20 16:00:01 2012
UTC
+++ /trunk/Osm2garminGUI/src/main/nbm/module.xml Fri Nov 21 00:21:27 2014
UTC
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<nbm>
- <codeNameBase>org.mantlik.osm2garmin.gui/1</codeNameBase>
+ <codeNameBase>org.mantlik.osm2garminspi/1</codeNameBase>
<licenseName>GPL Version 2.0</licenseName>
<licenseFile>LICENSE.txt</licenseFile>
</nbm>
=======================================
--- /trunk/application/pom.xml Tue Mar 12 13:58:42 2013 UTC
+++ /trunk/application/pom.xml Fri Nov 21 00:21:27 2014 UTC
@@ -24,6 +24,12 @@
<artifactId>platform</artifactId>
<version>${netbeans.version}</version>
<type>pom</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-netbeans-libs-javafx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -55,7 +61,13 @@
<groupId>org.netbeans.modules</groupId>
<artifactId>org-netbeans-modules-extbrowser</artifactId>
<version>${netbeans.version}</version>
- <type>nbm</type>
+ <!--<type>nbm</type>-->
+ <exclusions>
+ <exclusion>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-netbeans-libs-javafx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>

=======================================
--- /trunk/application/src/ConfigurationLogic.java Mon Apr 9 22:01:45 2012
UTC
+++ /trunk/application/src/ConfigurationLogic.java Fri Nov 21 00:21:27 2014
UTC
@@ -205,7 +205,7 @@
}

// update startup configuration file
- String replaceString = "-J-Xmx2000m"; // NOI18N
+ String replaceString = "-J-Xmx4000m"; // NOI18N
if (SystemUtils.isWindows()) {
if (! SystemUtils.isCurrentJava64Bit()) {
replaceString = "-J-Xmx1380m"; // NOI18N
=======================================
--- /trunk/pom.xml Mon Sep 24 14:28:39 2012 UTC
+++ /trunk/pom.xml Fri Nov 21 00:21:27 2014 UTC
@@ -49,7 +49,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
- <version>3.7-PREVIEW2</version>
+ <version>3.12</version>
<extensions>true</extensions>
<configuration>
<brandingToken>${brandingToken}</brandingToken>
@@ -65,16 +65,16 @@
<!-- NetBeans 6.9+ requires JDK 6 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.2</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -106,7 +106,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>2.10.1</version>
<executions>
<execution>
<id>javadoc</id>
@@ -219,7 +219,7 @@
</modules>

<properties>
- <netbeans.version>RELEASE72</netbeans.version>
+ <netbeans.version>RELEASE801</netbeans.version>
<brandingToken>osm2garmin</brandingToken>
<netbeans.hint.license>gpl20</netbeans.hint.license>
<project.version.short>1.2</project.version.short>
=======================================
--- /trunk/template.xml Mon Apr 9 22:01:45 2012 UTC
+++ /trunk/template.xml Fri Nov 21 00:21:27 2014 UTC
@@ -105,7 +105,7 @@

<copy file="${icon.path}"
tofile="${installer.build.dir}/ext/components/products/helloworld/src/org/mycompany/${icon.name}"/>

- <copy file="${suite.location}/application/src/build.xml"
tofile="${installer.build.dir}/build.xml" overwrite="true" />
+ <copy file="${suite.location}/src/build.xml"
tofile="${installer.build.dir}/build.xml" overwrite="true" />

<copy file="${configuration.logic.file}" overwrite="true"

tofile="${installer.build.dir}/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java"/>