Constants refactoring.

This changeset moves most constants into the SdkConstants
class, and gets rid of AndroidConstants and LintConstants.
It also migrates all non-ADT specific constants from
AdtConstants into SdkConstants. It furthermore moves various
other constants (such as those in XmlUtils and ValuesDescriptors)
into the constants class. It also fixes the modifier order
to be the canonical modifier order (JLS 8.x).

Finally, it removes redundancy and combines various constant
aliases such that we don't have both NAME_ATTR and ATTR_NAME
pointing to "name", etc.

Change-Id: Ifd1755016f62ce2dd80e5c76130d6de4b0e32161

1 files changed, 1 insertions, 2 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringInputPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringInputPage.java
index d3304a442..5ac5f5c4e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringInputPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringInputPage.java
@@ -17,7 +17,6 @@
 package com.android.ide.eclipse.adt.internal.refactorings.extractstring;
 
 
-import com.android.AndroidConstants;
 import com.android.SdkConstants;
 import com.android.ide.common.resources.configuration.FolderConfiguration;
 import com.android.ide.eclipse.adt.AdtConstants;
@@ -582,7 +581,7 @@ class ExtractStringInputPage extends UserInputWizardPage {
                     wsFolderPath = wsFolderPath.substring(0, pos);
                 }
 
-                String[] folderSegments = wsFolderPath.split(AndroidConstants.RES_QUALIFIER_SEP);
+                String[] folderSegments = wsFolderPath.split(SdkConstants.RES_QUALIFIER_SEP);
 
                 if (folderSegments.length > 0) {
                     String folderName = folderSegments[0];