Updated run-demo scripts to launch the ApplicationTemplate example if a class name is not provided.

emxsys · emxsys · commit 43abc5fb8eb6 · 2016-12-13T10:09:31.000-08:00
diff --git a/run-demo.bash b/run-demo.bash
@@ -7,8 +7,17 @@
 #
 
 #
-# Run a WorldWind Demo
+# Default to the ApplicationTemplate example if no arguments are provided
 #
+if [ $# -lt 1 ]
+then
+  WWDEMO=gov.nasa.worldwindx.examples.ApplicationTemplate
+else
+  WWDEMO=$*
+fi
 
-echo Running $1
-java -Xmx1024m -classpath ./worldwind.jar:./worldwindx.jar:./gdal.jar:./jogl-all.jar:./gluegen-rt.jar $*
+#
+# Run a WorldWind Demo
+#
+echo Running $WWDEMO
+java -Xmx1024m -classpath "./worldwind.jar;./worldwindx.jar;./gdal.jar;./jogl-all.jar;./gluegen-rt.jar" $WWDEMO
diff --git a/run-demo.bat b/run-demo.bat
@@ -1,8 +1,11 @@
+@echo off
 REM Copyright (C) 2012 United States Government as represented by the Administrator of the
 REM National Aeronautics and Space Administration.
 REM All Rights Reserved.
 
-REM Run a WorldWind Demo
+REM Default to the ApplicationTemplate example if a class name is not provided
+IF "%1"=="" (SET WWDEMO=gov.nasa.worldwindx.examples.ApplicationTemplate) ELSE (SET WWDEMO=%*)
 
-@echo Running %1
-java -Xmx1024m -Dsun.java2d.noddraw=true -classpath .\worldwind.jar;.\worldwindx.jar;.\gdal.jar;.\jogl-all.jar;.\gluegen-rt.jar %*
+REM Run a WorldWind Demo
+@echo Running %WWDEMO%
+java -Xmx1024m -Dsun.java2d.noddraw=true -classpath .\worldwind.jar;.\worldwindx.jar;.\gdal.jar;.\jogl-all.jar;.\gluegen-rt.jar %WWDEMO%

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,17 @@`
`7`	`7`	`#`
`8`	`8`
`9`	`9`	`#`
`10`		`-# Run a WorldWind Demo`
	`10`	`+# Default to the ApplicationTemplate example if no arguments are provided`
`11`	`11`	`#`
	`12`	`+if [ $# -lt 1 ]`
	`13`	`+then`
	`14`	`+ WWDEMO=gov.nasa.worldwindx.examples.ApplicationTemplate`
	`15`	`+else`
	`16`	`+ WWDEMO=$*`
	`17`	`+fi`
`12`	`18`
`13`		`-echo Running $1`
`14`		`-java -Xmx1024m -classpath ./worldwind.jar:./worldwindx.jar:./gdal.jar:./jogl-all.jar:./gluegen-rt.jar $*`
	`19`	`+#`
	`20`	`+# Run a WorldWind Demo`
	`21`	`+#`
	`22`	`+echo Running $WWDEMO`
	`23`	`+java -Xmx1024m -classpath "./worldwind.jar;./worldwindx.jar;./gdal.jar;./jogl-all.jar;./gluegen-rt.jar" $WWDEMO`