You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/03/02 10:50:10 UTC
svn commit: r917936 - in
/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan:
core/MethodScanVisitor.java filter/ScanIdentifierFilter.java
registry/DependencyRegistryImpl.java
Author: werpu
Date: Tue Mar 2 09:50:09 2010
New Revision: 917936
URL: http://svn.apache.org/viewvc?rev=917936&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-70
code cleanup
Modified:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/core/MethodScanVisitor.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/ScanIdentifierFilter.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/registry/DependencyRegistryImpl.java
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/core/MethodScanVisitor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/core/MethodScanVisitor.java?rev=917936&r1=917935&r2=917936&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/core/MethodScanVisitor.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/core/MethodScanVisitor.java Tue Mar 2 09:50:09 2010
@@ -157,8 +157,6 @@
}
}
- //s1 method name, can be ignored
- // s hosting classname
if (owner != null)
registerDependency(Type.getObjectType(owner), "registering callee type [" + owner + "]");
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/ScanIdentifierFilter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/ScanIdentifierFilter.java?rev=917936&r1=917935&r2=917936&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/ScanIdentifierFilter.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/ScanIdentifierFilter.java Tue Mar 2 09:50:09 2010
@@ -9,13 +9,13 @@
*/
public class ScanIdentifierFilter implements ClassFilter {
- private final Integer _engineType;
+ private final int _engineType;
- public ScanIdentifierFilter(Integer engineType) {
+ public ScanIdentifierFilter(int engineType) {
_engineType = engineType;
}
public boolean isAllowed(Integer identifier, String clazz) {
- return _engineType.equals(identifier); //To change body of implemented methods use File | Settings | File Templates.
+ return _engineType == identifier.intValue(); //To change body of implemented methods use File | Settings | File Templates.
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/registry/DependencyRegistryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/registry/DependencyRegistryImpl.java?rev=917936&r1=917935&r2=917936&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/registry/DependencyRegistryImpl.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/registry/DependencyRegistryImpl.java Tue Mar 2 09:50:09 2010
@@ -47,6 +47,7 @@
}
public void addDependency(Integer engineType, String rootClass, String currentlyVisitedClass, String dependency) {
+
if (currentlyVisitedClass.equals(dependency)) {
return;
}