[jboss-cvs] JBossAS SVN: r71688 - in projects/microcontainer/trunk/kernel/src: main/org/jboss/kernel/api/dependency and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-04-03 06:54:30 -0400 (Thu, 03 Apr 2008)
New Revision: 71688

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/api/dependency/ClassMatcher.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DefaultMatcher.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/IntervalMatcher.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/RegexpMatcher.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/CustomMatcherTransfomer.java
Log:
Setting Matcher as a IDepenOn.
Adding toString to Matchers.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java	2008-04-03 09:34:26 UTC (rev 71687)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java	2008-04-03 10:54:30 UTC (rev 71688)
@@ -202,12 +202,25 @@
       {
          super(name, getDemand(), whenRequired, null);
          if (getTransformer() != null)
+         {
             matcher = MatcherFactory.getInstance().createMatcher(getTransformer(), getDemand());
+            setIDependOn(matcher);
+         }
       }
-      
+
+      /**
+       * Get the demand or matcher if set.
+       *
+       * @return more exact demand object
+       */
+      protected Object getDemandObject()
+      {
+         return (matcher != null) ? matcher : getDemand();
+      }
+
       public boolean resolve(Controller controller)
       {
-         Object name = (matcher != null) ? matcher : getDemand();
+         Object name = getDemandObject();
          ControllerContext context = controller.getInstalledContext(name);
          if (context != null)
          {
@@ -232,19 +245,19 @@
       public void toString(JBossStringBuilder buffer)
       {
          super.toString(buffer);
-         buffer.append(" demand=").append(getDemand());
+         buffer.append(" demand=").append(getDemandObject());
       }
       
       public void toShortString(JBossStringBuilder buffer)
       {
-         buffer.append(getName()).append(" demands ").append(getDemand());
+         buffer.append(getName()).append(" demands ").append(getDemandObject());
       }
 
       @Override
       public String toHumanReadableString()
       {
          StringBuilder builder = new StringBuilder();
-         builder.append("Demands '").append(getDemand()).append("'");
+         builder.append("Demands '").append(getDemandObject()).append("'");
          return builder.toString();
       }
    }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/api/dependency/ClassMatcher.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/api/dependency/ClassMatcher.java	2008-04-03 09:34:26 UTC (rev 71687)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/api/dependency/ClassMatcher.java	2008-04-03 10:54:30 UTC (rev 71688)
@@ -40,7 +40,7 @@
 
    protected boolean internalMatch(Object other)
    {
-      return clazz.isAssignableFrom(other.getClass()) != false && matchByType(clazz.cast(other));
+      return clazz.isInstance(other) && matchByType(clazz.cast(other));
    }
 
    /**

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DefaultMatcher.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DefaultMatcher.java	2008-04-03 09:34:26 UTC (rev 71687)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DefaultMatcher.java	2008-04-03 10:54:30 UTC (rev 71688)
@@ -47,5 +47,10 @@
    {
       return JBossObject.equals(value, other);
    }
+
+   public String toString()
+   {
+      return value != null ? value.toString() : "<null>";
+   }
 }
 

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/IntervalMatcher.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/IntervalMatcher.java	2008-04-03 09:34:26 UTC (rev 71687)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/IntervalMatcher.java	2008-04-03 10:54:30 UTC (rev 71688)
@@ -100,4 +100,13 @@
       }
       return isInRange;
    }
+
+   public String toString()
+   {
+      StringBuilder builder = new StringBuilder();
+      builder.append(floorIsGreaterThan ? "(" : "[");
+      builder.append(floor).append(",").append(ceiling);
+      builder.append(ceilingIsLessThan ? ")" : "]");
+      return builder.toString();
+   }
 }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/RegexpMatcher.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/RegexpMatcher.java	2008-04-03 09:34:26 UTC (rev 71687)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/RegexpMatcher.java	2008-04-03 10:54:30 UTC (rev 71688)
@@ -39,12 +39,18 @@
 
    public RegexpMatcher(String regexp)
    {
+      if (regexp == null)
+         throw new IllegalArgumentException("Null regexp");
       pattern = Pattern.compile(regexp);
    }
 
    protected boolean matchByType(String other)
    {
-      boolean b = pattern.matcher(other).matches();
-      return b;
+      return pattern.matcher(other).matches();
    }
+
+   public String toString()
+   {
+      return pattern.toString();
+   }
 }

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/CustomMatcherTransfomer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/CustomMatcherTransfomer.java	2008-04-03 09:34:26 UTC (rev 71687)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/CustomMatcherTransfomer.java	2008-04-03 10:54:30 UTC (rev 71688)
@@ -41,6 +41,9 @@
 
       public FragmentMatcher(String string)
       {
+         if (string == null)
+            throw new IllegalArgumentException("Null fragment");
+         
          this.fragment = string;
       }
 
@@ -48,5 +51,10 @@
       {
          return other.contains(fragment);
       }
+
+      public String toString()
+      {
+         return fragment;
+      }
    }
 }