/trunk/frameworks/_fwAndami/src/com/iver/andami/plugins/PluginClassLoader.java - Diff - Application: gvSIG desktop - gvSIG

Revision 2291 trunk/frameworks/_fwAndami/src/com/iver/andami/plugins/PluginClassLoader.java

      */
     package com.iver.andami.plugins;
     import com.iver.andami.messages.Messages;
     import org.apache.log4j.Logger;
     import java.io.DataInputStream;
     import java.io.File;
     import java.io.FileInputStream;
     import java.io.FileNotFoundException;
     import java.io.IOException;
     import java.io.InputStream;
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.net.URLClassLoader;
     import java.security.AllPermission;
     import java.security.CodeSource;
     import java.security.PermissionCollection;
     import java.util.ArrayList;
     import java.util.Enumeration;
     import java.util.Hashtable;
-...
     import java.util.zip.ZipException;
     import java.util.zip.ZipFile;
     import org.apache.log4j.Logger;
     import com.iver.andami.messages.Messages;
     /**
      * Class loader que carga las clases pedidas por los plugins de manera que
      * primero busca en el classpath, luego busca en el directorio del propio
-...
          * @param cl ClassLoader padre del classLoader, al que se le pedir?
          *        resolver las clases antes de utilizar el algoritmo propio
          * @param pluginLoaders DOCUMENT ME!
+         *
          * @throws IOException
          * @throws IOException
          */
         public PluginClassLoader(URL[] jars, String baseDir, ClassLoader cl,
             PluginClassLoader[] pluginLoaders) throws IOException {
-...
                         if (clasesJar.get(fileName) != null) {
                             throw new JarException(Messages.getString(
                                     "PluginClassLoader.Dos_clases_con_el_mismo_nombre_en_el_plugin" +
                                     ": " + fileName + " en " + jarFiles[i].getName() + " y en " + ((ZipFile)clasesJar.get(fileName)).getName()));
                                     ": " + fileName + " en " +
                                     jarFiles[i].getName() + " y en " +
                                     ((ZipFile) clasesJar.get(fileName)).getName()));
+                        }
                         clasesJar.put(fileName, jarFiles[i]);
+                    }
                 } catch (ZipException e) {
                 	throw new IOException(e.getMessage() + " Jar: " + jars[i].getPath()+": " + jarFiles[i]);
                     throw new IOException(e.getMessage() + " Jar: " +
                         jars[i].getPath() + ": " + jarFiles[i]);
                 } catch (IOException e) {
                     throw e;
+    			}
+                }
+            }
+        }
-...
          * DOCUMENT ME!
+         *
          * @param name DOCUMENT ME!
          * @param resolve DOCUMENT ME!
+         *
          * @return DOCUMENT ME!
+         *
          * @throws ClassNotFoundException DOCUMENT ME!
          */
         protected Class singleLoadClass(String name)
             throws ClassNotFoundException {
         protected Class singleLoadClass(String name) throws ClassNotFoundException {
             // Buscamos en las clases de las librer?as del plugin
             Class c = findLoadedClass(name);
         	if (c != null){
         		return c;
+        	}
             if (c != null) {
                 return c;
+            }
             try {
                 ZipFile jar = (ZipFile) clasesJar.get(name);
                 //No est? en ning?n jar
                 if (jar == null) {
                     for (int i = 0; i < pluginLoaders.length; i++) {
                         c = pluginLoaders[i].singleLoadClass(name);
                     //Buscamos en el directorio de clases
                     String classFileName = baseDir + "/classes/" +
                         name.replace('.', '/') + ".class";
                     File f = new File(classFileName);
                     if (f.exists()){
                         byte[] data = loadClassData(f);
                         c = defineClass(name, data, 0, data.length);
                     }else{
                         //Buscamos en los otros plugins
                         for (int i = 0; i < pluginLoaders.length; i++) {
                             c = pluginLoaders[i].singleLoadClass(name);
                         if (c != null) {
                             break;
                             if (c != null) {
                                 break;
+                            }
+                        }
+                    }
                 } else {
-...
+        }
         /**
          * Gets the bytes of a File
+         *
          * @param file File
+         *
          * @return bytes of file
+         *
          * @throws IOException If the operation fails
          */
         private byte[] loadClassData(File file) throws IOException {
             InputStream is = new FileInputStream(file);
             // Get the size of the file
             long length = file.length();
             // You cannot create an array using a long type.
             // It needs to be an int type.
             // Before converting to an int type, check
             // to ensure that file is not larger than Integer.MAX_VALUE.
             if (length > Integer.MAX_VALUE) {
                 // File is too large
+            }
             // Create the byte array to hold the data
             byte[] bytes = new byte[(int) length];
             // Read in the bytes
             int offset = 0;
             int numRead = 0;
             while ((offset < bytes.length) &&
                     ((numRead = is.read(bytes, offset, bytes.length - offset)) >= 0)) {
                 offset += numRead;
+            }
             // Ensure all the bytes have been read in
             if (offset < bytes.length) {
                 throw new IOException("Could not completely read file " +
                     file.getName());
+            }
             // Close the input stream and return bytes
             is.close();
             return bytes;
+        }
         /**
          * Obtiene los recursos tomando como la raiz el directorio base del plugin.
          * Si no se encuentra el recurso ah? se invoca a getResource del
          * classloader padre, que buscar? en el jar de la aplicaci?n. Si ah?
-...
          * @return
          */
         public String getPluginName() {
             String ret = baseDir.getAbsolutePath().substring(baseDir.getAbsolutePath().lastIndexOf(File.separatorChar) +
             String ret = baseDir.getAbsolutePath().substring(baseDir.getAbsolutePath()
                                                                     .lastIndexOf(File.separatorChar) +
 );
             return ret;

Also available in: Unified diff