[Clirr-devel] CVS: clirr/src/java/net/sf/clirr/checks ClassHierarchyCheck.java,1.9,1.10 ClassModifie
Status: Alpha
Brought to you by:
lkuehne
Menu
▾
▴
[Clirr-devel] CVS: clirr/src/java/net/sf/clirr/checks ClassHierarchyCheck.java,1.9,1.10 ClassModifierCheck.java,1.8,1.9 FieldSetCheck.java,1.8,1.9 GenderChangeCheck.java,1.7,1.8 InterfaceSetCheck.java,1.8,1.9 MethodSetCheck.java,1.9,1.10
Update of /cvsroot/clirr/clirr/src/java/net/sf/clirr/checks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22759/checks Modified Files: ClassHierarchyCheck.java ClassModifierCheck.java FieldSetCheck.java GenderChangeCheck.java InterfaceSetCheck.java MethodSetCheck.java Log Message: Change check method prototype to return boolean. If false is returned, all following checks are skipped. Index: ClassHierarchyCheck.java =================================================================== RCS file: /cvsroot/clirr/clirr/src/java/net/sf/clirr/checks/ClassHierarchyCheck.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ClassHierarchyCheck.java 23 May 2004 14:27:46 -0000 1.9 +++ ClassHierarchyCheck.java 18 Jun 2004 06:52:10 -0000 1.10 @@ -69,7 +69,7 @@ } /** {@inheritDoc} */ - public void check(JavaClass compatBaseline, JavaClass currentVersion) + public boolean check(JavaClass compatBaseline, JavaClass currentVersion) { JavaClass[] compatSuper = compatBaseline.getSuperClasses(); JavaClass[] currentSuper = currentVersion.getSuperClasses(); @@ -101,5 +101,7 @@ log("Removed " + s + " from the list of superclasses of " + className, Severity.ERROR, className, null, null); } + + return true; } } Index: ClassModifierCheck.java =================================================================== RCS file: /cvsroot/clirr/clirr/src/java/net/sf/clirr/checks/ClassModifierCheck.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ClassModifierCheck.java 22 May 2004 13:26:03 -0000 1.8 +++ ClassModifierCheck.java 18 Jun 2004 06:52:10 -0000 1.9 @@ -44,7 +44,7 @@ } /** {@inheritDoc} */ - public void check(JavaClass compatBaseLine, JavaClass currentVersion) + public boolean check(JavaClass compatBaseLine, JavaClass currentVersion) { final boolean currentIsFinal = currentVersion.isFinal(); final boolean compatIsFinal = compatBaseLine.isFinal(); @@ -82,6 +82,8 @@ log("Added abstract modifier in class " + className, Severity.ERROR, className, null, null); } + + return true; } } Index: FieldSetCheck.java =================================================================== RCS file: /cvsroot/clirr/clirr/src/java/net/sf/clirr/checks/FieldSetCheck.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- FieldSetCheck.java 5 Jun 2004 16:19:07 -0000 1.8 +++ FieldSetCheck.java 18 Jun 2004 06:52:10 -0000 1.9 @@ -64,7 +64,7 @@ this.scopeSelector = scopeSelector; } - public final void check(JavaClass compatBaseline, JavaClass currentVersion) + public final boolean check(JavaClass compatBaseline, JavaClass currentVersion) { final Field[] baselineFields = compatBaseline.getFields(); final Field[] currentFields = currentVersion.getFields(); @@ -76,6 +76,8 @@ final Field[] cFields = createSortedCopy(currentFields); checkForChanges(bFields, cFields, compatBaseline, currentVersion); + + return true; } private void checkForChanges( Index: GenderChangeCheck.java =================================================================== RCS file: /cvsroot/clirr/clirr/src/java/net/sf/clirr/checks/GenderChangeCheck.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- GenderChangeCheck.java 22 May 2004 13:26:03 -0000 1.7 +++ GenderChangeCheck.java 18 Jun 2004 06:52:10 -0000 1.8 @@ -52,7 +52,7 @@ /** {@inheritDoc} */ - public void check(JavaClass baseLine, JavaClass current) + public boolean check(JavaClass baseLine, JavaClass current) { if (baseLine.isClass() != current.isClass()) { @@ -61,6 +61,8 @@ baseLine.getClassName(), null, null) ); } + + return true; } // TODO: This should be a method in BCEL's ClassSet !!! Index: InterfaceSetCheck.java =================================================================== RCS file: /cvsroot/clirr/clirr/src/java/net/sf/clirr/checks/InterfaceSetCheck.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- InterfaceSetCheck.java 22 May 2004 13:26:03 -0000 1.8 +++ InterfaceSetCheck.java 18 Jun 2004 06:52:10 -0000 1.9 @@ -48,7 +48,7 @@ } /** {@inheritDoc} */ - public void check(JavaClass compatBaseline, JavaClass currentVersion) + public boolean check(JavaClass compatBaseline, JavaClass currentVersion) { JavaClass[] compatInterfaces = compatBaseline.getAllInterfaces(); JavaClass[] currentInterfaces = currentVersion.getAllInterfaces(); @@ -92,6 +92,8 @@ Severity.INFO, className, null, null); } } + + return true; } private Set createClassSet(JavaClass[] classes) Index: MethodSetCheck.java =================================================================== RCS file: /cvsroot/clirr/clirr/src/java/net/sf/clirr/checks/MethodSetCheck.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- MethodSetCheck.java 13 Jun 2004 11:43:24 -0000 1.9 +++ MethodSetCheck.java 18 Jun 2004 06:52:10 -0000 1.10 @@ -57,14 +57,14 @@ this.scopeSelector = scopeSelector; } - public final void check(JavaClass compatBaseline, JavaClass currentVersion) + public final boolean check(JavaClass compatBaseline, JavaClass currentVersion) { // Dont't report method problems when gender has changed, as // really the whole API is a pile of crap then - let GenderChange check // do it's job, and that's it if (compatBaseline.isInterface() ^ currentVersion.isInterface()) { - return; + return true; } // The main problem here is to figure out which old method corresponds to which new method. @@ -116,6 +116,8 @@ check(compatBaseline, iMethod, jMethod); } } + + return true; } private int[][] buildSimilarityTable(List baselineMethods, List currentMethods) |
