rename annotation ResourceType to AndroidResourceType

plugins/android/src/org/jetbrains/android/dom/AndroidResourceType.java

@@ -25,6 +25,6 @@ import java.lang.annotation.ElementType;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.TYPE})
-public @interface ResourceType {
+public @interface AndroidResourceType {
     String value();
 }

plugins/android/src/org/jetbrains/android/dom/color/ColorStateListItem.java

@@ -18,7 +18,7 @@ package org.jetbrains.android.dom.color;
 import com.intellij.util.xml.Convert;
 import com.intellij.util.xml.Required;
 import org.jetbrains.android.dom.AndroidAttributeValue;
-import org.jetbrains.android.dom.ResourceType;
+import org.jetbrains.android.dom.AndroidResourceType;
 import org.jetbrains.android.dom.converters.ResourceReferenceConverter;
 import org.jetbrains.android.dom.resources.ResourceValue;
 
@@ -27,7 +27,7 @@ import org.jetbrains.android.dom.resources.ResourceValue;
  */
 public interface ColorStateListItem extends ColorDomElement {
   @Convert(ResourceReferenceConverter.class)
-  @ResourceType("color")
+  @AndroidResourceType("color")
   @Required
   AndroidAttributeValue<ResourceValue> getColor();
 }

plugins/android/src/org/jetbrains/android/dom/converters/ResourceReferenceConverter.java

@@ -33,7 +33,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.PsiNavigateUtil;
 import com.intellij.util.xml.*;
 import org.jetbrains.android.dom.AdditionalConverter;
-import org.jetbrains.android.dom.ResourceType;
+import org.jetbrains.android.dom.AndroidResourceType;
 import org.jetbrains.android.dom.resources.Item;
 import org.jetbrains.android.dom.resources.ResourceElement;
 import org.jetbrains.android.dom.resources.ResourceValue;
@@ -196,7 +196,7 @@ public class ResourceReferenceConverter extends ResolvingConverter<ResourceValue
 
   @NotNull
   public Set<String> getResourceTypes(@NotNull DomElement element) {
-    ResourceType resourceType = element.getAnnotation(ResourceType.class);
+    AndroidResourceType resourceType = element.getAnnotation(AndroidResourceType.class);
     Set<String> types = new HashSet<String>(myResourceTypes);
     if (resourceType != null) {
       String s = resourceType.value();

plugins/android/src/org/jetbrains/android/dom/drawable/BitmapOrNinePatchElement.java

@@ -19,7 +19,7 @@ import com.intellij.util.xml.Convert;
 import com.intellij.util.xml.DefinesXml;
 import com.intellij.util.xml.Required;
 import org.jetbrains.android.dom.AndroidAttributeValue;
-import org.jetbrains.android.dom.ResourceType;
+import org.jetbrains.android.dom.AndroidResourceType;
 import org.jetbrains.android.dom.converters.ResourceReferenceConverter;
 
 /**
@@ -29,6 +29,6 @@ import org.jetbrains.android.dom.converters.ResourceReferenceConverter;
 public interface BitmapOrNinePatchElement extends DrawableDomElement {
   @Required
   @Convert(ResourceReferenceConverter.class)
-  @ResourceType("drawable")
+  @AndroidResourceType("drawable")
   AndroidAttributeValue<String> getSrc();
 }

plugins/android/src/org/jetbrains/android/dom/drawable/InsetOrClipOrScale.java

@@ -19,7 +19,7 @@ import com.intellij.util.xml.Convert;
 import com.intellij.util.xml.DefinesXml;
 import com.intellij.util.xml.Required;
 import org.jetbrains.android.dom.AndroidAttributeValue;
-import org.jetbrains.android.dom.ResourceType;
+import org.jetbrains.android.dom.AndroidResourceType;
 import org.jetbrains.android.dom.converters.ResourceReferenceConverter;
 import org.jetbrains.android.dom.resources.ResourceValue;
 
@@ -30,6 +30,6 @@ import org.jetbrains.android.dom.resources.ResourceValue;
 public interface InsetOrClipOrScale extends DrawableDomElement {
   @Convert(ResourceReferenceConverter.class)
   @Required
-  @ResourceType("drawable")
+  @AndroidResourceType("drawable")
   AndroidAttributeValue<ResourceValue> getDrawable();
 }

plugins/android/src/org/jetbrains/android/dom/drawable/ListItemBase.java

@@ -2,7 +2,7 @@ package org.jetbrains.android.dom.drawable;
 
 import com.intellij.util.xml.Convert;
 import org.jetbrains.android.dom.AndroidAttributeValue;
-import org.jetbrains.android.dom.ResourceType;
+import org.jetbrains.android.dom.AndroidResourceType;
 import org.jetbrains.android.dom.converters.ResourceReferenceConverter;
 import org.jetbrains.android.dom.resources.ResourceValue;
 
@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface ListItemBase extends DrawableDomElement {
   @Convert(ResourceReferenceConverter.class)
-    @ResourceType("drawable")
+    @AndroidResourceType("drawable")
     AndroidAttributeValue<ResourceValue> getDrawable();
 
     List<BitmapOrNinePatchElement> getBitmaps();

plugins/android/src/org/jetbrains/android/dom/layout/Include.java

@@ -17,10 +17,9 @@
 package org.jetbrains.android.dom.layout;
 
 import com.intellij.util.xml.GenericAttributeValue;
-import com.intellij.util.xml.Required;
 import com.intellij.util.xml.Convert;
 import org.jetbrains.android.dom.AndroidAttributeValue;
-import org.jetbrains.android.dom.ResourceType;
+import org.jetbrains.android.dom.AndroidResourceType;
 import org.jetbrains.android.dom.converters.ResourceReferenceConverter;
 import org.jetbrains.android.dom.resources.ResourceValue;
 
@@ -33,11 +32,11 @@ import org.jetbrains.android.dom.resources.ResourceValue;
  */
 public interface Include extends LayoutElement {
   /*@Required*/
-  @ResourceType("id")
+  @AndroidResourceType("id")
   @Convert(ResourceReferenceConverter.class)
   AndroidAttributeValue<ResourceValue> getId();
 
-  @ResourceType("layout")
+  @AndroidResourceType("layout")
   @Convert(ResourceReferenceConverter.class)
   GenericAttributeValue<ResourceValue> getLayout();
 }

plugins/android/src/org/jetbrains/android/dom/layout/LayoutViewElement.java

@@ -21,7 +21,7 @@ import com.intellij.util.xml.Attribute;
 import com.intellij.util.xml.Convert;
 import com.intellij.util.xml.GenericAttributeValue;
 import com.intellij.util.xml.DefinesXml;
-import org.jetbrains.android.dom.ResourceType;
+import org.jetbrains.android.dom.AndroidResourceType;
 import org.jetbrains.android.dom.converters.ResourceReferenceConverter;
 import org.jetbrains.android.dom.converters.ViewClassConverter;
 import org.jetbrains.android.dom.resources.ResourceValue;
@@ -38,7 +38,7 @@ import java.util.List;
 @DefinesXml
 public interface LayoutViewElement extends LayoutElement {
   @Convert(ResourceReferenceConverter.class)
-  @ResourceType("style")
+  @AndroidResourceType("style")
   GenericAttributeValue<ResourceValue> getStyle();
 
   @Attribute("class")

plugins/android/src/org/jetbrains/android/dom/manifest/Application.java

@@ -20,7 +20,7 @@ import com.intellij.util.xml.Attribute;
 import com.intellij.util.xml.Convert;
 import com.intellij.util.xml.ExtendClass;
 import org.jetbrains.android.dom.AndroidAttributeValue;
-import org.jetbrains.android.dom.ResourceType;
+import org.jetbrains.android.dom.AndroidResourceType;
 import org.jetbrains.android.dom.converters.AndroidBooleanValueConverter;
 import org.jetbrains.android.dom.converters.PackageClassConverter;
 import org.jetbrains.android.dom.converters.ResourceReferenceConverter;
@@ -62,7 +62,7 @@ public interface Application extends ManifestElement {
   AndroidAttributeValue<PsiClass> getName();
 
   @Convert(ResourceReferenceConverter.class)
-  @ResourceType("string")
+  @AndroidResourceType("string")
   AndroidAttributeValue<ResourceValue> getLabel();
 
   List<UsesLibrary> getUsesLibrarys();

plugins/android/src/org/jetbrains/android/dom/manifest/ApplicationComponent.java

@@ -17,8 +17,8 @@
 package org.jetbrains.android.dom.manifest;
 
 import com.intellij.util.xml.Convert;
+import org.jetbrains.android.dom.AndroidResourceType;
 import org.jetbrains.android.dom.converters.ResourceReferenceConverter;
-import org.jetbrains.android.dom.ResourceType;
 import org.jetbrains.android.dom.AndroidAttributeValue;
 import org.jetbrains.android.dom.resources.ResourceValue;
 
@@ -27,6 +27,6 @@ import org.jetbrains.android.dom.resources.ResourceValue;
  */
 public interface ApplicationComponent extends ManifestElementWithName {
   @Convert(ResourceReferenceConverter.class)
-  @ResourceType("string")
+  @AndroidResourceType("string")
   AndroidAttributeValue<ResourceValue> getLabel();
 }