Merge branches 'master' and 'master' of github.com:simgrid/simgrid

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

diff --git a/src/bindings/java/org/simgrid/msg/Storage.java b/src/bindings/java/org/simgrid/msg/Storage.java
index 201a3b9..4b15bba 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/Storage.java
+++ b/src/bindings/java/org/simgrid/msg/Storage.java
@@ -15,25 +15,12 @@ public class Storage {
         * a native storage. Even if this attribute is public you must never
         * access to it.
         */ 
-       private long bind;
+       private long bind = 0;
 
-       /**
-        * Storage name
-        */
+       /** Storage name */
        protected String name;
 
-       /**
-        * User data.
-        */ 
-       private Object data;
-       /**
-        *
-        */
-       protected Storage() {
-               this.bind = 0;
-               this.data = null;
-       };
-
+       @Override
        public String toString (){
                return this.name; 
 
@@ -47,10 +34,9 @@ public class Storage {
         *
         * @return              The storage object with the given name.
         * @exception           StorageNotFoundException if the name of the storage is not valid.
-        *                                      NativeException if the native version of this method failed.
         */ 
-       public native static Storage getByName(String name) 
-                       throws HostNotFoundException, NullPointerException, NativeException, StorageNotFoundException;
+       public static native Storage getByName(String name) 
+                       throws HostNotFoundException, StorageNotFoundException;
 
        /**
         * This method returns the name of a storage.
@@ -110,7 +96,7 @@ public class Storage {
         * @return                      An array containing all the storages installed.
         *
         */ 
-       public native static Storage[] all();
+       public static native Storage[] all();
 
        /**
         * Class initializer, to initialize various JNI stuff