diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
index 56ed9ea2ec1c..4e683afabd22 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
@@ -17,6 +17,7 @@ package com.intellij.android.designer.model;
 
 import com.android.ide.common.rendering.api.ViewInfo;
 import com.android.sdklib.SdkConstants;
+import com.intellij.designer.model.EmptyXmlTag;
 import com.intellij.designer.model.MetaModel;
 import com.intellij.designer.model.RadComponent;
 import com.intellij.designer.model.RadVisualComponent;
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/EmptyXmlTag.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/EmptyXmlTag.java
similarity index 64%
rename from plugins/android-designer/src/com/intellij/android/designer/model/EmptyXmlTag.java
rename to plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/EmptyXmlTag.java
index 90d20039f195..cd80c37d366b 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/EmptyXmlTag.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/EmptyXmlTag.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.android.designer.model;
+package com.intellij.designer.model;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
@@ -49,65 +49,65 @@ public class EmptyXmlTag implements XmlTag {
   @NotNull
   @Override
   public String getName() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @NotNull
   @Override
   public String getNamespace() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @NotNull
   @Override
   public String getLocalName() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public XmlElementDescriptor getDescriptor() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @NotNull
   @Override
   public XmlAttribute[] getAttributes() {
-    return new XmlAttribute[0];  // TODO: Auto-generated method stub
+    return new XmlAttribute[0];
   }
 
   @Override
   public XmlAttribute getAttribute(@NonNls String name, @NonNls String namespace) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public XmlAttribute getAttribute(@NonNls String qname) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public String getAttributeValue(@NonNls String name, @NonNls String namespace) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public String getAttributeValue(@NonNls String qname) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public XmlAttribute setAttribute(@NonNls String name, @NonNls String namespace, @NonNls String value) throws IncorrectOperationException {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public XmlAttribute setAttribute(@NonNls String qname, @NonNls String value) throws IncorrectOperationException {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
@@ -115,335 +115,335 @@ public class EmptyXmlTag implements XmlTag {
                                @NonNls String namespace,
                                @Nullable @NonNls String bodyText,
                                boolean enforceNamespacesDeep) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public XmlTag addSubTag(XmlTag subTag, boolean first) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @NotNull
   @Override
   public XmlTag[] getSubTags() {
-    return new XmlTag[0];  // TODO: Auto-generated method stub
+    return new XmlTag[0];
   }
 
   @NotNull
   @Override
   public XmlTag[] findSubTags(@NonNls String qname) {
-    return new XmlTag[0];  // TODO: Auto-generated method stub
+    return new XmlTag[0];
   }
 
   @NotNull
   @Override
   public XmlTag[] findSubTags(@NonNls String localName, @NonNls String namespace) {
-    return new XmlTag[0];  // TODO: Auto-generated method stub
+    return new XmlTag[0];
   }
 
   @Override
   public XmlTag findFirstSubTag(@NonNls String qname) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @NotNull
   @Override
   public String getNamespacePrefix() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @NotNull
   @Override
   public String getNamespaceByPrefix(@NonNls String prefix) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public String getPrefixByNamespace(@NonNls String namespace) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public String[] knownNamespaces() {
-    return new String[0];  // TODO: Auto-generated method stub
+    return new String[0];
   }
 
   @Override
   public boolean hasNamespaceDeclarations() {
-    return false;  // TODO: Auto-generated method stub
+    return false;
   }
 
   @NotNull
   @Override
   public Map<String, String> getLocalNamespaceDeclarations() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @NotNull
   @Override
   public XmlTagValue getValue() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public XmlNSDescriptor getNSDescriptor(@NonNls String namespace, boolean strict) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public boolean isEmpty() {
-    return false;  // TODO: Auto-generated method stub
+    return false;
   }
 
   @Override
   public void collapseIfEmpty() {
-    // TODO: Auto-generated method stub
+
   }
 
   @Override
   public String getSubTagText(@NonNls String qname) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public XmlTag getParentTag() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public XmlTagChild getNextSiblingInTag() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public XmlTagChild getPrevSiblingInTag() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public boolean processElements(PsiElementProcessor processor, PsiElement place) {
-    return false;  // TODO: Auto-generated method stub
+    return false;
   }
 
   @NotNull
   @Override
   public Project getProject() throws PsiInvalidElementAccessException {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @NotNull
   @Override
   public Language getLanguage() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiManager getManager() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @NotNull
   @Override
   public PsiElement[] getChildren() {
-    return new PsiElement[0];  // TODO: Auto-generated method stub
+    return new PsiElement[0];
   }
 
   @Override
   public PsiElement getParent() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiElement getFirstChild() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiElement getLastChild() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiElement getNextSibling() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiElement getPrevSibling() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiFile getContainingFile() throws PsiInvalidElementAccessException {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public TextRange getTextRange() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public int getStartOffsetInParent() {
-    return 0;  // TODO: Auto-generated method stub
+    return 0;
   }
 
   @Override
   public int getTextLength() {
-    return 0;  // TODO: Auto-generated method stub
+    return 0;
   }
 
   @Override
   public PsiElement findElementAt(int offset) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiReference findReferenceAt(int offset) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public int getTextOffset() {
-    return 0;  // TODO: Auto-generated method stub
+    return 0;
   }
 
   @Override
   public String getText() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @NotNull
   @Override
   public char[] textToCharArray() {
-    return new char[0];  // TODO: Auto-generated method stub
+    return new char[0];
   }
 
   @Override
   public PsiElement getNavigationElement() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiElement getOriginalElement() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public boolean textMatches(@NotNull @NonNls CharSequence text) {
-    return false;  // TODO: Auto-generated method stub
+    return false;
   }
 
   @Override
   public boolean textMatches(@NotNull PsiElement element) {
-    return false;  // TODO: Auto-generated method stub
+    return false;
   }
 
   @Override
   public boolean textContains(char c) {
-    return false;  // TODO: Auto-generated method stub
+    return false;
   }
 
   @Override
   public void accept(@NotNull PsiElementVisitor visitor) {
-    // TODO: Auto-generated method stub
+
   }
 
   @Override
   public void acceptChildren(@NotNull PsiElementVisitor visitor) {
-    // TODO: Auto-generated method stub
+
   }
 
   @Override
   public PsiElement copy() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiElement add(@NotNull PsiElement element) throws IncorrectOperationException {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiElement addBefore(@NotNull PsiElement element, @Nullable PsiElement anchor) throws IncorrectOperationException {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiElement addAfter(@NotNull PsiElement element, @Nullable PsiElement anchor) throws IncorrectOperationException {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public void checkAdd(@NotNull PsiElement element) throws IncorrectOperationException {
-    // TODO: Auto-generated method stub
+
   }
 
   @Override
   public PsiElement addRange(PsiElement first, PsiElement last) throws IncorrectOperationException {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiElement addRangeBefore(@NotNull PsiElement first, @NotNull PsiElement last, PsiElement anchor)
     throws IncorrectOperationException {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiElement addRangeAfter(PsiElement first, PsiElement last, PsiElement anchor) throws IncorrectOperationException {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public void delete() throws IncorrectOperationException {
-    // TODO: Auto-generated method stub
+
   }
 
   @Override
   public void checkDelete() throws IncorrectOperationException {
-    // TODO: Auto-generated method stub
+
   }
 
   @Override
   public void deleteChildRange(PsiElement first, PsiElement last) throws IncorrectOperationException {
-    // TODO: Auto-generated method stub
+
   }
 
   @Override
   public PsiElement replace(@NotNull PsiElement newElement) throws IncorrectOperationException {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public boolean isValid() {
-    return false;  // TODO: Auto-generated method stub
+    return false;
   }
 
   @Override
   public boolean isWritable() {
-    return false;  // TODO: Auto-generated method stub
+    return false;
   }
 
   @Override
   public PsiReference getReference() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @NotNull
   @Override
   public PsiReference[] getReferences() {
-    return new PsiReference[0];  // TODO: Auto-generated method stub
+    return new PsiReference[0];
   }
 
   @Override
   public <T> T getCopyableUserData(Key<T> key) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public <T> void putCopyableUserData(Key<T> key, @Nullable T value) {
-    // TODO: Auto-generated method stub
+
   }
 
   @Override
@@ -451,58 +451,57 @@ public class EmptyXmlTag implements XmlTag {
                                      @NotNull ResolveState state,
                                      @Nullable PsiElement lastParent,
                                      @NotNull PsiElement place) {
-    return false;  // TODO: Auto-generated method stub
+    return false;
   }
 
   @Override
   public PsiElement getContext() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public boolean isPhysical() {
-    return false;  // TODO: Auto-generated method stub
+    return false;
   }
 
   @NotNull
   @Override
   public GlobalSearchScope getResolveScope() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @NotNull
   @Override
   public SearchScope getUseScope() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public ASTNode getNode() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public boolean isEquivalentTo(PsiElement another) {
-    return false;  // TODO: Auto-generated method stub
+    return false;
   }
 
   @Override
   public Icon getIcon(@IconFlags int flags) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public PsiMetaData getMetaData() {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public <T> T getUserData(@NotNull Key<T> key) {
-    return null;  // TODO: Auto-generated method stub
+    return null;
   }
 
   @Override
   public <T> void putUserData(@NotNull Key<T> key, @Nullable T value) {
-    // TODO: Auto-generated method stub
   }
 }
\ No newline at end of file