[java] unpack dll/so to a tempDir instead of messing with their name

[simgrid.git] / src / bindings / java / org / simgrid / msg / File.java

diff --git a/src/bindings/java/org/simgrid/msg/File.java b/src/bindings/java/org/simgrid/msg/File.java
index 426ea07..015d080 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/File.java
+++ b/src/bindings/java/org/simgrid/msg/File.java
@@ -1,15 +1,12 @@
+/* Copyright (c) 2012-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 package org.simgrid.msg;
-/**
-* Copyright 2012 The SimGrid team. All right reserved. 
-*
-* This program is free software; you can redistribute 
-* it and/or modify it under the terms of the license 
-* (GNU LGPL) which comes with this package.
-*
-*/
 
 public class File {
-       protected String storage;
        /**
         * Represents the bind between the java comm and the
         * native C comm. You must never access it, since it is 
@@ -18,22 +15,19 @@ public class File {
        private long bind = 0;
        /**
         * Constructor, opens the file.
-        * @param storage is the name where you can find the file descriptor 
         * @param path is the file location on the storage 
         */
-       public File(String storage, String path) {
-               this.storage = storage;
-               open(storage, path);
+       public File(String path) {
+               open(path);
        }
        protected void finalize() {
 
        }
        /**
-        * Opens the file whose name is the string pointed to by path. 
-        * @param storage is the name where you can find the file descriptor 
+        * Opens the file whose name is the string pointed to by path.  
         * @param path is the file location on the storage
         */
-       protected native void open(String storage, String path);
+       protected native void open(String path);
        /**
         * Read elements of a file. 
         * @param size of each element
@@ -50,13 +44,11 @@ public class File {
         * Close the file.      
         */
        public native void close();
-       
-       /**
-        * Class initializer, to initialize various JNI stuff
-        */
+
+       /** Class initializer, to initialize various JNI stuff */
        public static native void nativeInit();
        static {
-               Msg.nativeInit();
+               org.simgrid.NativeLib.nativeInit();
                nativeInit();
        }       
 }
\ No newline at end of file