svn commit: r1162867 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java

[st...@apache.org]

Author: struberg
Date: Mon Aug 29 15:28:31 2011
New Revision: 1162867

URL: http://svn.apache.org/viewvc?rev=1162867&view=rev
Log:
OWB-612 fix * import which fails with new checkstyle plugin

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java
    openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java?rev=1162867&r1=1162866&r2=1162867&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java Mon Aug 29 15:28:31 2011
@@ -30,7 +30,7 @@ import javax.enterprise.inject.spi.Injec
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.util.Asserts;
 import org.apache.webbeans.util.ClassUtil;
-import static org.apache.webbeans.util.InjectionExceptionUtils.*;
+import org.apache.webbeans.util.InjectionExceptionUtils;
 
 public final class ResolutionUtil
 {
@@ -95,12 +95,12 @@ public final class ResolutionUtil
     {
         if (resolvedSet.isEmpty())
         {
-            throwUnsatisfiedResolutionException(type, injectionPoint, qualifiers);
+            InjectionExceptionUtils.throwUnsatisfiedResolutionException(type, injectionPoint, qualifiers);
         }
 
         if (resolvedSet.size() > 1)
         {
-            throwAmbiguousResolutionException(resolvedSet, type, injectionPoint, qualifiers);
+            InjectionExceptionUtils.throwAmbiguousResolutionException(resolvedSet, type, injectionPoint, qualifiers);
         }
 
         Bean<?> bean = resolvedSet.iterator().next();

Modified: openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java?rev=1162867&r1=1162866&r2=1162867&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java (original)
+++ openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java Mon Aug 29 15:28:31 2011
@@ -37,7 +37,7 @@ import org.apache.webbeans.context.Conte
 import org.apache.webbeans.context.type.ContextTypes;
 import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.spi.ContainerLifecycle;
-import static org.apache.webbeans.util.InjectionExceptionUtils.*;
+import org.apache.webbeans.util.InjectionExceptionUtils;
 
 /**
  * OpenWebBeans specific implementation of {@link CdiTestContainer}.
@@ -249,12 +249,12 @@ public class CdiTestOpenWebBeansContaine
         Set<Bean<?>> beans = getBeanManager().getBeans(type, qualifiers);
         if (beans == null || beans.isEmpty()) 
         {
-            throwBeanNotFoundException(type, qualifiers);
+            InjectionExceptionUtils.throwBeanNotFoundException(type, qualifiers);
         }
 
         if (beans.size() > 1) 
         {
-            throwAmbiguousResolutionException(beans, type, null, qualifiers);
+            InjectionExceptionUtils.throwAmbiguousResolutionException(beans, type, null, qualifiers);
         }
 
         @SuppressWarnings("unchecked")