SignatureUtils: fixing bug with normalization

diff --git a/software/no.uio.ifi.refaktor.examples/examples/src/div/Main.java b/software/no.uio.ifi.refaktor.examples/examples/src/div/Main.java
index 23f148d92f5838ee759365dcc966b9e351739486..28387e607ea35885175a6b9f343003a7b5aa066c 100644 (file)
--- a/software/no.uio.ifi.refaktor.examples/examples/src/div/Main.java
+++ b/software/no.uio.ifi.refaktor.examples/examples/src/div/Main.java
@@ -1,10 +1,13 @@
 package div;
 
-import java.util.List;
+import java.util.*;
 
 public class Main {
        private void method(String s) throws Exception {
        }
        public void generated_5008769909842074787(List<String> categories, List<String> selectedCategories) {
        }
+       public Map<String, String> generated_9203691974776793760(String dialog) {
+               return new HashMap<String,String>();
+       }
 }
\ No newline at end of file

diff --git a/software/no.uio.ifi.refaktor.tests/src/no/uio/ifi/refaktor/tests/FindMethodHandleTest.java b/software/no.uio.ifi.refaktor.tests/src/no/uio/ifi/refaktor/tests/FindMethodHandleTest.java
index 109bf694db9e0f501a06fc7301f801fc969a2d8b..bc6359d362a8022ce77e1d8435ab12e3433d19b7 100644 (file)
--- a/software/no.uio.ifi.refaktor.tests/src/no/uio/ifi/refaktor/tests/FindMethodHandleTest.java
+++ b/software/no.uio.ifi.refaktor.tests/src/no/uio/ifi/refaktor/tests/FindMethodHandleTest.java
@@ -38,7 +38,16 @@ public class FindMethodHandleTest {
                assertThat("Method exists", methodSimpleSignature.exists());
        }
        
-       
+       @Test
+       public void testFindMethod_bug_MultiSortMembersAction() throws Exception {
+               IMethod method = getTestDataMethod("generated_9203691974776793760", "QString;");
+               assertThat(method.exists());
+               
+               String simpleSignature = "public Map<String,String> generated_9203691974776793760(String dialog)";
+               IProject project = ExampleCodeManager.INSTANCE.getProject();
+               IMethod methodSimpleSignature = RefaktorHandleUtils.findMethodHandle(project, "div.Main", simpleSignature);
+               assertThat("Method exists", methodSimpleSignature.exists());
+       }
 
        private IMethod getTestDataMethod(String methodName, String... parameters) {
                return RefaktorHandleUtils.findMethodHandleChecked(ExampleCodeManager.INSTANCE.getProject(), "div", "Main", methodName, parameters);

diff --git a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/utils/SignatureUtils.java b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/utils/SignatureUtils.java
index 5011ed1a1717cb068bc5b688c2d2435532db7604..3f52d286740979059ee8e415159f59b07f6b20f1 100644 (file)
--- a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/utils/SignatureUtils.java
+++ b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/utils/SignatureUtils.java
@@ -23,7 +23,7 @@ public class SignatureUtils {
        }
        
        private static String normalizeSimpleSignature(String simpleSignature) {
-               return simpleSignature.replaceAll("\\s+", " ").replaceAll("\\s*\\(\\s*", "(").replaceAll("\\s+\\)", ")").replaceAll("\\s+,", ",");
+               return simpleSignature.replaceAll("\\s+", " ").replaceAll("\\s*\\(\\s*", "(").replaceAll("\\s+\\)", ")").replaceAll("\\s*,\\s*", ",");
        }
 
 }