updates for java 7

sgano · Jul 11, 2013 · 565a8e2 · 565a8e2
1 parent 1de00b5
commit 565a8e2
Show file tree

Hide file tree

Showing 24 changed files with 235 additions and 177 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-/build/
+/build/
+/dist/
diff --git a/Required_Libraries/substance/laf-plugin-7.2.1.jar b/Required_Libraries/substance/laf-plugin-7.2.1.jar
diff --git a/Required_Libraries/substance/laf-widget-7.2.1.jar b/Required_Libraries/substance/laf-widget-7.2.1.jar
diff --git a/..._Libraries/substance/substance-swingx.jar → ...raries/substance/old/substance-swingx.jar b/..._Libraries/substance/substance-swingx.jar → ...raries/substance/old/substance-swingx.jar
diff --git a/Required_Libraries/substance/substance.jar → ...red_Libraries/substance/old/substance.jar b/Required_Libraries/substance/substance.jar → ...red_Libraries/substance/old/substance.jar
diff --git a/Required_Libraries/substance/substance-7.2.1.jar b/Required_Libraries/substance/substance-7.2.1.jar
diff --git a/Required_Libraries/substance/substance-swingx-7.2.1.jar b/Required_Libraries/substance/substance-swingx-7.2.1.jar
diff --git a/Required_Libraries/substance/trident-7.2.1-base.jar b/Required_Libraries/substance/trident-7.2.1-base.jar
diff --git a/Required_Libraries/substance/trident-7.2.1-swing.jar b/Required_Libraries/substance/trident-7.2.1-swing.jar
diff --git a/Required_Libraries/substance/trident-7.2.1.jar b/Required_Libraries/substance/trident-7.2.1.jar
diff --git a/build.xml b/build.xml
@@ -1,69 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<project name="JSatTrak" default="default" basedir=".">
-    <description>Builds, tests, and runs the project JSatTrak.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="JSatTrak-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="JSatTrak" default="default" basedir=".">
+    <description>Builds, tests, and runs the project JSatTrak.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="JSatTrak-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
diff --git a/libgluegen-rt.jnilib b/libgluegen-rt.jnilib
diff --git a/libjogl.jnilib b/libjogl.jnilib
diff --git a/libjogl_awt.jnilib b/libjogl_awt.jnilib
diff --git a/libjogl_cg.jnilib b/libjogl_cg.jnilib
diff --git a/libwebview.jnilib b/libwebview.jnilib
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
@@ -1,6 +1,6 @@
-build.xml.data.CRC32=8c9849ce
-build.xml.script.CRC32=1a5ff1d3
-build.xml.stylesheet.CRC32=be360661
+build.xml.data.CRC32=a8851eb4
+build.xml.script.CRC32=04ae9dbf
+build.xml.stylesheet.CRC32=28e38971@1.53.1.46
 # 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.
 <<<<<<< .mine

diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -7,4 +7,19 @@
             <line>1758</line>
         </file>
     </editor-bookmarks>
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0">
+        <file>
+            <url>src/name/gano/astro/propogators/sgp4_cssi/SGP4unit.java</url>
+            <bookmark id="0">
+                <name/>
+                <line>401</line>
+                <key/>
+            </bookmark>
+            <bookmark id="0">
+                <name/>
+                <line>1758</line>
+                <key/>
+            </bookmark>
+        </file>
+    </editor-bookmarks>
 </project-private>
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -1,94 +1,119 @@
-application.args=
-application.title=SatTrak
-application.vendor=sgano
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/JSatTrak.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
-file.reference.bsh-2.0b4_seg.jar=Required_Libraries/Beanshell/bsh-2.0b4_seg.jar
-file.reference.gluegen-rt.jar=Required_Libraries/JOGL/gluegen-rt.jar
-file.reference.Jama-1.0.2.jar=Required_Libraries/Jama/Jama-1.0.2.jar
-file.reference.jmf.jar=Required_Libraries/Java_Media_Framework/jmf.jar
-file.reference.jogl.jar=Required_Libraries/JOGL/jogl.jar
-file.reference.JOGLUTILS.jar=Required_Libraries/JOGLUTILS/JOGLUTILS.jar
-file.reference.looks-2.2.1.jar=Required_Libraries/JGoodies-Looks/looks-2.2.1.jar
-file.reference.plugin.jar=Required_Libraries/Netscape_JavaScript/plugin.jar
-file.reference.substance-swingx.jar=Required_Libraries/substance/substance-swingx.jar
-file.reference.substance.jar=Required_Libraries/substance/substance.jar
-file.reference.swing-layout-1.0.3.jar=Required_Libraries/Swing Layout Extensions/swing-layout-1.0.3.jar
-file.reference.swingx-0.9.4.jar=Required_Libraries/SwingX/swingx-0.9.4.jar
-file.reference.worldwind.jar=Required_Libraries/worldwind/worldwind.jar
-file.reference.xpp3_min-1.1.4c.jar=Required_Libraries/xstream/xpp3_min-1.1.4c.jar
-file.reference.xstream-1.3.jar=Required_Libraries/xstream/xstream-1.3.jar
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${file.reference.bsh-2.0b4_seg.jar}:\
-    ${file.reference.Jama-1.0.2.jar}:\
-    ${file.reference.jmf.jar}:\
-    ${file.reference.looks-2.2.1.jar}:\
-    ${file.reference.gluegen-rt.jar}:\
-    ${file.reference.jogl.jar}:\
-    ${file.reference.JOGLUTILS.jar}:\
-    ${file.reference.plugin.jar}:\
-    ${file.reference.substance-swingx.jar}:\
-    ${file.reference.substance.jar}:\
-    ${file.reference.swing-layout-1.0.3.jar}:\
-    ${file.reference.swingx-0.9.4.jar}:\
-    ${file.reference.worldwind.jar}:\
-    ${file.reference.xpp3_min-1.1.4c.jar}:\
-    ${file.reference.xstream-1.3.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:unchecked
-javac.deprecation=false
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jnlp.codebase.type=local
-jnlp.codebase.url=file:/C:/Documents%20and%20Settings/sgano/Desktop/JSatTrak/JSatTrak/dist
-jnlp.enabled=false
-jnlp.offline-allowed=false
-jnlp.signed=false
-main.class=jsattrak.gui.JSatTrak
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-run.jvmargs=-Dsun.java2d.noddraw=true -Xmx512m 
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-src.dir=src
-test.src.dir=test
-project.license=JSatTrak
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+application.args=
+application.title=SatTrak
+application.vendor=sgano
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/JSatTrak.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.bsh-2.0b4_seg.jar=Required_Libraries/Beanshell/bsh-2.0b4_seg.jar
+file.reference.gluegen-rt.jar=Required_Libraries/JOGL/gluegen-rt.jar
+file.reference.Jama-1.0.2.jar=Required_Libraries/Jama/Jama-1.0.2.jar
+file.reference.jmf.jar=Required_Libraries/Java_Media_Framework/jmf.jar
+file.reference.jogl.jar=Required_Libraries/JOGL/jogl.jar
+file.reference.JOGLUTILS.jar=Required_Libraries/JOGLUTILS/JOGLUTILS.jar
+file.reference.laf-plugin-7.2.1.jar=Required_Libraries/substance/laf-plugin-7.2.1.jar
+file.reference.laf-widget-7.2.1.jar=Required_Libraries/substance/laf-widget-7.2.1.jar
+file.reference.looks-2.2.1.jar=Required_Libraries/JGoodies-Looks/looks-2.2.1.jar
+file.reference.plugin.jar=Required_Libraries/Netscape_JavaScript/plugin.jar
+file.reference.substance-7.2.1.jar=Required_Libraries/substance/substance-7.2.1.jar
+file.reference.substance-swingx-7.2.1.jar=Required_Libraries/substance/substance-swingx-7.2.1.jar
+file.reference.swing-layout-1.0.3.jar=Required_Libraries/Swing Layout Extensions/swing-layout-1.0.3.jar
+file.reference.swingx-0.9.4.jar=Required_Libraries/SwingX/swingx-0.9.4.jar
+file.reference.trident-7.2.1-base.jar=Required_Libraries/substance/trident-7.2.1-base.jar
+file.reference.trident-7.2.1-swing.jar=Required_Libraries/substance/trident-7.2.1-swing.jar
+file.reference.trident-7.2.1.jar=Required_Libraries/substance/trident-7.2.1.jar
+file.reference.worldwind.jar=Required_Libraries/worldwind/worldwind.jar
+file.reference.xpp3_min-1.1.4c.jar=Required_Libraries/xstream/xpp3_min-1.1.4c.jar
+file.reference.xstream-1.3.jar=Required_Libraries/xstream/xstream-1.3.jar
+includes=**
+jar.archive.disabled=${jnlp.enabled}
+jar.compress=false
+jar.index=${jnlp.enabled}
+javac.classpath=\
+    ${file.reference.bsh-2.0b4_seg.jar}:\
+    ${file.reference.Jama-1.0.2.jar}:\
+    ${file.reference.jmf.jar}:\
+    ${file.reference.looks-2.2.1.jar}:\
+    ${file.reference.gluegen-rt.jar}:\
+    ${file.reference.jogl.jar}:\
+    ${file.reference.JOGLUTILS.jar}:\
+    ${file.reference.plugin.jar}:\
+    ${file.reference.swing-layout-1.0.3.jar}:\
+    ${file.reference.substance-7.2.1.jar}:\
+    ${file.reference.substance-swingx-7.2.1.jar}:\
+    ${file.reference.trident-7.2.1.jar}:\
+    ${file.reference.swingx-0.9.4.jar}:\
+    ${file.reference.worldwind.jar}:\
+    ${file.reference.xpp3_min-1.1.4c.jar}:\
+    ${file.reference.xstream-1.3.jar}:\
+    ${file.reference.trident-7.2.1-base.jar}:\
+    ${file.reference.trident-7.2.1-swing.jar}:\
+    ${file.reference.laf-plugin-7.2.1.jar}:\
+    ${file.reference.laf-widget-7.2.1.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=-Xlint:unchecked
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.6
+javac.target=1.6
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+jnlp.codebase.type=local
+jnlp.codebase.url=file:/C:/Documents%20and%20Settings/sgano/Desktop/JSatTrak/JSatTrak/dist
+jnlp.descriptor=application
+jnlp.enabled=false
+jnlp.mixed.code=default
+jnlp.offline-allowed=false
+jnlp.signed=false
+jnlp.signing=
+jnlp.signing.alias=
+jnlp.signing.keystore=
+main.class=jsattrak.gui.JSatTrak
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+run.jvmargs=-Dsun.java2d.noddraw=true -Xmx512m 
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+src.dir=src
+test.src.dir=test
+project.license=JSatTrak