[mapserver-commits] r7527 - trunk/mapserver/mapscript/java/examples

[svn at osgeo.org]

Author: warmerdam
Date: 2008-04-25 17:05:12 -0400 (Fri, 25 Apr 2008)
New Revision: 7527

Modified:
   trunk/mapserver/mapscript/java/examples/DrawMap.java
   trunk/mapserver/mapscript/java/examples/DumpShp.java
   trunk/mapserver/mapscript/java/examples/Metadata.java
   trunk/mapserver/mapscript/java/examples/RunTimeBuiltWMSClient.java
   trunk/mapserver/mapscript/java/examples/ShapeInfo.java
Log:
Avoid explicitly doing loadLibrary("mapscript") as it is already done
by the bindings, and it interferes with renaming of the library (#2595).


Modified: trunk/mapserver/mapscript/java/examples/DrawMap.java
===================================================================
--- trunk/mapserver/mapscript/java/examples/DrawMap.java	2008-04-21 08:31:48 UTC (rev 7526)
+++ trunk/mapserver/mapscript/java/examples/DrawMap.java	2008-04-25 21:05:12 UTC (rev 7527)
@@ -16,15 +16,6 @@
 
   public static void main(String[] args) {
     if (args.length != 2) usage();
-	try
-	{
-	  System.loadLibrary("mapscript");
-	}
-	catch(UnsatisfiedLinkError ule)
-	{
-	  System.err.println(ule);
-	  System.exit(-1);
-	}    
    
     mapObj map = new mapObj(args[0]);
     //map.getImagecolor().setRGB(153, 153, 204);

Modified: trunk/mapserver/mapscript/java/examples/DumpShp.java
===================================================================
--- trunk/mapserver/mapscript/java/examples/DumpShp.java	2008-04-21 08:31:48 UTC (rev 7526)
+++ trunk/mapserver/mapscript/java/examples/DumpShp.java	2008-04-25 21:05:12 UTC (rev 7527)
@@ -27,15 +27,6 @@
 
   public static void main(String[] args) {
     if (args.length != 1) usage();
-	try
-	{
-	  System.loadLibrary("mapscript");
-	}
-	catch(UnsatisfiedLinkError ule)
-	{
-	  System.err.println(ule);
-	  System.exit(-1);
-	}
 
     shapefileObj shapefile = new shapefileObj (args[0],-1);
     System.out.println ("Shapefile opened (type = "  + getShapeType(shapefile.getType()) +

Modified: trunk/mapserver/mapscript/java/examples/Metadata.java
===================================================================
--- trunk/mapserver/mapscript/java/examples/Metadata.java	2008-04-21 08:31:48 UTC (rev 7526)
+++ trunk/mapserver/mapscript/java/examples/Metadata.java	2008-04-25 21:05:12 UTC (rev 7527)
@@ -16,15 +16,6 @@
 
   public static void main(String[] args) {
     if (args.length != 1) usage();
-	try
-	{
-	  System.loadLibrary("mapscript");
-	}
-	catch(UnsatisfiedLinkError ule)
-	{
-	  System.err.println(ule);
-	  System.exit(-1);
-	}    
    
     mapObj map = new mapObj(args[0]);
     

Modified: trunk/mapserver/mapscript/java/examples/RunTimeBuiltWMSClient.java
===================================================================
--- trunk/mapserver/mapscript/java/examples/RunTimeBuiltWMSClient.java	2008-04-21 08:31:48 UTC (rev 7526)
+++ trunk/mapserver/mapscript/java/examples/RunTimeBuiltWMSClient.java	2008-04-25 21:05:12 UTC (rev 7527)
@@ -9,8 +9,6 @@
 */
 public class RunTimeBuiltWMSClient {
 	public static void main(String[] args)  {
-	   // Not needed anymore since mapserver 4.4.x
-	   //System.loadLibrary("mapscript");
 	   System.out.println(mapscript.msGetVersion());
 	   mapObj  map;
 	   webObj web;

Modified: trunk/mapserver/mapscript/java/examples/ShapeInfo.java
===================================================================
--- trunk/mapserver/mapscript/java/examples/ShapeInfo.java	2008-04-21 08:31:48 UTC (rev 7526)
+++ trunk/mapserver/mapscript/java/examples/ShapeInfo.java	2008-04-25 21:05:12 UTC (rev 7527)
@@ -31,15 +31,6 @@
 
     if (args.length != 2) usage();
 
-	try
-	{
-	  System.loadLibrary("mapscript");
-	}
-	catch(UnsatisfiedLinkError ule)
-	{
-	  System.err.println(ule);
-	  System.exit(-1);
-	}    
     shapefileObj shapefile = new shapefileObj (args[0],-1);
 
     System.out.println ("Shapefile name = " + args[0]);