[jbosscache-commits] JBoss Cache SVN: r7480 - in core/branches/flat/src: main/java/org/jboss/starobrno/factories/scopes and 1 other directories.
Author: manik.surtani(a)jboss.com
Date: 2009-01-15 11:48:16 -0500 (Thu, 15 Jan 2009)
New Revision: 7480
Modified:
core/branches/flat/src/main/java/org/jboss/starobrno/factories/HierarchicalComponentRegistry.java
core/branches/flat/src/main/java/org/jboss/starobrno/factories/scopes/Scopes.java
core/branches/flat/src/test/java/org/jboss/starobrno/factories/scopes/ScopeDetectorTest.java
Log:
Removed unused Scope
Modified:
core/branches/flat/src/main/java/org/jboss/starobrno/factories/HierarchicalComponentRegistry.java
===================================================================
---
core/branches/flat/src/main/java/org/jboss/starobrno/factories/HierarchicalComponentRegistry.java 2009-01-15
16:45:01 UTC (rev 7479)
+++
core/branches/flat/src/main/java/org/jboss/starobrno/factories/HierarchicalComponentRegistry.java 2009-01-15
16:48:16 UTC (rev 7480)
@@ -40,14 +40,6 @@
return parent.getComponent(componentType);
case CACHE_ONLY:
return super.getComponent(componentType);
- case EITHER:
- T t = super.getComponent(componentType);
- if (t == null)
- {
- // delegate to parent
- t = parent.getComponent(componentType);
- }
- return t;
default:
throw new IllegalArgumentException("Unknown component scope " +
componentScope);
}
Modified:
core/branches/flat/src/main/java/org/jboss/starobrno/factories/scopes/Scopes.java
===================================================================
---
core/branches/flat/src/main/java/org/jboss/starobrno/factories/scopes/Scopes.java 2009-01-15
16:45:01 UTC (rev 7479)
+++
core/branches/flat/src/main/java/org/jboss/starobrno/factories/scopes/Scopes.java 2009-01-15
16:48:16 UTC (rev 7480)
@@ -19,14 +19,8 @@
* Components bounded to this scope can only be created by a {@link
org.jboss.starobrno.Cache} and exist in the
* {@link org.jboss.starobrno.Cache}'s {@link
org.jboss.starobrno.factories.ComponentRegistry}.
*/
- CACHE_ONLY,
+ CACHE_ONLY;
- /**
- * Components bounded to this scope could be created by either the CacheManager or the
Cache, depending on where it is
- * first configured and encountered.
- */
- EITHER;
-
public static Scopes getDefaultScope()
{
return CACHE_ONLY;
Modified:
core/branches/flat/src/test/java/org/jboss/starobrno/factories/scopes/ScopeDetectorTest.java
===================================================================
---
core/branches/flat/src/test/java/org/jboss/starobrno/factories/scopes/ScopeDetectorTest.java 2009-01-15
16:45:01 UTC (rev 7479)
+++
core/branches/flat/src/test/java/org/jboss/starobrno/factories/scopes/ScopeDetectorTest.java 2009-01-15
16:48:16 UTC (rev 7480)
@@ -29,11 +29,6 @@
testScopes(Test4.class, Scopes.CACHE_MANAGER_ONLY);
}
- public void testMultipleScopes()
- {
- testScopes(Test5.class, Scopes.EITHER);
- }
-
public void testNoScopes()
{
testScopes(Test6.class, Scopes.CACHE_ONLY);
@@ -88,12 +83,6 @@
}
- @Scope(Scopes.EITHER)
- public static class Test5 implements Scoped
- {
-
- }
-
public static class Test6 extends SuperUnScoped implements Unscoped
{