Merge pull request NASAWorldWind#192 from NASAWorldWind/gdal-webview

Gdal webview

Author: Beak-man

WebView32.dll

@@ -190,18 +190,6 @@ is divided into following sections:
                 <istrue value="${not.archive.disabled}"/>
             </or>
         </condition>
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-                <not>
-                    <istrue value="${modules.supported.internal}"/>
-                </not>
-            </and>
-        </condition>
         <condition property="do.archive+manifest.available">
             <and>
                 <isset property="manifest.available"/>
@@ -1218,13 +1206,27 @@ is divided into following sections:
             <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
         </manifest>
     </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
+    <target depends="init,compile" name="-check-do-mkdist">
+        <condition property="do.mkdist">
+            <and>
+                <isset property="do.archive"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+                <not>
+                    <available file="${build.classes.dir}/module-info.class"/>
+                </not>
+            </and>
+        </condition>
+    </target>
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.mkdist" name="-do-jar-copylibs">
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
         <j2seproject1:jar manifest="${tmp.manifest.file}"/>
         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
         <property location="${dist.jar}" name="dist.jar.resolved"/>

WebView64.dll

@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.kml.KMLViewer

libwebview.jnilib

@@ -4,5 +4,5 @@ [email protected]
 # 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=ed839dc9
-nbproject/build-impl.xml.script.CRC32=e40c9476
-nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.92.0.48
+nbproject/build-impl.xml.script.CRC32=2b01b309
+nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.93.0.48

nbproject/build-impl.xml

@@ -608,7 +608,7 @@ public static boolean isLinuxOS()
     public static boolean isUnixOS()
     {
         String osName = System.getProperty("os.name");
-        return osName != null && osName.toLowerCase().contains("unix");
+        return osName != null && (osName.toLowerCase().contains("linux") || osName.toLowerCase().contains("unix"));
     }
 
     /**

nbproject/configs/KMLViewer.properties

@@ -83,6 +83,7 @@ public KMLAbstractBalloon(KMLAbstractFeature feature)
      *
      * @param balloon The balloon contained in this wrapper object.
      */
+    @SuppressWarnings("deprecation")
     protected void initialize(Balloon balloon)
     {
         balloon.setTextDecoder(this.createTextDecoder(this.parent));

nbproject/genfiles.properties

@@ -93,7 +93,9 @@
  *
  * @author dcollins
  * @version $Id: AbstractBrowserBalloon.java 2148 2014-07-14 16:27:49Z tgaskins $
+ * @deprecated 
  */
+@Deprecated
 public abstract class AbstractBrowserBalloon extends AbstractBalloon implements HotSpot, Disposable
 {
 

src/gov/nasa/worldwind/Configuration.java

@@ -21,7 +21,9 @@
  * @author pabercrombie
  * @version $Id: GlobeBrowserBalloon.java 2272 2014-08-25 23:24:45Z tgaskins $
  * @see gov.nasa.worldwind.render.AbstractBrowserBalloon
+ * @deprecated 
  */
+@Deprecated
 public class GlobeBrowserBalloon extends AbstractBrowserBalloon implements GlobeBalloon
 {
     protected class OrderedGlobeBrowserBalloon extends OrderedBrowserBalloon