Replace explicit AWT DLL loading with a class load of java.awt.Toolkit.

[simantics/3d.git] / vtk / src / vtk / vtkJavaDep.java

diff --git a/vtk/src/vtk/vtkJavaDep.java b/vtk/src/vtk/vtkJavaDep.java
index ade1837135fb494ae0c3168264cd0171a318f8c9..626593928624f572e72e861619987d849ce7fc9a 100644 (file)
--- a/vtk/src/vtk/vtkJavaDep.java
+++ b/vtk/src/vtk/vtkJavaDep.java
@@ -94,7 +94,7 @@ public class vtkJavaDep {
                      "vtkRenderingFreeTypeJava",
                      "vtkRenderingAnnotation",
                      "vtkRenderingAnnotationJava",
-                     
+
                      "vtkFiltersHybrid",
                      "vtkFiltersHybridJava",
                      
@@ -105,15 +105,35 @@ public class vtkJavaDep {
                      "vtkInteractionImage",
                      "vtkInteractionImageJava",
                      
+                     "vtkIOCore",
+                     "vtkIOCoreJava",
+                     "vtkMetaIO",
+                     "vtkIOXMLParser",
+                     "vtkIOXMLParserJava",      
+                     "vtkIOXML",
+                     "vtkIOXMLJava",
+                     
+                     "vtkDICOMParser",
+                     "vtkIOImage",
+                     "vtkIOImageJava",
+                     "vtkIOImport",
+                     "vtkIOImportJava",
+
                      };
-         
-         
-         static {
-                 for (String lib : libs)
-                         System.loadLibrary(lib);
-         }
-         
-         static void load() {
-                 
-         }
+
+
+       static {
+               try {
+                       Class.forName("java.awt.Toolkit");
+               } catch (ClassNotFoundException e) {
+                       throw new IllegalStateException(e);
+               }
+
+               for (String lib : libs)
+                       System.loadLibrary(lib);
+       }
+
+       static void load() {
+
+       }
 }