From 458d67f7443baa64e47018cabc856554ba0dcd84 Mon Sep 17 00:00:00 2001 From: Alexander Lobas Date: Mon, 4 Feb 2013 13:18:00 +0400 Subject: [PATCH] Structure refactoring --- build/scripts/layouts.gant | 2 +- .../swing-designer/src/META-INF/plugin.xml | 9 ----- .../messages/SwingDesignerBundle.properties | 0 plugins/swing-designer/swing-designer.iml | 31 ------------------ .../src/META-INF/plugin.xml | 0 .../designer/AbstractToolWindowManager.java | 0 .../com/intellij/designer/DesignerBundle.java | 0 .../com/intellij/designer/DesignerEditor.java | 0 .../designer/DesignerEditorState.java | 0 .../designer/DesignerToolWindowManager.java | 0 .../com/intellij/designer/ModuleProvider.java | 0 .../actions/AbstractComboBoxAction.java | 0 .../actions/CommonEditActionsProvider.java | 0 .../designer/actions/DesignerActionPanel.java | 0 .../designer/actions/MorphingAction.java | 0 .../designer/actions/SelectAllAction.java | 0 .../designer/actions/StartInplaceEditing.java | 0 .../designer/actions/WrapInAction.java | 0 .../clipboard/SimpleTransferable.java | 0 .../componentTree/AttributeWrapper.java | 0 .../designer/componentTree/ComponentTree.java | 0 .../componentTree/ComponentTreeBuilder.java | 0 .../componentTree/ExpandStateHandler.java | 0 .../componentTree/QuickFixManager.java | 0 .../componentTree/TreeComponentDecorator.java | 0 .../componentTree/TreeContentProvider.java | 0 .../componentTree/TreeDropListener.java | 0 .../componentTree/TreeEditOperation.java | 0 .../componentTree/TreeEditableArea.java | 0 .../componentTree/TreeGlassLayer.java | 0 .../componentTree/TreeNodeDescriptor.java | 0 .../designer/componentTree/TreeTransfer.java | 0 .../designSurface/AbstractEditOperation.java | 0 .../designer/designSurface/CaptionPanel.java | 0 .../designSurface/ComponentDecorator.java | 0 .../designSurface/ComponentEditableArea.java | 0 .../ComponentSelectionListener.java | 0 .../designSurface/ComponentTargetFilter.java | 0 .../designSurface/DecorationLayer.java | 0 .../designSurface/DesignerEditorPanel.java | 0 .../designSurface/DropToOperation.java | 0 .../designer/designSurface/EditOperation.java | 0 .../designer/designSurface/EditableArea.java | 0 .../EmptyComponentDecorator.java | 0 .../ExternalPSIChangeListener.java | 0 .../designer/designSurface/FeedbackLayer.java | 0 .../designSurface/FeedbackTreeLayer.java | 1 - .../designSurface/FlowBaseOperation.java | 0 .../designer/designSurface/GlassLayer.java | 0 .../designer/designSurface/ICaption.java | 0 .../designSurface/ICaptionDecorator.java | 0 .../designSurface/ILayoutDecorator.java | 0 .../designSurface/InplaceEditingLayer.java | 0 .../designSurface/OperationContext.java | 0 .../designSurface/QuickFixManager.java | 0 .../designer/designSurface/RootView.java | 0 .../designSurface/StaticDecorator.java | 0 .../feedbacks/AlphaFeedback.java | 0 .../feedbacks/InsertFeedback.java | 0 .../designSurface/feedbacks/LineFeedback.java | 0 .../feedbacks/LineInsertFeedback.java | 0 .../feedbacks/LineMarginBorder.java | 0 .../feedbacks/RectangleFeedback.java | 0 .../feedbacks/RoundRectangleFeedback.java | 0 .../designSurface/feedbacks/TextFeedback.java | 0 .../selection/DirectionResizePoint.java | 0 .../designSurface/selection/EmptyPoint.java | 0 .../NonResizeSelectionDecorator.java | 0 .../designSurface/selection/ResizePoint.java | 0 .../selection/ResizeSelectionDecorator.java | 0 .../tools/AbstractCreationTool.java | 0 .../tools/ComponentCreationFactory.java | 0 .../tools/ComponentPasteFactory.java | 0 .../designSurface/tools/CreationTool.java | 0 .../designSurface/tools/DragTracker.java | 0 .../designSurface/tools/InputTool.java | 0 .../tools/MarqueeSelectionTracker.java | 0 .../designSurface/tools/MarqueeTracker.java | 0 .../designSurface/tools/PasteTool.java | 0 .../designSurface/tools/ResizeTracker.java | 0 .../designSurface/tools/SelectionTool.java | 0 .../designSurface/tools/SelectionTracker.java | 0 .../designSurface/tools/TargetingTool.java | 0 .../designSurface/tools/ToolProvider.java | 0 .../intellij/designer/icons/toolWindow.png | Bin .../inspection/AbstractQuickFixManager.java | 0 .../DesignerBackgroundEditorHighlighter.java | 0 .../inspection/DesignerHighlightingPass.java | 0 .../intellij/designer/model/EmptyXmlTag.java | 0 .../designer/model/FindComponentVisitor.java | 0 .../designer/model/IComponentDecorator.java | 0 .../designer/model/IGroupDeleteComponent.java | 0 .../intellij/designer/model/MetaManager.java | 0 .../intellij/designer/model/MetaModel.java | 0 .../intellij/designer/model/RadComponent.java | 0 .../designer/model/RadComponentVisitor.java | 0 .../intellij/designer/model/RadLayout.java | 0 .../designer/model/RadLayoutData.java | 0 .../designer/model/RadPropertyContext.java | 0 .../designer/model/RadVisualComponent.java | 0 .../designer/model/WrapInProvider.java | 0 .../designer/palette/DefaultPaletteItem.java | 0 .../designer/palette/PaletteContainer.java | 0 .../designer/palette/PaletteGroup.java | 0 .../palette/PaletteGroupComponent.java | 0 .../designer/palette/PaletteItem.java | 0 .../palette/PaletteItemsComponent.java | 0 .../designer/palette/PalettePanel.java | 0 .../palette/PaletteToolWindowManager.java | 0 .../propertyTable/IPropertyDecorator.java | 0 .../propertyTable/PropertyTablePanel.java | 0 .../propertyTable/QuickFixManager.java | 0 .../propertyTable/RadPropertyTable.java | 0 .../actions/IPropertyTableAction.java | 0 .../propertyTable/actions/RestoreDefault.java | 0 .../propertyTable/actions/ShowColumns.java | 0 .../propertyTable/actions/ShowExpert.java | 0 .../propertyTable/actions/ShowJavadoc.java | 0 .../editors/TextEditorWrapper.java | 0 .../renderers/AbstractResourceRenderer.java | 0 .../com/intellij/designer/utils/Cursors.java | 0 .../com/intellij/designer/utils/Position.java | 0 .../intellij/designer/utils/SizedIcon.java | 0 .../intellij/designer/utils/icon-robots.txt | 0 .../com/intellij/designer/utils/no-cursor.gif | Bin .../src/icons/UIDesignerNewIcons.java | 0 .../src/messages/DesignerBundle.properties | 0 .../ui-designer-core.iml} | 0 128 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 plugins/swing-designer/src/META-INF/plugin.xml delete mode 100644 plugins/swing-designer/src/messages/SwingDesignerBundle.properties delete mode 100644 plugins/swing-designer/swing-designer.iml rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/META-INF/plugin.xml (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/AbstractToolWindowManager.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/DesignerBundle.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/DesignerEditor.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/DesignerEditorState.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/DesignerToolWindowManager.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/ModuleProvider.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/actions/AbstractComboBoxAction.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/actions/CommonEditActionsProvider.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/actions/DesignerActionPanel.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/actions/MorphingAction.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/actions/SelectAllAction.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/actions/StartInplaceEditing.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/actions/WrapInAction.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/clipboard/SimpleTransferable.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/AttributeWrapper.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/ComponentTree.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/ExpandStateHandler.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/QuickFixManager.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/TreeComponentDecorator.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/TreeContentProvider.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/TreeDropListener.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/TreeEditOperation.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/TreeEditableArea.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/TreeGlassLayer.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/TreeNodeDescriptor.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/componentTree/TreeTransfer.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/AbstractEditOperation.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/CaptionPanel.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/ComponentDecorator.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/ComponentEditableArea.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/ComponentSelectionListener.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/ComponentTargetFilter.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/DecorationLayer.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/DesignerEditorPanel.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/DropToOperation.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/EditOperation.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/EditableArea.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/EmptyComponentDecorator.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/FeedbackLayer.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/FeedbackTreeLayer.java (96%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/FlowBaseOperation.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/GlassLayer.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/ICaption.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/ICaptionDecorator.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/ILayoutDecorator.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/InplaceEditingLayer.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/OperationContext.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/QuickFixManager.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/RootView.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/StaticDecorator.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/feedbacks/AlphaFeedback.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/feedbacks/InsertFeedback.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/feedbacks/LineFeedback.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/feedbacks/LineInsertFeedback.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/feedbacks/LineMarginBorder.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/feedbacks/RectangleFeedback.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/feedbacks/RoundRectangleFeedback.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/feedbacks/TextFeedback.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/selection/DirectionResizePoint.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/selection/EmptyPoint.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/selection/NonResizeSelectionDecorator.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/selection/ResizePoint.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/selection/ResizeSelectionDecorator.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/AbstractCreationTool.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/ComponentCreationFactory.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/ComponentPasteFactory.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/CreationTool.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/DragTracker.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/InputTool.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/MarqueeSelectionTracker.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/MarqueeTracker.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/PasteTool.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/ResizeTracker.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/SelectionTool.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/SelectionTracker.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/TargetingTool.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/designSurface/tools/ToolProvider.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/icons/toolWindow.png (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/inspection/AbstractQuickFixManager.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/inspection/DesignerBackgroundEditorHighlighter.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/inspection/DesignerHighlightingPass.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/EmptyXmlTag.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/FindComponentVisitor.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/IComponentDecorator.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/IGroupDeleteComponent.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/MetaManager.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/MetaModel.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/RadComponent.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/RadComponentVisitor.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/RadLayout.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/RadLayoutData.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/RadPropertyContext.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/RadVisualComponent.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/model/WrapInProvider.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/palette/DefaultPaletteItem.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/palette/PaletteContainer.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/palette/PaletteGroup.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/palette/PaletteGroupComponent.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/palette/PaletteItem.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/palette/PaletteItemsComponent.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/palette/PalettePanel.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/palette/PaletteToolWindowManager.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/propertyTable/IPropertyDecorator.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/propertyTable/PropertyTablePanel.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/propertyTable/QuickFixManager.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/propertyTable/RadPropertyTable.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/propertyTable/actions/IPropertyTableAction.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/propertyTable/actions/ShowColumns.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/propertyTable/actions/ShowExpert.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/propertyTable/editors/TextEditorWrapper.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/propertyTable/renderers/AbstractResourceRenderer.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/utils/Cursors.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/utils/Position.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/utils/SizedIcon.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/utils/icon-robots.txt (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/com/intellij/designer/utils/no-cursor.gif (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/icons/UIDesignerNewIcons.java (100%) rename plugins/{ui-designer/ui-designer-new => ui-designer-core}/src/messages/DesignerBundle.properties (100%) rename plugins/{ui-designer/ui-designer-new/ui-designer-new.iml => ui-designer-core/ui-designer-core.iml} (100%) diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 33cf1b14881b..f2eb5bad5fe0 100644 --- a/build/scripts/layouts.gant +++ b/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 diff --git a/plugins/swing-designer/src/META-INF/plugin.xml b/plugins/swing-designer/src/META-INF/plugin.xml deleted file mode 100644 index b949060d78d1..000000000000 --- a/plugins/swing-designer/src/META-INF/plugin.xml +++ /dev/null @@ -1,9 +0,0 @@ - - Swing Designer - com.intellij.swing-designer - JetBrains - messages.SwingDesignerBundle - com.intellij.java-i18n - com.intellij.properties - com.intellij.ui-designer-new - diff --git a/plugins/swing-designer/src/messages/SwingDesignerBundle.properties b/plugins/swing-designer/src/messages/SwingDesignerBundle.properties deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/plugins/swing-designer/swing-designer.iml b/plugins/swing-designer/swing-designer.iml deleted file mode 100644 index 8c4b67627078..000000000000 --- a/plugins/swing-designer/swing-designer.iml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/ui-designer/ui-designer-new/src/META-INF/plugin.xml b/plugins/ui-designer-core/src/META-INF/plugin.xml similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/META-INF/plugin.xml rename to plugins/ui-designer-core/src/META-INF/plugin.xml diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/AbstractToolWindowManager.java b/plugins/ui-designer-core/src/com/intellij/designer/AbstractToolWindowManager.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/AbstractToolWindowManager.java rename to plugins/ui-designer-core/src/com/intellij/designer/AbstractToolWindowManager.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerBundle.java b/plugins/ui-designer-core/src/com/intellij/designer/DesignerBundle.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerBundle.java rename to plugins/ui-designer-core/src/com/intellij/designer/DesignerBundle.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerEditor.java b/plugins/ui-designer-core/src/com/intellij/designer/DesignerEditor.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerEditor.java rename to plugins/ui-designer-core/src/com/intellij/designer/DesignerEditor.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerEditorState.java b/plugins/ui-designer-core/src/com/intellij/designer/DesignerEditorState.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerEditorState.java rename to plugins/ui-designer-core/src/com/intellij/designer/DesignerEditorState.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java b/plugins/ui-designer-core/src/com/intellij/designer/DesignerToolWindowManager.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java rename to plugins/ui-designer-core/src/com/intellij/designer/DesignerToolWindowManager.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/ModuleProvider.java b/plugins/ui-designer-core/src/com/intellij/designer/ModuleProvider.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/ModuleProvider.java rename to plugins/ui-designer-core/src/com/intellij/designer/ModuleProvider.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/AbstractComboBoxAction.java b/plugins/ui-designer-core/src/com/intellij/designer/actions/AbstractComboBoxAction.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/AbstractComboBoxAction.java rename to plugins/ui-designer-core/src/com/intellij/designer/actions/AbstractComboBoxAction.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/CommonEditActionsProvider.java b/plugins/ui-designer-core/src/com/intellij/designer/actions/CommonEditActionsProvider.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/CommonEditActionsProvider.java rename to plugins/ui-designer-core/src/com/intellij/designer/actions/CommonEditActionsProvider.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/DesignerActionPanel.java b/plugins/ui-designer-core/src/com/intellij/designer/actions/DesignerActionPanel.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/DesignerActionPanel.java rename to plugins/ui-designer-core/src/com/intellij/designer/actions/DesignerActionPanel.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/MorphingAction.java b/plugins/ui-designer-core/src/com/intellij/designer/actions/MorphingAction.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/MorphingAction.java rename to plugins/ui-designer-core/src/com/intellij/designer/actions/MorphingAction.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/SelectAllAction.java b/plugins/ui-designer-core/src/com/intellij/designer/actions/SelectAllAction.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/SelectAllAction.java rename to plugins/ui-designer-core/src/com/intellij/designer/actions/SelectAllAction.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/StartInplaceEditing.java b/plugins/ui-designer-core/src/com/intellij/designer/actions/StartInplaceEditing.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/StartInplaceEditing.java rename to plugins/ui-designer-core/src/com/intellij/designer/actions/StartInplaceEditing.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/WrapInAction.java b/plugins/ui-designer-core/src/com/intellij/designer/actions/WrapInAction.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/WrapInAction.java rename to plugins/ui-designer-core/src/com/intellij/designer/actions/WrapInAction.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/clipboard/SimpleTransferable.java b/plugins/ui-designer-core/src/com/intellij/designer/clipboard/SimpleTransferable.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/clipboard/SimpleTransferable.java rename to plugins/ui-designer-core/src/com/intellij/designer/clipboard/SimpleTransferable.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/AttributeWrapper.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/AttributeWrapper.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/AttributeWrapper.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/AttributeWrapper.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTree.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/ComponentTree.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTree.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/ComponentTree.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ExpandStateHandler.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/ExpandStateHandler.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ExpandStateHandler.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/ExpandStateHandler.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/QuickFixManager.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/QuickFixManager.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/QuickFixManager.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/QuickFixManager.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeComponentDecorator.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeComponentDecorator.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeComponentDecorator.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeComponentDecorator.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeContentProvider.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeContentProvider.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeContentProvider.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeContentProvider.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeDropListener.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeDropListener.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeDropListener.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeDropListener.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditOperation.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeEditOperation.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditOperation.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeEditOperation.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeEditableArea.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeEditableArea.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeGlassLayer.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeGlassLayer.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeGlassLayer.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeGlassLayer.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeNodeDescriptor.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeNodeDescriptor.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeNodeDescriptor.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeNodeDescriptor.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeTransfer.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeTransfer.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeTransfer.java rename to plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeTransfer.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/AbstractEditOperation.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/AbstractEditOperation.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/AbstractEditOperation.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/AbstractEditOperation.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/CaptionPanel.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/CaptionPanel.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/CaptionPanel.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/CaptionPanel.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentDecorator.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/ComponentDecorator.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentDecorator.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/ComponentDecorator.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentEditableArea.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/ComponentEditableArea.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentEditableArea.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/ComponentEditableArea.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentSelectionListener.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/ComponentSelectionListener.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentSelectionListener.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/ComponentSelectionListener.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentTargetFilter.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/ComponentTargetFilter.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentTargetFilter.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/ComponentTargetFilter.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DecorationLayer.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DecorationLayer.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DecorationLayer.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/DecorationLayer.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DropToOperation.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DropToOperation.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DropToOperation.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/DropToOperation.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/EditOperation.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/EditOperation.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/EditOperation.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/EditOperation.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/EditableArea.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/EditableArea.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/EditableArea.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/EditableArea.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/EmptyComponentDecorator.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/EmptyComponentDecorator.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/EmptyComponentDecorator.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/EmptyComponentDecorator.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/FeedbackLayer.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/FeedbackLayer.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/FeedbackLayer.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/FeedbackLayer.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/FeedbackTreeLayer.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/FeedbackTreeLayer.java similarity index 96% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/FeedbackTreeLayer.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/FeedbackTreeLayer.java index 14e63a55d890..ed7dc867b096 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/FeedbackTreeLayer.java +++ b/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 diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/FlowBaseOperation.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/FlowBaseOperation.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/FlowBaseOperation.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/FlowBaseOperation.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/GlassLayer.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/GlassLayer.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/GlassLayer.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/GlassLayer.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ICaption.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/ICaption.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ICaption.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/ICaption.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ICaptionDecorator.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/ICaptionDecorator.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ICaptionDecorator.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/ICaptionDecorator.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ILayoutDecorator.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/ILayoutDecorator.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ILayoutDecorator.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/ILayoutDecorator.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/InplaceEditingLayer.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/InplaceEditingLayer.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/InplaceEditingLayer.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/InplaceEditingLayer.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/OperationContext.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/OperationContext.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/OperationContext.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/OperationContext.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/QuickFixManager.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/QuickFixManager.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/QuickFixManager.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/QuickFixManager.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/RootView.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/RootView.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/RootView.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/RootView.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/StaticDecorator.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/StaticDecorator.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/StaticDecorator.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/StaticDecorator.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/AlphaFeedback.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/AlphaFeedback.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/AlphaFeedback.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/AlphaFeedback.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/InsertFeedback.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/InsertFeedback.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/InsertFeedback.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/InsertFeedback.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/LineFeedback.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/LineFeedback.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/LineFeedback.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/LineFeedback.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/LineInsertFeedback.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/LineInsertFeedback.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/LineInsertFeedback.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/LineInsertFeedback.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/LineMarginBorder.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/LineMarginBorder.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/LineMarginBorder.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/LineMarginBorder.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/RectangleFeedback.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/RectangleFeedback.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/RectangleFeedback.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/RectangleFeedback.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/RoundRectangleFeedback.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/RoundRectangleFeedback.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/RoundRectangleFeedback.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/RoundRectangleFeedback.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/TextFeedback.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/TextFeedback.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/feedbacks/TextFeedback.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/feedbacks/TextFeedback.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/DirectionResizePoint.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/selection/DirectionResizePoint.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/DirectionResizePoint.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/selection/DirectionResizePoint.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/EmptyPoint.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/selection/EmptyPoint.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/EmptyPoint.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/selection/EmptyPoint.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/NonResizeSelectionDecorator.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/selection/NonResizeSelectionDecorator.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/NonResizeSelectionDecorator.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/selection/NonResizeSelectionDecorator.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/ResizePoint.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/selection/ResizePoint.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/ResizePoint.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/selection/ResizePoint.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/ResizeSelectionDecorator.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/selection/ResizeSelectionDecorator.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/ResizeSelectionDecorator.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/selection/ResizeSelectionDecorator.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/AbstractCreationTool.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/AbstractCreationTool.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/AbstractCreationTool.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/AbstractCreationTool.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ComponentCreationFactory.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/ComponentCreationFactory.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ComponentCreationFactory.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/ComponentCreationFactory.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ComponentPasteFactory.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/ComponentPasteFactory.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ComponentPasteFactory.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/ComponentPasteFactory.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/CreationTool.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/CreationTool.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/CreationTool.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/CreationTool.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/DragTracker.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/DragTracker.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/DragTracker.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/DragTracker.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/InputTool.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/InputTool.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/InputTool.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/InputTool.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/MarqueeSelectionTracker.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/MarqueeSelectionTracker.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/MarqueeSelectionTracker.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/MarqueeSelectionTracker.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/MarqueeTracker.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/MarqueeTracker.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/MarqueeTracker.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/MarqueeTracker.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/PasteTool.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/PasteTool.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/PasteTool.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/PasteTool.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ResizeTracker.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/ResizeTracker.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ResizeTracker.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/ResizeTracker.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTool.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/SelectionTool.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTool.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/SelectionTool.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTracker.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/SelectionTracker.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTracker.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/SelectionTracker.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/TargetingTool.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/TargetingTool.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/TargetingTool.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/TargetingTool.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/ToolProvider.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java rename to plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/ToolProvider.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/icons/toolWindow.png b/plugins/ui-designer-core/src/com/intellij/designer/icons/toolWindow.png similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/icons/toolWindow.png rename to plugins/ui-designer-core/src/com/intellij/designer/icons/toolWindow.png diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/AbstractQuickFixManager.java b/plugins/ui-designer-core/src/com/intellij/designer/inspection/AbstractQuickFixManager.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/AbstractQuickFixManager.java rename to plugins/ui-designer-core/src/com/intellij/designer/inspection/AbstractQuickFixManager.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/DesignerBackgroundEditorHighlighter.java b/plugins/ui-designer-core/src/com/intellij/designer/inspection/DesignerBackgroundEditorHighlighter.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/DesignerBackgroundEditorHighlighter.java rename to plugins/ui-designer-core/src/com/intellij/designer/inspection/DesignerBackgroundEditorHighlighter.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/DesignerHighlightingPass.java b/plugins/ui-designer-core/src/com/intellij/designer/inspection/DesignerHighlightingPass.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/DesignerHighlightingPass.java rename to plugins/ui-designer-core/src/com/intellij/designer/inspection/DesignerHighlightingPass.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/EmptyXmlTag.java b/plugins/ui-designer-core/src/com/intellij/designer/model/EmptyXmlTag.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/EmptyXmlTag.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/EmptyXmlTag.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/FindComponentVisitor.java b/plugins/ui-designer-core/src/com/intellij/designer/model/FindComponentVisitor.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/FindComponentVisitor.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/FindComponentVisitor.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/IComponentDecorator.java b/plugins/ui-designer-core/src/com/intellij/designer/model/IComponentDecorator.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/IComponentDecorator.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/IComponentDecorator.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/IGroupDeleteComponent.java b/plugins/ui-designer-core/src/com/intellij/designer/model/IGroupDeleteComponent.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/IGroupDeleteComponent.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/IGroupDeleteComponent.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaManager.java b/plugins/ui-designer-core/src/com/intellij/designer/model/MetaManager.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaManager.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/MetaManager.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaModel.java b/plugins/ui-designer-core/src/com/intellij/designer/model/MetaModel.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaModel.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/MetaModel.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java b/plugins/ui-designer-core/src/com/intellij/designer/model/RadComponent.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/RadComponent.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponentVisitor.java b/plugins/ui-designer-core/src/com/intellij/designer/model/RadComponentVisitor.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponentVisitor.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/RadComponentVisitor.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadLayout.java b/plugins/ui-designer-core/src/com/intellij/designer/model/RadLayout.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadLayout.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/RadLayout.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadLayoutData.java b/plugins/ui-designer-core/src/com/intellij/designer/model/RadLayoutData.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadLayoutData.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/RadLayoutData.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadPropertyContext.java b/plugins/ui-designer-core/src/com/intellij/designer/model/RadPropertyContext.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadPropertyContext.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/RadPropertyContext.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadVisualComponent.java b/plugins/ui-designer-core/src/com/intellij/designer/model/RadVisualComponent.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadVisualComponent.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/RadVisualComponent.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/WrapInProvider.java b/plugins/ui-designer-core/src/com/intellij/designer/model/WrapInProvider.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/WrapInProvider.java rename to plugins/ui-designer-core/src/com/intellij/designer/model/WrapInProvider.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/DefaultPaletteItem.java b/plugins/ui-designer-core/src/com/intellij/designer/palette/DefaultPaletteItem.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/DefaultPaletteItem.java rename to plugins/ui-designer-core/src/com/intellij/designer/palette/DefaultPaletteItem.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PaletteContainer.java b/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteContainer.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PaletteContainer.java rename to plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteContainer.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PaletteGroup.java b/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteGroup.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PaletteGroup.java rename to plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteGroup.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PaletteGroupComponent.java b/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteGroupComponent.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PaletteGroupComponent.java rename to plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteGroupComponent.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PaletteItem.java b/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteItem.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PaletteItem.java rename to plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteItem.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PaletteItemsComponent.java b/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteItemsComponent.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PaletteItemsComponent.java rename to plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteItemsComponent.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PalettePanel.java b/plugins/ui-designer-core/src/com/intellij/designer/palette/PalettePanel.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PalettePanel.java rename to plugins/ui-designer-core/src/com/intellij/designer/palette/PalettePanel.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PaletteToolWindowManager.java b/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteToolWindowManager.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/PaletteToolWindowManager.java rename to plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteToolWindowManager.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/IPropertyDecorator.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/IPropertyDecorator.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/IPropertyDecorator.java rename to plugins/ui-designer-core/src/com/intellij/designer/propertyTable/IPropertyDecorator.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTablePanel.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/PropertyTablePanel.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTablePanel.java rename to plugins/ui-designer-core/src/com/intellij/designer/propertyTable/PropertyTablePanel.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/QuickFixManager.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/QuickFixManager.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/QuickFixManager.java rename to plugins/ui-designer-core/src/com/intellij/designer/propertyTable/QuickFixManager.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/RadPropertyTable.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/RadPropertyTable.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/RadPropertyTable.java rename to plugins/ui-designer-core/src/com/intellij/designer/propertyTable/RadPropertyTable.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/IPropertyTableAction.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/IPropertyTableAction.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/IPropertyTableAction.java rename to plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/IPropertyTableAction.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java rename to plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowColumns.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/ShowColumns.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowColumns.java rename to plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/ShowColumns.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowExpert.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/ShowExpert.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowExpert.java rename to plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/ShowExpert.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java rename to plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/editors/TextEditorWrapper.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/editors/TextEditorWrapper.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/editors/TextEditorWrapper.java rename to plugins/ui-designer-core/src/com/intellij/designer/propertyTable/editors/TextEditorWrapper.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/renderers/AbstractResourceRenderer.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/renderers/AbstractResourceRenderer.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/renderers/AbstractResourceRenderer.java rename to plugins/ui-designer-core/src/com/intellij/designer/propertyTable/renderers/AbstractResourceRenderer.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/Cursors.java b/plugins/ui-designer-core/src/com/intellij/designer/utils/Cursors.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/Cursors.java rename to plugins/ui-designer-core/src/com/intellij/designer/utils/Cursors.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/Position.java b/plugins/ui-designer-core/src/com/intellij/designer/utils/Position.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/Position.java rename to plugins/ui-designer-core/src/com/intellij/designer/utils/Position.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/SizedIcon.java b/plugins/ui-designer-core/src/com/intellij/designer/utils/SizedIcon.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/SizedIcon.java rename to plugins/ui-designer-core/src/com/intellij/designer/utils/SizedIcon.java diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/icon-robots.txt b/plugins/ui-designer-core/src/com/intellij/designer/utils/icon-robots.txt similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/icon-robots.txt rename to plugins/ui-designer-core/src/com/intellij/designer/utils/icon-robots.txt diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/no-cursor.gif b/plugins/ui-designer-core/src/com/intellij/designer/utils/no-cursor.gif similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/no-cursor.gif rename to plugins/ui-designer-core/src/com/intellij/designer/utils/no-cursor.gif diff --git a/plugins/ui-designer/ui-designer-new/src/icons/UIDesignerNewIcons.java b/plugins/ui-designer-core/src/icons/UIDesignerNewIcons.java similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/icons/UIDesignerNewIcons.java rename to plugins/ui-designer-core/src/icons/UIDesignerNewIcons.java diff --git a/plugins/ui-designer/ui-designer-new/src/messages/DesignerBundle.properties b/plugins/ui-designer-core/src/messages/DesignerBundle.properties similarity index 100% rename from plugins/ui-designer/ui-designer-new/src/messages/DesignerBundle.properties rename to plugins/ui-designer-core/src/messages/DesignerBundle.properties diff --git a/plugins/ui-designer/ui-designer-new/ui-designer-new.iml b/plugins/ui-designer-core/ui-designer-core.iml similarity index 100% rename from plugins/ui-designer/ui-designer-new/ui-designer-new.iml rename to plugins/ui-designer-core/ui-designer-core.iml