You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by si...@apache.org on 2012/10/05 12:33:21 UTC
svn commit: r1394435 - in
/river/jtsk/trunk/src-extra/org/apache/river/extra/helpers:
ConfigHelper.java ExportHelper.java ImportHelper.java ProxyHelper.java
Author: sijskes
Date: Fri Oct 5 10:33:20 2012
New Revision: 1394435
URL: http://svn.apache.org/viewvc?rev=1394435&view=rev
Log:
logger made static final; renamed method; added generics; removed cast;
Modified:
river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java
river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ExportHelper.java
river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ImportHelper.java
river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ProxyHelper.java
Modified: river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java?rev=1394435&r1=1394434&r2=1394435&view=diff
==============================================================================
--- river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java (original)
+++ river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java Fri Oct 5 10:33:20 2012
@@ -63,7 +63,7 @@ public abstract class ConfigHelper
return new ProxyHelper(configuration);
}
- private Component findJiniComponent( Class cls )
+ private Component findComponentAnnotation( Class<?> cls )
{
if( !Remote.class.isAssignableFrom(cls) ) {
return null ;
@@ -73,8 +73,8 @@ public abstract class ConfigHelper
if( Proxy.isProxyClass(cls) ) {
Class[] ifs = cls.getInterfaces();
- for( Class c : ifs ) {
- jc = findJiniComponent(c);
+ for( Class<?> c : ifs ) {
+ jc = findComponentAnnotation(c);
if( jc != null ) {
return jc ;
}
@@ -82,14 +82,14 @@ public abstract class ConfigHelper
return null ;
}
- jc = (Component) cls.getAnnotation(Component.class);
+ jc = cls.getAnnotation(Component.class);
if( jc != null ) {
return jc ;
}
Class[] ifs = cls.getInterfaces();
- for( Class c : ifs ) {
- jc = findJiniComponent(c);
+ for( Class<?> c : ifs ) {
+ jc = findComponentAnnotation(c);
if( jc != null ) {
return jc ;
}
@@ -97,9 +97,9 @@ public abstract class ConfigHelper
return null ;
}
- protected String getComponent( Class cls )
+ protected String getComponent( Class<?> cls )
{
- Component jc = findJiniComponent(cls);
+ Component jc = findComponentAnnotation(cls);
if (jc != null) {
String comp = jc.value();
Modified: river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ExportHelper.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ExportHelper.java?rev=1394435&r1=1394434&r2=1394435&view=diff
==============================================================================
--- river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ExportHelper.java (original)
+++ river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ExportHelper.java Fri Oct 5 10:33:20 2012
@@ -41,7 +41,7 @@ import net.jini.jeri.ServerEndpoint;
public class ExportHelper
extends ConfigHelper
{
- private static Logger logger = Logger.getLogger(ExportHelper.class.getName());
+ private static final Logger logger = Logger.getLogger(ExportHelper.class.getName());
public ExportHelper(URL resource) throws ConfigurationException
{
Modified: river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ImportHelper.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ImportHelper.java?rev=1394435&r1=1394434&r2=1394435&view=diff
==============================================================================
--- river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ImportHelper.java (original)
+++ river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ImportHelper.java Fri Oct 5 10:33:20 2012
@@ -40,7 +40,7 @@ import net.jini.jeri.ObjectEndpoint;
public class ImportHelper
extends ConfigHelper
{
- private static Logger logger = Logger.getLogger(ImportHelper.class.getName());
+ private static final Logger logger = Logger.getLogger(ImportHelper.class.getName());
public ImportHelper(URL resource) throws ConfigurationException
{
Modified: river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ProxyHelper.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ProxyHelper.java?rev=1394435&r1=1394434&r2=1394435&view=diff
==============================================================================
--- river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ProxyHelper.java (original)
+++ river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ProxyHelper.java Fri Oct 5 10:33:20 2012
@@ -36,7 +36,7 @@ import net.jini.security.ProxyPreparer;
public class ProxyHelper
extends ConfigHelper
{
- private static Logger logger = Logger.getLogger( ProxyHelper.class.getName() );
+ private static final Logger logger = Logger.getLogger( ProxyHelper.class.getName() );
public ProxyHelper(URL resource) throws ConfigurationException
{