From 956b0e3f177b2fac4737d985ff881705ea458a46 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Sun, 2 Mar 2014 17:06:13 +0400
Subject: [PATCH] Exclude ui-designer-core from plugins

---
 build/scripts/layouts.gant                     | 18 ++++++++++++++----
 .../{plugin.xml => DesignerCorePlugin.xml}     | 12 +-----------
 .../com/intellij/designer/DesignerEditor.java  |  6 ++++++
 3 files changed, 21 insertions(+), 15 deletions(-)
 rename plugins/ui-designer-core/src/META-INF/{plugin.xml => DesignerCorePlugin.xml} (58%)

diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index ef49e7357182..c36ccf8a38d4 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -250,7 +250,7 @@ public def layoutCommunityPlugins(String home) {
   }
 
   dir("plugins") {
-    def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github", "ui-designer-core"] //, "tasks-time-tracking"]
+    def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github"] //, "tasks-time-tracking"]
 
     simplePlugins.each {
       layoutPlugin it
@@ -678,9 +678,19 @@ def layoutAndroid(String androidHome) {
       }
     }
 
-    layoutPlugin("android-designer") {
-      jar("android-designer.jar") {
-        module("android-designer")
+    dir("android-designer") {
+      dir("lib") {
+        jar("resources_en.jar") {
+          module("ui-designer-core") {
+            patternset(refid: "resources.included")
+          }
+        }
+        jar("android-designer.jar") {
+          module("ui-designer-core") {
+            patternset(refid: "resources.excluded")
+          }
+          module("android-designer")
+        }
       }
     }
   }
diff --git a/plugins/ui-designer-core/src/META-INF/plugin.xml b/plugins/ui-designer-core/src/META-INF/DesignerCorePlugin.xml
similarity index 58%
rename from plugins/ui-designer-core/src/META-INF/plugin.xml
rename to plugins/ui-designer-core/src/META-INF/DesignerCorePlugin.xml
index 18d7453c0226..ede0d2b92f01 100644
--- a/plugins/ui-designer-core/src/META-INF/plugin.xml
+++ b/plugins/ui-designer-core/src/META-INF/DesignerCorePlugin.xml
@@ -1,12 +1,6 @@
 <idea-plugin version="2">
-  <name>UI Designer (Core)</name>
-  <id>com.intellij.ui-designer-new</id>
-  <description>
-    Provides shared functionality for visual editing plugins.
-  </description>
-  <vendor>JetBrains</vendor>
 
-  <resource-bundle>messages.DesignerBundle</resource-bundle>
+  <module value="com.intellij.ui-designer-new"/>
 
   <depends>com.intellij.modules.lang</depends>
 
@@ -19,10 +13,6 @@
     </component>
   </project-components>
 
-  <extensions defaultExtensionNs="com.intellij">
-     <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
-  </extensions>
-
   <extensionPoints>
     <extensionPoint qualifiedName="Designer.customizations" interface="com.intellij.designer.DesignerCustomizations"/>
   </extensionPoints>
diff --git a/plugins/ui-designer-core/src/com/intellij/designer/DesignerEditor.java b/plugins/ui-designer-core/src/com/intellij/designer/DesignerEditor.java
index 7f29d4e3d865..4aee4999f707 100644
--- a/plugins/ui-designer-core/src/com/intellij/designer/DesignerEditor.java
+++ b/plugins/ui-designer-core/src/com/intellij/designer/DesignerEditor.java
@@ -73,6 +73,12 @@ public abstract class DesignerEditor extends UserDataHolderBase implements FileE
     return myDesignerPanel.getPreferredFocusedComponent();
   }
 
+  @NotNull
+  @Override
+  public String getName() {
+    return "Design";
+  }
+
   @Override
   public void dispose() {
     myDesignerPanel.dispose();