Added Gall-Peters

Author: Bernie Jenny

build.xml

@@ -79,7 +79,7 @@
                           identifier="${main.class}"
                           mainclassname="${main.class}"
                           icon="mac/icon.icns"
-                          shortversion="1.0.3"
+                          shortversion="1.0.4"
                           copyright="© Bernhard Jenny 2007–2017"
                           applicationCategory="public.app-category.graphics-design">
             <classpath file="${dist.jar}" />

nbproject/build-impl.xml

@@ -903,6 +903,14 @@ is divided into following sections:
         <propertyfile file="${built-jar.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-jar.properties}"/>
+            <param location="${project.JMapProjLib}" name="call.subproject"/>
+            <param location="${project.JMapProjLib}/build.xml" name="call.script"/>
+            <param name="call.target" value="jar"/>
+            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">
@@ -1388,6 +1396,14 @@ is divided into following sections:
         <propertyfile file="${built-clean.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-clean.properties}"/>
+            <param location="${project.JMapProjLib}" name="call.subproject"/>
+            <param location="${project.JMapProjLib}/build.xml" name="call.script"/>
+            <param name="call.target" value="clean"/>
+            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>

nbproject/genfiles.properties

@@ -3,6 +3,6 @@ build.xml.script.CRC32=2b38d8ad
 build.xml.stylesheet.CRC32=240b97a2
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=04319c1f
-nbproject/build-impl.xml.script.CRC32=8aa11cdc
+nbproject/build-impl.xml.data.CRC32=be631d95
+nbproject/build-impl.xml.script.CRC32=0f5a9361
 nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48

nbproject/project.properties

@@ -28,17 +28,16 @@ endorsed.classpath=
 excludes=
 file.reference.iText-2.1.3.jar=lib/iText-2.1.3.jar
 file.reference.jai_imageio.jar=lib/jai_imageio.jar
-file.reference.JMapProjLib.jar=lib/JMapProjLib.jar
 file.reference.l2fprod-common-fontchooser.jar=lib/l2fprod-common-fontchooser.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    ${file.reference.JMapProjLib.jar}:\
     ${file.reference.jai_imageio.jar}:\
     ${file.reference.l2fprod-common-fontchooser.jar}:\
     ${file.reference.iText-2.1.3.jar}:\
+    ${reference.JMapProjLib.jar}:\
     ${libs.absolutelayout.classpath}:\
     ${libs.swing-layout.classpath}
 # Space-separated list of extra javac options
@@ -78,7 +77,9 @@ manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
 platform.active=default_platform
+project.JMapProjLib=../JMapProjLib
 project.license=gpl20
+reference.JMapProjLib.jar=${project.JMapProjLib}/dist/JMapProjLib.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}

nbproject/project.xml

@@ -12,6 +12,15 @@
                 <root id="test.src.dir"/>
             </test-roots>
         </data>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>JMapProjLib</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
     </configuration>
 </project>

src/ika/app/Application.properties

@@ -10,7 +10,7 @@ PreferencesPanel=ika.gui.FlexProjectorPreferencesPanel
 #The version of the application, numbers only in the format X.Y.Z, e.g. "1.12.5"
 #The last number is optional, i.e. "1.12" is valid.
 #The numbers can be followed by a string, such as "0.12 alpha"
-ApplicationVersion=1.0.3
+ApplicationVersion=1.0.4
 
 #a small icon for display in information dialogs
 ApplicationIcon=logo64x64.png

src/ika/data/projections.txt

@@ -12,11 +12,12 @@ Eckert IV, true
 Eckert V, true
 Eckert VI, true
 Eckert-Greifendorff, true, approx
-Equidistant Cylindrical (Plate Carrée), true
+Equirectangular, true
 Fahey, true, approx
 Foucaut, true, 
 Foucaut Sinusoidal, true
 Gall (Gall Stereographic), true
+Gall-Peters, true
 Ginzburg VIII (TsNIIGAiK 1944), true
 Goode Homolosine, true
 Hammer, true, approx