Author: tchemit Date: 2011-08-04 15:37:03 +0200 (Thu, 04 Aug 2011) New Revision: 2163 Url: http://nuiton.org/repositories/revision/nuiton-utils/2163 Log: use getType instead of getInternalClass Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorMulti18nProvider.java trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorProvider.java trunk/nuiton-utils/src/test/java/org/nuiton/util/decorator/MultiJXPathDecoratorTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorMulti18nProvider.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorMulti18nProvider.java 2011-08-04 12:48:03 UTC (rev 2162) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorMulti18nProvider.java 2011-08-04 13:37:03 UTC (rev 2163) @@ -245,7 +245,7 @@ * Register a new decorator in the cache of the provider. * * @param <T> type of data decorated - * @param locale + * @param locale the given locale to use for this decorator * @param context the name decorator * @param decorator the decorator to register */ @@ -256,7 +256,7 @@ // obtain the decorator context DecoratorContext<?> result = getDecoratorContext(locale, - decorator.getInternalClass(), + decorator.getType(), context, false ); @@ -297,7 +297,7 @@ } public Class<T> getType() { - return decorator.getInternalClass(); + return decorator.getType(); } public boolean accept(Class<?> type, String context) { Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorProvider.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorProvider.java 2011-08-04 12:48:03 UTC (rev 2162) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorProvider.java 2011-08-04 13:37:03 UTC (rev 2163) @@ -179,7 +179,7 @@ // obtain the decorator context DecoratorContext<?> result = - getDecoratorContext(decorator.getInternalClass(), context); + getDecoratorContext(decorator.getType(), context); if (result != null) { throw new IllegalArgumentException( @@ -246,7 +246,7 @@ } public Class<T> getType() { - return decorator.getInternalClass(); + return decorator.getType(); } public boolean accept(Class<?> type, String context) { Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/decorator/MultiJXPathDecoratorTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/decorator/MultiJXPathDecoratorTest.java 2011-08-04 12:48:03 UTC (rev 2162) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/decorator/MultiJXPathDecoratorTest.java 2011-08-04 13:37:03 UTC (rev 2163) @@ -157,7 +157,7 @@ DecoratorProvider provider = new MyDummyDecoratorProvider(); provider.registerMultiJXPathDecorator(MultiJXPathDecorator.class, "(${expression}$s)#${nbToken}$d", "#", " - "); - decorator = (MultiJXPathDecorator<?>) provider.getDecorator(MultiJXPathDecorator.class); + decorator = (MultiJXPathDecorator<?>) provider.getDecoratorByType(MultiJXPathDecorator.class); assertEquals("(%1$s) - %2$d", decorator.getExpression()); assertTokens("expression", "nbToken");