Structure refactoring

build/scripts/layouts.gant

@@ -207,7 +207,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
 
 public def layoutCommunityPlugins(String home) {
   dir("plugins") {
-    def simplePlugins = ["commander", "copyright", "properties", "javaFX", "java-i18n", "hg4idea", "github", "ui-designer-new", "tasks-time-tracking"]
+    def simplePlugins = ["commander", "copyright", "properties", "javaFX", "java-i18n", "hg4idea", "github", "ui-designer-core", "tasks-time-tracking"]
 
     simplePlugins.each {
       layoutPlugin it

plugins/swing-designer/src/META-INF/plugin.xml

@@ -1,9 +0,0 @@
-<idea-plugin version="2">
-  <name>Swing Designer</name>
-  <id>com.intellij.swing-designer</id>
-  <vendor>JetBrains</vendor>
-  <resource-bundle>messages.SwingDesignerBundle</resource-bundle>
-  <depends>com.intellij.java-i18n</depends>
-  <depends>com.intellij.properties</depends>
-  <depends>com.intellij.ui-designer-new</depends>
-</idea-plugin>

plugins/swing-designer/swing-designer.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="java-i18n" />
-    <orderEntry type="module" module-name="properties" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="compiler-openapi" />
-    <orderEntry type="module" module-name="execution-impl" />
-    <orderEntry type="module" module-name="execution-openapi" />
-    <orderEntry type="module" module-name="compiler-impl" />
-    <orderEntry type="module" module-name="icons" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="spellchecker" />
-    <orderEntry type="module" module-name="ui-designer-new" />
-  </component>
-  <component name="copyright">
-    <Base>
-      <setting name="state" value="1" />
-    </Base>
-  </component>
-</module>
-

plugins/ui-designer-core/src/com/intellij/designer/designSurface/FeedbackTreeLayer.java

@@ -16,7 +16,6 @@
 package com.intellij.designer.designSurface;
 
 import com.intellij.designer.model.RadComponent;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Alexander Lobas