Use the new ResourceUrl API in sdk-common

Change-Id: I50154323e4db659d0d29753076bae805c7fc6c7d

2 files changed, 31 insertions, 27 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/RenameResourceParticipantTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/RenameResourceParticipantTest.java
index ccf6e4f..3f029b9 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/RenameResourceParticipantTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/refactorings/core/RenameResourceParticipantTest.java
@@ -16,10 +16,9 @@
 package com.android.ide.eclipse.adt.internal.refactorings.core;
 
 import com.android.annotations.NonNull;
-import com.android.ide.common.resources.ResourceRepository;
+import com.android.ide.common.resources.ResourceUrl;
 import com.android.ide.eclipse.adt.internal.project.BaseProjectHelper;
 import com.android.resources.ResourceType;
-import com.android.utils.Pair;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -366,10 +365,12 @@ public class RenameResourceParticipantTest extends RefactoringTestBase {
         if (resource instanceof String) {
             String url = (String) resource;
             assert url.startsWith("@") : resource;
-            Pair<ResourceType, String> pair = ResourceRepository.parseResource(url);
-            assertNotNull(url, pair);
-            ResourceType type = pair.getFirst();
-            String currentName = pair.getSecond();
+
+            ResourceUrl parsedUrl = ResourceUrl.parse(url);
+            assertNotNull(url, parsedUrl);
+            assert parsedUrl != null; // null analysis doesn't recognize assertNotNull
+            ResourceType type = parsedUrl.type;
+            String currentName = parsedUrl.name;
             RenameResourceProcessor p;
             p = new RenameResourceProcessor(project, type, currentName, newName);
             p.setUpdateReferences(updateReferences);
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/refactorings/core/RenameResourceXmlTextActionTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/refactorings/core/RenameResourceXmlTextActionTest.java
index 11fc81a..e00a44b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/refactorings/core/RenameResourceXmlTextActionTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/refactorings/core/RenameResourceXmlTextActionTest.java
@@ -15,8 +15,8 @@
  */
 package com.android.ide.eclipse.adt.internal.refactorings.core;
 
+import com.android.ide.common.resources.ResourceUrl;
 import com.android.resources.ResourceType;
-import com.android.utils.Pair;
 
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
@@ -31,25 +31,29 @@ public class RenameResourceXmlTextActionTest extends TestCase {
         checkWord("^@bogus", null);
         checkWord("@bo^gus", null);
         checkWord("bogus@^", null);
-        checkWord("  @string/nam^e ", Pair.of(ResourceType.STRING, "name"));
-        checkWord("@string/nam^e ", Pair.of(ResourceType.STRING, "name"));
-        checkWord("\"^@string/name ", Pair.of(ResourceType.STRING, "name"));
-        checkWord("^@string/name ", Pair.of(ResourceType.STRING, "name"));
-        checkWord("\n^@string/name ", Pair.of(ResourceType.STRING, "name"));
-        checkWord("\n^@string/name(", Pair.of(ResourceType.STRING, "name"));
-        checkWord("\n^@string/name;", Pair.of(ResourceType.STRING, "name"));
-        checkWord("\n^@string/name5", Pair.of(ResourceType.STRING, "name5"));
-        checkWord("\n@string/name5^", Pair.of(ResourceType.STRING, "name5"));
-        checkWord("\n@string/name5^(", Pair.of(ResourceType.STRING, "name5"));
-        checkWord("\n@stri^ng/name5(", Pair.of(ResourceType.STRING, "name5"));
-        checkWord("\n@string^/name5(", Pair.of(ResourceType.STRING, "name5"));
-        checkWord("\n@string/^name5(", Pair.of(ResourceType.STRING, "name5"));
+        checkWord("  @string/nam^e ", getUrl(ResourceType.STRING, "name"));
+        checkWord("@string/nam^e ", getUrl(ResourceType.STRING, "name"));
+        checkWord("\"^@string/name ", getUrl(ResourceType.STRING, "name"));
+        checkWord("^@string/name ", getUrl(ResourceType.STRING, "name"));
+        checkWord("\n^@string/name ", getUrl(ResourceType.STRING, "name"));
+        checkWord("\n^@string/name(", getUrl(ResourceType.STRING, "name"));
+        checkWord("\n^@string/name;", getUrl(ResourceType.STRING, "name"));
+        checkWord("\n^@string/name5", getUrl(ResourceType.STRING, "name5"));
+        checkWord("\n@string/name5^", getUrl(ResourceType.STRING, "name5"));
+        checkWord("\n@string/name5^(", getUrl(ResourceType.STRING, "name5"));
+        checkWord("\n@stri^ng/name5(", getUrl(ResourceType.STRING, "name5"));
+        checkWord("\n@string^/name5(", getUrl(ResourceType.STRING, "name5"));
+        checkWord("\n@string/^name5(", getUrl(ResourceType.STRING, "name5"));
         checkWord("\n@string^name5(", null);
         checkWord("\n@strings^/name5(", null);
-        checkWord("\n@+id/^myid(", Pair.of(ResourceType.ID, "myid"));
-        checkWord("\n?a^ttr/foo\"", Pair.of(ResourceType.ATTR, "foo"));
-        checkWord("\n?f^oo\"", Pair.of(ResourceType.ATTR, "foo"));
-        checkWord("\n^?foo\"", Pair.of(ResourceType.ATTR, "foo"));
+        checkWord("\n@+id/^myid(", getUrl(ResourceType.ID, "myid"));
+        checkWord("\n?a^ttr/foo\"", getUrl(ResourceType.ATTR, "foo"));
+        checkWord("\n?f^oo\"", getUrl(ResourceType.ATTR, "foo"));
+        checkWord("\n^?foo\"", getUrl(ResourceType.ATTR, "foo"));
+    }
+
+    private static ResourceUrl getUrl(ResourceType type, String name) {
+        return ResourceUrl.create(type, name, false, false);
     }
 
     public void testClassNames() throws Exception {
@@ -89,7 +93,7 @@ public class RenameResourceXmlTextActionTest extends TestCase {
         assertEquals(expectedClassName, className);
     }
 
-    private void checkWord(String contents, Pair<ResourceType, String> expectedResource)
+    private void checkWord(String contents, ResourceUrl expectedResource)
             throws Exception {
         int cursor = contents.indexOf('^');
         assertTrue("Must set cursor position with ^ in " + contents, cursor != -1);
@@ -100,8 +104,7 @@ public class RenameResourceXmlTextActionTest extends TestCase {
 
         IDocument document = new Document();
         document.replace(0, 0, contents);
-        Pair<ResourceType, String> resource =
-                RenameResourceXmlTextAction.findResource(document, cursor);
+        ResourceUrl resource = RenameResourceXmlTextAction.findResource(document, cursor);
         assertEquals(expectedResource, resource);
     }
 }