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

[mb...@apache.org]

Author: mbenson
Date: Sat Apr 27 23:29:18 2013
New Revision: 1476696

URL: http://svn.apache.org/r1476696
Log:
trade woven for privilized in reporting

Removed:
    commons/sandbox/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/AlreadyWovenException.java
Modified:
    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/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=1476696&r1=1476695&r2=1476696&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 Sat Apr 27 23:29:18 2013
@@ -126,7 +126,7 @@ public class Privilizer {
     }
 
     /**
-     * Class-retention annotation to mark woven classes.
+     * Class-retention annotation to mark privilized classes.
      */
     @Target(ElementType.TYPE)
     public @interface Privilized {
@@ -275,9 +275,10 @@ public class Privilizer {
             Annotation privilized = invisibleAnnotations.getAnnotation(Privilized.class.getName());
             if (privilized != null) {
                 final String policyValue = ((EnumMemberValue) privilized.getMemberValue("value")).getValue();
-                verbose("%s already woven with policy %s", type.getName(), policyValue);
+                final String alreadyPrivilized = String.format("%s already privilized with policy %s", type.getName(), policyValue);
+                verbose(alreadyPrivilized);
                 if (!policy.name().equals(policyValue)) {
-                    throw new AlreadyWovenException(type.getName(), Policy.valueOf(policyValue));
+                    throw new IllegalStateException(alreadyPrivilized);
                 }
                 return false;
             }
@@ -315,7 +316,7 @@ public class Privilizer {
                 modifiedClassWriter.write(type);
             }
         }
-        log.info(String.format(result ? "Wove class %s" : "Nothing to do for class %s", type.getName()));
+        log.info(String.format(result ? "Privilized class %s" : "Nothing to do for class %s", type.getName()));
         return result;
     }