svn commit: r1475805 - in /commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer: FilesystemPrivilizer.java Privilizer.java

[mb...@apache.org]

Author: mbenson
Date: Thu Apr 25 14:49:13 2013
New Revision: 1475805

URL: http://svn.apache.org/r1475805
Log:
rename interface to avoid confusion between a javassist class of the same name

Modified:
    commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/FilesystemPrivilizer.java
    commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java

Modified: commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/FilesystemPrivilizer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/FilesystemPrivilizer.java?rev=1475805&r1=1475804&r2=1475805&view=diff
==============================================================================
--- commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/FilesystemPrivilizer.java (original)
+++ commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/FilesystemPrivilizer.java Thu Apr 25 14:49:13 2013
@@ -52,7 +52,7 @@ public class FilesystemPrivilizer extend
 
     private final File target;
 
-    private final ClassFileWriter classFileWriter = new ClassFileWriter() {
+    private final ModifiedClassWriter modifiedClassWriter = new ModifiedClassWriter() {
         @Override
         public void write(CtClass type) throws CannotCompileException, IOException {
             type.writeFile(target.getAbsolutePath());
@@ -70,8 +70,8 @@ public class FilesystemPrivilizer extend
     }
 
     @Override
-    protected ClassFileWriter getClassFileWriter() {
-        return classFileWriter;
+    protected ModifiedClassWriter getModifiedClassWriter() {
+        return modifiedClassWriter;
     }
 
 }

Modified: commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java?rev=1475805&r1=1475804&r2=1475805&view=diff
==============================================================================
--- commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java (original)
+++ commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java Thu Apr 25 14:49:13 2013
@@ -64,7 +64,10 @@ import org.apache.commons.weaver.utils.B
  * @see Privilizing
  */
 public abstract class Privilizer {
-    public interface ClassFileWriter {
+    /**
+     * Simple interface to abstract the act of saving modifications to a class.
+     */
+    public interface ModifiedClassWriter {
         void write(CtClass type) throws CannotCompileException, IOException;
     }
 
@@ -234,7 +237,7 @@ public abstract class Privilizer {
             }
             if (result) {
                 type.setAttribute(policyName, policy.name().getBytes(Charset.forName("UTF-8")));
-                getClassFileWriter().write(type);
+                getModifiedClassWriter().write(type);
             }
         }
         log.info(String.format(result ? "Wove class %s" : "Nothing to do for class %s", type.getName()));
@@ -548,7 +551,7 @@ public abstract class Privilizer {
         log.warning(String.format(message, args));
     }
 
-    protected abstract ClassFileWriter getClassFileWriter();
+    protected abstract ModifiedClassWriter getModifiedClassWriter();
 
     protected void info(String message, Object... args) {
         log.info(String.format(message, args));
@@ -639,7 +642,7 @@ public abstract class Privilizer {
 
             result.addMethod(CtNewMethod.make(run.append(body.complete()).toString(), result));
         }
-        getClassFileWriter().write(result);
+        getModifiedClassWriter().write(result);
         debug("Returning action type %s", result);
         return result;
     }