Use the new ResourceUrl API in sdk-common

Change-Id: I50154323e4db659d0d29753076bae805c7fc6c7d

1 files changed, 7 insertions, 6 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);