From d9d83cf753774ae3672c59b7504e23c100d95081 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 1 Mar 2012 17:22:13 +0400 Subject: [PATCH] rename annotation ResourceType to AndroidResourceType --- .../dom/{ResourceType.java => AndroidResourceType.java} | 2 +- .../jetbrains/android/dom/color/ColorStateListItem.java | 4 ++-- .../android/dom/converters/ResourceReferenceConverter.java | 4 ++-- .../android/dom/drawable/BitmapOrNinePatchElement.java | 4 ++-- .../jetbrains/android/dom/drawable/InsetOrClipOrScale.java | 4 ++-- .../org/jetbrains/android/dom/drawable/ListItemBase.java | 4 ++-- .../src/org/jetbrains/android/dom/layout/Include.java | 7 +++---- .../jetbrains/android/dom/layout/LayoutViewElement.java | 4 ++-- .../org/jetbrains/android/dom/manifest/Application.java | 4 ++-- .../android/dom/manifest/ApplicationComponent.java | 4 ++-- 10 files changed, 20 insertions(+), 21 deletions(-) rename plugins/android/src/org/jetbrains/android/dom/{ResourceType.java => AndroidResourceType.java} (95%) diff --git a/plugins/android/src/org/jetbrains/android/dom/ResourceType.java b/plugins/android/src/org/jetbrains/android/dom/AndroidResourceType.java similarity index 95% rename from plugins/android/src/org/jetbrains/android/dom/ResourceType.java rename to plugins/android/src/org/jetbrains/android/dom/AndroidResourceType.java index 14e397a64bb4..d5c44b7b372f 100644 --- a/plugins/android/src/org/jetbrains/android/dom/ResourceType.java +++ b/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(); } diff --git a/plugins/android/src/org/jetbrains/android/dom/color/ColorStateListItem.java b/plugins/android/src/org/jetbrains/android/dom/color/ColorStateListItem.java index 2b42fbdc2d9c..51976435c4b6 100644 --- a/plugins/android/src/org/jetbrains/android/dom/color/ColorStateListItem.java +++ b/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 getColor(); } diff --git a/plugins/android/src/org/jetbrains/android/dom/converters/ResourceReferenceConverter.java b/plugins/android/src/org/jetbrains/android/dom/converters/ResourceReferenceConverter.java index 894130354557..6d8b4bdfd934 100644 --- a/plugins/android/src/org/jetbrains/android/dom/converters/ResourceReferenceConverter.java +++ b/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 getResourceTypes(@NotNull DomElement element) { - ResourceType resourceType = element.getAnnotation(ResourceType.class); + AndroidResourceType resourceType = element.getAnnotation(AndroidResourceType.class); Set types = new HashSet(myResourceTypes); if (resourceType != null) { String s = resourceType.value(); diff --git a/plugins/android/src/org/jetbrains/android/dom/drawable/BitmapOrNinePatchElement.java b/plugins/android/src/org/jetbrains/android/dom/drawable/BitmapOrNinePatchElement.java index b930e8a19aa8..99dfe18df67b 100644 --- a/plugins/android/src/org/jetbrains/android/dom/drawable/BitmapOrNinePatchElement.java +++ b/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 getSrc(); } diff --git a/plugins/android/src/org/jetbrains/android/dom/drawable/InsetOrClipOrScale.java b/plugins/android/src/org/jetbrains/android/dom/drawable/InsetOrClipOrScale.java index a56446344ae4..163b3004664b 100644 --- a/plugins/android/src/org/jetbrains/android/dom/drawable/InsetOrClipOrScale.java +++ b/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 getDrawable(); } diff --git a/plugins/android/src/org/jetbrains/android/dom/drawable/ListItemBase.java b/plugins/android/src/org/jetbrains/android/dom/drawable/ListItemBase.java index 11ce3569f574..9fdfd1fa5880 100644 --- a/plugins/android/src/org/jetbrains/android/dom/drawable/ListItemBase.java +++ b/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 getDrawable(); List getBitmaps(); diff --git a/plugins/android/src/org/jetbrains/android/dom/layout/Include.java b/plugins/android/src/org/jetbrains/android/dom/layout/Include.java index 8b778b073692..fec96eaadcbd 100644 --- a/plugins/android/src/org/jetbrains/android/dom/layout/Include.java +++ b/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 getId(); - @ResourceType("layout") + @AndroidResourceType("layout") @Convert(ResourceReferenceConverter.class) GenericAttributeValue getLayout(); } diff --git a/plugins/android/src/org/jetbrains/android/dom/layout/LayoutViewElement.java b/plugins/android/src/org/jetbrains/android/dom/layout/LayoutViewElement.java index ac810990b7c1..ee19e3c62a4d 100644 --- a/plugins/android/src/org/jetbrains/android/dom/layout/LayoutViewElement.java +++ b/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 getStyle(); @Attribute("class") diff --git a/plugins/android/src/org/jetbrains/android/dom/manifest/Application.java b/plugins/android/src/org/jetbrains/android/dom/manifest/Application.java index 299637052793..f28a705e5161 100644 --- a/plugins/android/src/org/jetbrains/android/dom/manifest/Application.java +++ b/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 getName(); @Convert(ResourceReferenceConverter.class) - @ResourceType("string") + @AndroidResourceType("string") AndroidAttributeValue getLabel(); List getUsesLibrarys(); diff --git a/plugins/android/src/org/jetbrains/android/dom/manifest/ApplicationComponent.java b/plugins/android/src/org/jetbrains/android/dom/manifest/ApplicationComponent.java index 41950e21cdfb..6df69c664289 100644 --- a/plugins/android/src/org/jetbrains/android/dom/manifest/ApplicationComponent.java +++ b/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 getLabel(); }