[Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/internal/checks FieldSetCheck.java,1.8,1.9 MethodSetCheck.java,1.11,1.12

[<lk...@us...>]

Update of /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/checks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19663/src/java/net/sf/clirr/core/internal/checks

Modified Files:
	FieldSetCheck.java MethodSetCheck.java 
Log Message:
Fixed regression #1459639, array dimension change no longer detected.

While I was working on that bug, I noticed a few other glitches that were introduced when switching from BCEL to ASM, some of them are fixed in this commit as well.

Index: FieldSetCheck.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/checks/FieldSetCheck.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FieldSetCheck.java	26 Aug 2005 05:35:52 -0000	1.8
+++ FieldSetCheck.java	29 Mar 2006 12:21:41 -0000	1.9
@@ -171,8 +171,8 @@
 
     private void checkForTypeChange(Field bField, Field cField, JavaType currentClass)
     {
-        final String bSig = bField.getType().toString();
-        final String cSig = cField.getType().toString();
+        final String bSig = bField.getType().getName();
+        final String cSig = cField.getType().getName();
         if (!bSig.equals(cSig))
         {
             fireDiff(MSG_FIELD_TYPE_CHANGED,

Index: MethodSetCheck.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/checks/MethodSetCheck.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MethodSetCheck.java	16 Mar 2006 22:30:19 -0000	1.11
+++ MethodSetCheck.java	29 Mar 2006 12:21:41 -0000	1.12
@@ -302,7 +302,7 @@
         int retVal = 0;
         for (int i = 0; i < m1Args.length; i++)
         {
-            if (!m1Args[i].toString().equals(m2Args[i].toString()))
+            if (!m1Args[i].getName().equals(m2Args[i].getName()))
             {
                 retVal += 1;
             }
@@ -589,7 +589,7 @@
             String[] args =
             {
                 "" + (i + 1),
-                cArg.toString()
+                cArg.getName()
             };
             fireDiff(MSG_METHOD_PARAMTYPE_CHANGED,
                     getSeverity(compatBaseline, baselineMethod, Severity.ERROR),
@@ -719,7 +719,8 @@
         }
         else
         {
-            buf.append(method.getReturnType());
+            final JavaType returnType = method.getReturnType();
+            buf.append(returnType == null ? "void" : returnType.getName());
             buf.append(' ');
         }
         buf.append(name);