Skip to content

Commit 22e47ed

Browse files
committed
WebView deprecation
1 parent dfd8e0b commit 22e47ed

30 files changed

+356
-195
lines changed

WebView32.dll

-212 KB
Binary file not shown.

WebView64.dll

-250 KB
Binary file not shown.

libwebview.jnilib

-116 KB
Binary file not shown.

nbproject/build-impl.xml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -190,18 +190,6 @@ is divided into following sections:
190190
<istrue value="${not.archive.disabled}"/>
191191
</or>
192192
</condition>
193-
<condition property="do.mkdist">
194-
<and>
195-
<isset property="do.archive"/>
196-
<isset property="libs.CopyLibs.classpath"/>
197-
<not>
198-
<istrue value="${mkdist.disabled}"/>
199-
</not>
200-
<not>
201-
<istrue value="${modules.supported.internal}"/>
202-
</not>
203-
</and>
204-
</condition>
205193
<condition property="do.archive+manifest.available">
206194
<and>
207195
<isset property="manifest.available"/>
@@ -1218,13 +1206,27 @@ is divided into following sections:
12181206
<attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
12191207
</manifest>
12201208
</target>
1221-
<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">
1209+
<target depends="init,compile" name="-check-do-mkdist">
1210+
<condition property="do.mkdist">
1211+
<and>
1212+
<isset property="do.archive"/>
1213+
<isset property="libs.CopyLibs.classpath"/>
1214+
<not>
1215+
<istrue value="${mkdist.disabled}"/>
1216+
</not>
1217+
<not>
1218+
<available file="${build.classes.dir}/module-info.class"/>
1219+
</not>
1220+
</and>
1221+
</condition>
1222+
</target>
1223+
<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">
12221224
<j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
12231225
<echo level="info">To run this application from the command line without Ant, try:</echo>
12241226
<property location="${dist.jar}" name="dist.jar.resolved"/>
12251227
<echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
12261228
</target>
1227-
<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">
1229+
<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">
12281230
<j2seproject1:jar manifest="${tmp.manifest.file}"/>
12291231
<property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
12301232
<property location="${dist.jar}" name="dist.jar.resolved"/>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.ColladaMovingModel
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.kml.KMLViewer

nbproject/genfiles.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=f85dc8f2@1.92.0.48
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
66
nbproject/build-impl.xml.data.CRC32=ed839dc9
7-
nbproject/build-impl.xml.script.CRC32=e40c9476
8-
nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.92.0.48
7+
nbproject/build-impl.xml.script.CRC32=2b01b309
8+
nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.93.0.48

src/gov/nasa/worldwind/Configuration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ public static boolean isLinuxOS()
608608
public static boolean isUnixOS()
609609
{
610610
String osName = System.getProperty("os.name");
611-
return osName != null && osName.toLowerCase().contains("unix");
611+
return osName != null && (osName.toLowerCase().contains("linux") || osName.toLowerCase().contains("unix"));
612612
}
613613

614614
/**

src/gov/nasa/worldwind/ogc/kml/impl/KMLAbstractBalloon.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public KMLAbstractBalloon(KMLAbstractFeature feature)
8383
*
8484
* @param balloon The balloon contained in this wrapper object.
8585
*/
86+
@SuppressWarnings("deprecation")
8687
protected void initialize(Balloon balloon)
8788
{
8889
balloon.setTextDecoder(this.createTextDecoder(this.parent));

src/gov/nasa/worldwind/render/AbstractBrowserBalloon.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@
9393
*
9494
* @author dcollins
9595
* @version $Id: AbstractBrowserBalloon.java 2148 2014-07-14 16:27:49Z tgaskins $
96+
* @deprecated
9697
*/
98+
@Deprecated
9799
public abstract class AbstractBrowserBalloon extends AbstractBalloon implements HotSpot, Disposable
98100
{
99101

0 commit comments

Comments
 (0)