From: Dean H. <dea...@us...> - 2005-02-01 06:19:41
|
Update of /cvsroot/ant-contrib/ant-contrib/src/net/sf/antcontrib/design In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31735/src/net/sf/antcontrib/design Modified Files: Design.java InstructionVisitor.java Log Message: all tests passing with 1.4 now. Index: Design.java =================================================================== RCS file: /cvsroot/ant-contrib/ant-contrib/src/net/sf/antcontrib/design/Design.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Design.java 26 Jan 2005 21:01:13 -0000 1.7 --- Design.java 1 Feb 2005 06:19:32 -0000 1.8 *************** *** 129,133 **** //check if this is an needdeclarations="false" package, if so, the dependency is ok if it //is not declared ! log.log("classPackage="+classPackage, Project.MSG_DEBUG); Package p = retreivePack(classPackage); if(p != null && !p.isNeedDeclarations()) --- 129,133 ---- //check if this is an needdeclarations="false" package, if so, the dependency is ok if it //is not declared ! log.log(" classPackage="+classPackage, Project.MSG_DEBUG); Package p = retreivePack(classPackage); if(p != null && !p.isNeedDeclarations()) *************** *** 136,141 **** String pack = currentAliasPackage.getPackage(); ! log.log("pack="+pack, Project.MSG_DEBUG); ! log.log("classPack="+classPackage, Project.MSG_DEBUG); if(isClassInPackage(className, currentAliasPackage)) return; --- 136,141 ---- String pack = currentAliasPackage.getPackage(); ! log.log(" pack="+pack, Project.MSG_DEBUG); ! log.log(" classPack="+classPackage, Project.MSG_DEBUG); if(isClassInPackage(className, currentAliasPackage)) return; *************** *** 197,205 **** void checkClass(String dependsOn) { ! log.log("dependsOn="+dependsOn, Project.MSG_DEBUG); if(dependsOn.endsWith("[]")) { int index = dependsOn.indexOf("["); dependsOn = dependsOn.substring(0, index); ! log.log("dependsOn="+dependsOn, Project.MSG_DEBUG); } --- 197,205 ---- void checkClass(String dependsOn) { ! log.log(" dependsOn1="+dependsOn, Project.MSG_DEBUG); if(dependsOn.endsWith("[]")) { int index = dependsOn.indexOf("["); dependsOn = dependsOn.substring(0, index); ! log.log(" dependsOn2="+dependsOn, Project.MSG_DEBUG); } Index: InstructionVisitor.java =================================================================== RCS file: /cvsroot/ant-contrib/ant-contrib/src/net/sf/antcontrib/design/InstructionVisitor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InstructionVisitor.java 21 Jan 2005 17:02:48 -0000 1.3 --- InstructionVisitor.java 1 Feb 2005 06:19:32 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- import org.apache.bcel.generic.LoadInstruction; import org.apache.bcel.generic.NEW; + import org.apache.bcel.generic.PUTSTATIC; import org.apache.bcel.generic.Type; import org.apache.tools.ant.Project; *************** *** 93,96 **** } ! } \ No newline at end of file --- 94,109 ---- } ! public void visitPUTSTATIC(PUTSTATIC s) { ! String className = s.getFieldName(poolGen); ! if("staticField".equals(className)) ! return; ! ! log.log(" instr(putstatic)1="+className, Project.MSG_DEBUG); ! className = className.substring(6, className.length()); ! log.log(" instr(putstatic)2="+className, Project.MSG_DEBUG); ! className = className.replace('$', '.'); ! log.log(" instr(putstatic)3="+className, Project.MSG_DEBUG); ! ! design.checkClass(className); ! } } \ No newline at end of file |