diff --git a/plugins/android-designer/src/com/intellij/android/designer/AndroidDesignerEditor.java b/plugins/android-designer/src/com/intellij/android/designer/AndroidDesignerEditor.java index da32138b3de3..c9010998e262 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/AndroidDesignerEditor.java +++ b/plugins/android-designer/src/com/intellij/android/designer/AndroidDesignerEditor.java @@ -19,7 +19,7 @@ import com.intellij.openapi.fileEditor.FileEditorState; import com.intellij.openapi.fileEditor.FileEditorStateLevel; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.uiDesigner.DesignerEditor; +import com.intellij.designer.DesignerEditor; import org.jetbrains.annotations.NotNull; /** diff --git a/plugins/ui-designer/ui-designer-new/src/META-INF/plugin.xml b/plugins/ui-designer/ui-designer-new/src/META-INF/plugin.xml index f17e6122d390..bfdf2f712844 100644 --- a/plugins/ui-designer/ui-designer-new/src/META-INF/plugin.xml +++ b/plugins/ui-designer/ui-designer-new/src/META-INF/plugin.xml @@ -3,14 +3,14 @@ com.intellij.ui-designer-new JetBrains - messages.UIDesignerBundle + messages.DesignerBundle com.intellij.java-i18n com.intellij.properties - com.intellij.uiDesigner.UIDesignerToolWindowManager + com.intellij.designer.DesignerToolWindowManager diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/UIDesignerBundle.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerBundle.java similarity index 88% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/UIDesignerBundle.java rename to plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerBundle.java index ec46f725d320..d6ce8f409be6 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/UIDesignerBundle.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerBundle.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.uiDesigner; +package com.intellij.designer; import com.intellij.CommonBundle; import org.jetbrains.annotations.NonNls; @@ -26,12 +26,12 @@ import java.util.ResourceBundle; /** * @author yole */ -public class UIDesignerBundle { +public class DesignerBundle { private static Reference ourBundle; - @NonNls private static final String BUNDLE = "messages.UIDesignerBundle"; + @NonNls private static final String BUNDLE = "messages.DesignerBundle"; - private UIDesignerBundle() { + private DesignerBundle() { } public static String message(@PropertyKey(resourceBundle = BUNDLE) String key, Object... params) { diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/DesignerEditor.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerEditor.java similarity index 90% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/DesignerEditor.java rename to plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerEditor.java index 9612ef06c6c3..a6142f90d025 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/DesignerEditor.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerEditor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.uiDesigner; +package com.intellij.designer; import com.intellij.codeHighlighting.BackgroundEditorHighlighter; import com.intellij.ide.structureView.StructureViewBuilder; @@ -25,7 +25,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.UserDataHolderBase; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.testFramework.LightVirtualFile; -import com.intellij.uiDesigner.designSurface.DesignerEditorPanel; +import com.intellij.designer.designSurface.DesignerEditorPanel; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -48,14 +48,18 @@ public abstract class DesignerEditor extends UserDataHolderBase implements FileE myDesignerPanel = new DesignerEditorPanel(module, file); } + public final DesignerEditorPanel getDesignerPanel() { + return myDesignerPanel; + } + @NotNull @Override - public JComponent getComponent() { + public final JComponent getComponent() { return myDesignerPanel; } @Override - public JComponent getPreferredFocusedComponent() { + public final JComponent getPreferredFocusedComponent() { return myDesignerPanel.getPreferredFocusedComponent(); } diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java new file mode 100644 index 000000000000..d3f218f925f0 --- /dev/null +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java @@ -0,0 +1,183 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.designer; + +import com.intellij.designer.componentTree.ComponentTree; +import com.intellij.designer.designSurface.DesignerEditorPanel; +import com.intellij.designer.propertyTable.PropertyTablePanel; +import com.intellij.openapi.components.ProjectComponent; +import com.intellij.openapi.fileEditor.FileEditor; +import com.intellij.openapi.fileEditor.FileEditorManager; +import com.intellij.openapi.fileEditor.FileEditorManagerEvent; +import com.intellij.openapi.fileEditor.FileEditorManagerListener; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.startup.StartupManager; +import com.intellij.openapi.ui.Splitter; +import com.intellij.openapi.util.IconLoader; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.openapi.wm.ToolWindow; +import com.intellij.openapi.wm.ToolWindowAnchor; +import com.intellij.openapi.wm.ToolWindowManager; +import com.intellij.ui.IdeBorderFactory; +import com.intellij.ui.ScrollPaneFactory; +import com.intellij.ui.SideBorder; +import com.intellij.ui.content.Content; +import com.intellij.ui.content.ContentManager; +import com.intellij.util.ui.update.MergingUpdateQueue; +import com.intellij.util.ui.update.Update; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; +import java.awt.*; + +/** + * @author Alexander Lobas + */ +public final class DesignerToolWindowManager implements ProjectComponent { + private final MergingUpdateQueue myWindowQueue = new MergingUpdateQueue("designer.components.properties", 200, true, null); + private final Project myProject; + private final FileEditorManager myFileEditorManager; + private ToolWindow myToolWindow; + private ComponentTree myComponentTree; + private PropertyTablePanel myPropertyTablePanel; + private boolean myToolWindowReady; + private boolean myToolWindowDisposed; + + public DesignerToolWindowManager(Project project, FileEditorManager fileEditorManager) { + myProject = project; + myFileEditorManager = fileEditorManager; + project.getMessageBus().connect(project).subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new FileEditorManagerListener() { + @Override + public void fileOpened(FileEditorManager source, VirtualFile file) { + bindToDesigner(getActiveDesigner()); + } + + @Override + public void fileClosed(FileEditorManager source, VirtualFile file) { + bindToDesigner(getActiveDesigner()); + } + + @Override + public void selectionChanged(FileEditorManagerEvent event) { + bindToDesigner(getDesigner(event.getNewEditor())); + } + }); + } + + @Override + public void projectOpened() { + StartupManager.getInstance(myProject).registerPostStartupActivity(new Runnable() { + public void run() { + myToolWindowReady = true; + } + }); + } + + @Override + public void projectClosed() { + if (!myToolWindowDisposed) { + myToolWindowDisposed = true; + myComponentTree = null; + myPropertyTablePanel = null; + myToolWindow = null; + } + } + + public static DesignerToolWindowManager getInstance(Project project) { + return project.getComponent(DesignerToolWindowManager.class); + } + + private static DesignerEditorPanel getDesigner(FileEditor editor) { + if (editor instanceof DesignerEditor) { + DesignerEditor designerEditor = (DesignerEditor)editor; + return designerEditor.getDesignerPanel(); + } + return null; + } + + private DesignerEditorPanel getActiveDesigner() { + FileEditor[] editors = myFileEditorManager.getSelectedEditors(); + return editors.length > 0 ? getDesigner(editors[0]) : null; + } + + private void bindToDesigner(final DesignerEditorPanel designer) { + myWindowQueue.cancelAllUpdates(); + myWindowQueue.queue(new Update("update") { + @Override + public void run() { + if (!myToolWindowReady || myToolWindowDisposed) { + return; + } + if (myToolWindow == null) { + if (designer == null) { + return; + } + initToolWindow(); + } + if (designer == null) { + myToolWindow.setAvailable(false, null); + } + else { + myToolWindow.setAvailable(true, null); + myToolWindow.show(null); + } + } + }); + } + + private void initToolWindow() { + myComponentTree = new ComponentTree(); + JScrollPane treeScrollPane = ScrollPaneFactory.createScrollPane(myComponentTree); + treeScrollPane.setBorder(IdeBorderFactory.createBorder(SideBorder.BOTTOM)); + treeScrollPane.setPreferredSize(new Dimension(250, -1)); + + myPropertyTablePanel = new PropertyTablePanel(); + + Splitter toolWindowPanel = new Splitter(true, 0.33f); + toolWindowPanel.setFirstComponent(treeScrollPane); + toolWindowPanel.setSecondComponent(myPropertyTablePanel); + + myToolWindow = + ToolWindowManager.getInstance(myProject) + .registerToolWindow(DesignerBundle.message("designer.toolwindow.name"), false, ToolWindowAnchor.LEFT, myProject, true); + myToolWindow.setIcon(IconLoader.getIcon("/com/intellij/designer/icons/toolWindow.png")); + + ContentManager contentManager = myToolWindow.getContentManager(); + Content content = + contentManager.getFactory().createContent(toolWindowPanel, DesignerBundle.message("designer.toolwindow.title"), false); + content.setCloseable(false); + content.setPreferredFocusableComponent(myComponentTree); + contentManager.addContent(content); + contentManager.setSelectedContent(content, true); + myToolWindow.setAvailable(false, null); + } + + @Override + public void initComponent() { + } + + @Override + public void disposeComponent() { + } + + @NotNull + @NonNls + @Override + public String getComponentName() { + return "UIDesignerToolWindowManager2"; + } +} \ No newline at end of file diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/componentTree/ComponentTree.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTree.java similarity index 81% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/componentTree/ComponentTree.java rename to plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTree.java index 25e524e08173..d49a48b92079 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/componentTree/ComponentTree.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTree.java @@ -13,16 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.uiDesigner.componentTree; +package com.intellij.designer.componentTree; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.ui.treeStructure.Tree; import org.jetbrains.annotations.NonNls; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeModel; + /** * @author Alexander Lobas */ public final class ComponentTree extends Tree implements DataProvider { + public ComponentTree() { + super(new DefaultTreeModel(new DefaultMutableTreeNode())); + } + @Override public Object getData(@NonNls String dataId) { return null; //To change body of implemented methods use File | Settings | File Templates. diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/designSurface/DesignerEditorPanel.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java similarity index 92% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/designSurface/DesignerEditorPanel.java rename to plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java index da8039a5f012..ce2b88de7e52 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/designSurface/DesignerEditorPanel.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.uiDesigner.designSurface; +package com.intellij.designer.designSurface; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.module.Module; @@ -30,7 +30,7 @@ import java.awt.*; public final class DesignerEditorPanel extends JPanel implements DataProvider { public DesignerEditorPanel(@NotNull Module module, @NotNull VirtualFile file) { setLayout(new BorderLayout()); - add(new JLabel("Design Surface"), BorderLayout.CENTER); + add(new JLabel("Design Surface", JLabel.CENTER), BorderLayout.CENTER); } @Override diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/icons/toolWindow.png b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/icons/toolWindow.png new file mode 100644 index 000000000000..eb8b15c72161 Binary files /dev/null and b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/icons/toolWindow.png differ diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/model/RadComponent.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java similarity index 92% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/model/RadComponent.java rename to plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java index 23225a438671..65488fd1e5a2 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/model/RadComponent.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.uiDesigner.model; +package com.intellij.designer.model; -import com.intellij.uiDesigner.propertyTable.Property; +import com.intellij.designer.propertyTable.Property; import java.util.List; diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/Property.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/Property.java similarity index 93% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/Property.java rename to plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/Property.java index f2b8bfd4171b..bceba0636a2f 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/Property.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/Property.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.uiDesigner.propertyTable; +package com.intellij.designer.propertyTable; -import com.intellij.uiDesigner.model.RadComponent; +import com.intellij.designer.model.RadComponent; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/PropertyEditor.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyEditor.java similarity index 88% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/PropertyEditor.java rename to plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyEditor.java index 91029fa37dbd..6e3c188e729b 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/PropertyEditor.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyEditor.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.uiDesigner.propertyTable; +package com.intellij.designer.propertyTable; -import com.intellij.uiDesigner.model.RadComponent; +import com.intellij.designer.model.RadComponent; import javax.swing.*; diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/PropertyRenderer.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyRenderer.java similarity index 93% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/PropertyRenderer.java rename to plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyRenderer.java index 5b63bf8b66ac..235a9e835caf 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/PropertyRenderer.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyRenderer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.uiDesigner.propertyTable; +package com.intellij.designer.propertyTable; -import com.intellij.uiDesigner.model.RadComponent; +import com.intellij.designer.model.RadComponent; import javax.swing.*; diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/PropertyTable.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTable.java similarity index 95% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/PropertyTable.java rename to plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTable.java index 0e79e343a095..87c66b426e36 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/PropertyTable.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.uiDesigner.propertyTable; +package com.intellij.designer.propertyTable; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.ui.table.JBTable; diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/PropertyTablePanel.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTablePanel.java similarity index 87% rename from plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/PropertyTablePanel.java rename to plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTablePanel.java index b6f6e9ee00a2..5e96f71eee79 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/propertyTable/PropertyTablePanel.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTablePanel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.uiDesigner.propertyTable; +package com.intellij.designer.propertyTable; import javax.swing.*; import java.awt.*; @@ -24,6 +24,6 @@ import java.awt.*; public final class PropertyTablePanel extends JPanel { public PropertyTablePanel() { setLayout(new BorderLayout()); - add(new JLabel("Design Surface"), BorderLayout.CENTER); + add(new JLabel("Property Table", JLabel.CENTER), BorderLayout.CENTER); } } \ No newline at end of file diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/UIDesignerToolWindowManager.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/UIDesignerToolWindowManager.java deleted file mode 100644 index 03f0171f0aaa..000000000000 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/uiDesigner/UIDesignerToolWindowManager.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2000-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.uiDesigner; - -import com.intellij.openapi.components.ProjectComponent; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; - -/** - * @author Alexander Lobas - */ -public final class UIDesignerToolWindowManager implements ProjectComponent { - @Override - public void projectOpened() { - // TODO: Auto-generated method stub - } - - @Override - public void projectClosed() { - // TODO: Auto-generated method stub - } - - @Override - public void initComponent() { - // TODO: Auto-generated method stub - } - - @Override - public void disposeComponent() { - // TODO: Auto-generated method stub - } - - @NotNull - @NonNls - @Override - public String getComponentName() { - return "UIDesignerToolWindowManager2"; - } -} \ No newline at end of file diff --git a/plugins/ui-designer/ui-designer-new/src/messages/DesignerBundle.properties b/plugins/ui-designer/ui-designer-new/src/messages/DesignerBundle.properties new file mode 100644 index 000000000000..ccbb2605abf0 --- /dev/null +++ b/plugins/ui-designer/ui-designer-new/src/messages/DesignerBundle.properties @@ -0,0 +1,2 @@ +designer.toolwindow.name=Designer +designer.toolwindow.title=Component Tree \ No newline at end of file diff --git a/plugins/ui-designer/ui-designer-new/src/messages/UIDesignerBundle.properties b/plugins/ui-designer/ui-designer-new/src/messages/UIDesignerBundle.properties deleted file mode 100644 index e69de29bb2d1..000000000000