commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tcu...@apache.org
Subject svn commit: r232875 - /jakarta/commons/sandbox/jci/trunk/src/java/org/apache/commons/jci/compilers/janino/JaninoJavaCompiler.java
Date Mon, 15 Aug 2005 20:55:41 GMT
Author: tcurdt
Date: Mon Aug 15 13:55:36 2005
New Revision: 232875

URL: http://svn.apache.org/viewcvs?rev=232875&view=rev
Log:
formatting


Modified:
    jakarta/commons/sandbox/jci/trunk/src/java/org/apache/commons/jci/compilers/janino/JaninoJavaCompiler.java

Modified: jakarta/commons/sandbox/jci/trunk/src/java/org/apache/commons/jci/compilers/janino/JaninoJavaCompiler.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/jci/trunk/src/java/org/apache/commons/jci/compilers/janino/JaninoJavaCompiler.java?rev=232875&r1=232874&r2=232875&view=diff
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/src/java/org/apache/commons/jci/compilers/janino/JaninoJavaCompiler.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/src/java/org/apache/commons/jci/compilers/janino/JaninoJavaCompiler.java
Mon Aug 15 13:55:36 2005
@@ -42,20 +42,20 @@
 import org.codehaus.janino.util.ClassFile;
 
 /**
- * 
+ *
  * @author art@gramlich-net.com
  */
 public class JaninoJavaCompiler implements JavaCompiler {
-    
+
     private final static Log log = LogFactory.getLog(JaninoJavaCompiler.class);
 
     private class CompilingIClassLoader extends IClassLoader {
-        
+
         private ResourceReader resourceReader;
         private CompilationProblemHandler problemHandler;
         private Map classes,types;
         private ClassLoaderIClassLoader loader;
-        
+
         private CompilingIClassLoader(ResourceReader resourceReader, CompilationProblemHandler
problemHandler, Map classes) {
             super(null);
             this.resourceReader = resourceReader;
@@ -76,59 +76,55 @@
                     ) {
                     //Quickly hand these off
                     return loader.loadIClass(type);
-             }
-            //log.debug("Looking for "+className);
+            }
             if (types.containsKey(type)) {
                 return (IClass) types.get(type);
             }
-            String fileNameForClass = className.replace('.', File.separatorChar)+".java";
-            //log.debug("Using resource reader to find "+fileNameForClass);
+            String fileNameForClass = className.replace('.', File.separatorChar) + ".java";
             if (!resourceReader.isAvailable(fileNameForClass)) {
                 return loader.loadIClass(type);
-            } else {
-                ByteArrayInputStream instream = new ByteArrayInputStream(new String(resourceReader.getContent(fileNameForClass)).getBytes());
-                Scanner scanner = null;
-                try {
-                    scanner = new Scanner(fileNameForClass, instream,"UTF-8");  
-                    Java.CompilationUnit unit = new Parser(scanner).parseCompilationUnit();
-                    log.debug("compile "+className);
-                    ClassFile[] classFiles = unit.compile(this,DebuggingInformation.ALL);
-                    for (int i=0; i<classFiles.length; i++) {
-                        log.debug("compiled "+classFiles[i].getThisClassName());
-                        classes.put(classFiles[i].getThisClassName(),classFiles[i].toByteArray());
-                    }
-                    IClass ic = unit.findClass(className);
-                    if (null != ic) {
-                        types.put(type,ic);
-                    }
-                    return ic; 
-                } catch (ScanException e) {
-                    problemHandler.handle(new CompilationProblem(0, e.getLocation().getFileName(),
e.getMessage(), e.getLocation().getLineNumber(), e.getLocation().getLineNumber(), true));
-                } catch (ParseException e) {
-                    problemHandler.handle(new CompilationProblem(0, e.getLocation().getFileName(),
e.getMessage(), e.getLocation().getLineNumber(), e.getLocation().getLineNumber(), true));
-                } catch (IOException e) {
-                    problemHandler.handle(new CompilationProblem(0, fileNameForClass, "IO:"
+ e.getMessage(), 0, 0, true));
-                } catch (CompileException e) {
-                    e.printStackTrace();
-                    problemHandler.handle(new CompilationProblem(0, e.getLocation().getFileName(),
e.getMessage(), e.getLocation().getLineNumber(), e.getLocation().getLineNumber(), true));
-                } finally {
-                    if (scanner != null) {
-                        try {
-                            scanner.close();
-                        } catch (IOException e1) {
-                            log.error(e1);
-                        }   
+            }
+
+            ByteArrayInputStream instream = new ByteArrayInputStream(new String(resourceReader.getContent(fileNameForClass)).getBytes());
+            Scanner scanner = null;
+            try {
+                scanner = new Scanner(fileNameForClass, instream, "UTF-8");
+                Java.CompilationUnit unit = new Parser(scanner).parseCompilationUnit();
+                log.debug("compile " + className);
+                ClassFile[] classFiles = unit.compile(this, DebuggingInformation.ALL);
+                for (int i = 0; i < classFiles.length; i++) {
+                    log.debug("compiled " + classFiles[i].getThisClassName());
+                    classes.put(classFiles[i].getThisClassName(), classFiles[i].toByteArray());
+                }
+                IClass ic = unit.findClass(className);
+                if (null != ic) {
+                    types.put(type, ic);
+                }
+                return ic;
+            } catch (ScanException e) {
+                problemHandler.handle(new CompilationProblem(0, e.getLocation().getFileName(),
e.getMessage(), e.getLocation().getLineNumber(), e.getLocation().getLineNumber(), true));
+            } catch (ParseException e) {
+                problemHandler.handle(new CompilationProblem(0, e.getLocation().getFileName(),
e.getMessage(), e.getLocation().getLineNumber(), e.getLocation().getLineNumber(), true));
+            } catch (IOException e) {
+                problemHandler.handle(new CompilationProblem(0, fileNameForClass, "IO:" +
e.getMessage(), 0, 0, true));
+            } catch (CompileException e) {
+                e.printStackTrace();
+                problemHandler.handle(new CompilationProblem(0, e.getLocation().getFileName(),
e.getMessage(), e.getLocation().getLineNumber(), e.getLocation().getLineNumber(), true));
+            } finally {
+                if (scanner != null) {
+                    try {
+                        scanner.close();
+                    } catch (IOException e) {
+                        log.error("IOException occured while compiling " + className, e);
                     }
                 }
-                return null;
             }
+            return null;
         }
-        
     }
 
     public void compile(String[] classes, ResourceReader in,
             ResourceStore store, CompilationProblemHandler problemHandler) {
-        //log.debug("compile called "+Arrays.asList(classes));
         Map classFilesByName = new HashMap();
         IClassLoader icl = new CompilingIClassLoader(in, problemHandler, classFilesByName);
         for (int i = 0; i < classes.length; i++) {



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message