svn commit: r648954 - in /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl: CachingInjector.java converter/AnnotationTypeConverterLoader.java converter/CachingInjector.java converter/InstanceMethodTypeConverter.java

[da...@apache.org]

Author: davsclaus
Date: Wed Apr 16 22:14:12 2008
New Revision: 648954

URL: http://svn.apache.org/viewvc?rev=648954&view=rev
Log:
CAMEL-298 moved CachingInjector to sub package to avoid bad tangle

Added:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CachingInjector.java   (contents, props changed)
      - copied, changed from r648750, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CachingInjector.java
Removed:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CachingInjector.java
Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java?rev=648954&r1=648953&r2=648954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java Wed Apr 16 22:14:12 2008
@@ -34,7 +34,6 @@
 
 import org.apache.camel.Converter;
 import org.apache.camel.TypeConverter;
-import org.apache.camel.impl.CachingInjector;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.ResolverUtil;
 import org.apache.commons.logging.Log;
@@ -70,7 +69,7 @@
      * for text files on the classpath at the {@link #META_INF_SERVICES} location.
      *
      * @return a collection of packages to search for
-     * @throws IOException is thrown for IO relatede errors
+     * @throws IOException is thrown for IO related errors
      */
     protected String[] findPackageNames() throws IOException {
         Set<String> packages = new HashSet<String>();

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CachingInjector.java (from r648750, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CachingInjector.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CachingInjector.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CachingInjector.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CachingInjector.java&r1=648750&r2=648954&rev=648954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CachingInjector.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CachingInjector.java Wed Apr 16 22:14:12 2008
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.impl;
-
-import org.apache.camel.impl.converter.TypeConverterRegistry;
+package org.apache.camel.impl.converter;
 
 /**
- * A caching proxy so that a single 
+ * A caching proxy
+ *
  * @version $Revision$
  */
 public class CachingInjector<T> {
@@ -40,6 +39,6 @@
     }
 
     protected T createInstance(Class<T> t) {
-        return (T) repository.getInjector().newInstance(t);
+        return repository.getInjector().newInstance(t);
     }
 }

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java?rev=648954&r1=648953&r2=648954&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java Wed Apr 16 22:14:12 2008
@@ -20,7 +20,6 @@
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.TypeConverter;
-import org.apache.camel.impl.CachingInjector;
 import org.apache.camel.util.ObjectHelper;
 
 /**
@@ -46,7 +45,7 @@
     public synchronized <T> T convertTo(Class<T> type, Object value) {
         Object instance = injector.newInstance();
         if (instance == null) {
-            throw new RuntimeCamelException("Could not instantiate aninstance of: " + type.getName());
+            throw new RuntimeCamelException("Could not instantiate an instance of: " + type.getName());
         }
         return (T) ObjectHelper.invokeMethod(method, instance, value);
     }