Author: scabanovich
Date: 2009-10-22 08:55:04 -0400 (Thu, 22 Oct 2009)
New Revision: 18234
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeGuiEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XModelObjectTreeViewComponent.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleTreeForm.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5058
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java 2009-10-22
12:01:48 UTC (rev 18233)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java 2009-10-22
12:55:04 UTC (rev 18234)
@@ -107,7 +107,7 @@
errorForm.setVisible(Boolean.FALSE.booleanValue());
errorForm.setLayout(layout);
- treeForm = new SampleTreeForm();
+ treeForm = new SampleTreeForm(this);
treeForm.setSelectionNotifier(selectionNotifier);
rightFormContainer = new RightFormContainer();
rightFormContainer.setSelectionChangedListener(selectionNotifier);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeGuiEditor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeGuiEditor.java 2009-10-22
12:01:48 UTC (rev 18233)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeGuiEditor.java 2009-10-22
12:55:04 UTC (rev 18234)
@@ -32,7 +32,7 @@
control = sash;
control.setLayoutData(new GridData(GridData.FILL_BOTH));
- component = new XModelObjectTreeViewComponent();
+ component = new XModelObjectTreeViewComponent(this);
component.setModelObject(object);
component.setCache(new XModelObjectCache(object));
for (int i = 0; i < filters.length; i++) component.addFilter(filters[i]);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XModelObjectTreeViewComponent.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XModelObjectTreeViewComponent.java 2009-10-22
12:01:48 UTC (rev 18233)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XModelObjectTreeViewComponent.java 2009-10-22
12:55:04 UTC (rev 18234)
@@ -25,6 +25,7 @@
import org.eclipse.jface.viewers.*;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.*;
+import org.eclipse.ui.IEditorPart;
import org.jboss.tools.common.model.*;
public class XModelObjectTreeViewComponent {
@@ -38,16 +39,18 @@
private TreeDragDropProvider dndProvider = new TreeDragDropProvider();
private ControlDragDrop dnd = new ControlDragDrop();
TreeViewer treeViewer = null;
+ IEditorPart part;
- public XModelObjectTreeViewComponent() {
- this(new TreeViewerModelListenerImpl());
+ public XModelObjectTreeViewComponent(IEditorPart part) {
+ this(part, new TreeViewerModelListenerImpl());
}
public void setMenuInvoker(TreeViewerMenuInvoker menu) {
// this.menu = menu;
}
- protected XModelObjectTreeViewComponent(TreeViewerModelListenerImpl listener) {
+ protected XModelObjectTreeViewComponent(IEditorPart part, TreeViewerModelListenerImpl
listener) {
+ this.part = part;
this.listener = listener;
syncListener = new XModelTreeListenerSWTASync(listener);
}
@@ -127,16 +130,10 @@
});
final TreeViewer treeViewer = getViewer();
Menu menu = menuMgr.createContextMenu(treeViewer.getTree());
- treeViewer.getTree().setMenu(menu);
-// Display.getDefault().asyncExec(new Runnable() {
-// public void run() {
-// ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow()
-// .getActivePage().getActiveEditor().getSite()
-// .registerContextMenu(menuMgr, treeViewer);
-// }
-// });
-
+ treeViewer.getTree().setMenu(menu);
+ part.getSite().registerContextMenu(menuMgr, treeViewer);
}
+
protected void fillContextMenu(IMenuManager menu) {
IStructuredSelection selection =
(IStructuredSelection) getViewer().getSelection();
@@ -171,6 +168,7 @@
label.dispose();
label = null;
}
+ part = null;
}
// private void connect() {
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleTreeForm.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleTreeForm.java 2009-10-22
12:01:48 UTC (rev 18233)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleTreeForm.java 2009-10-22
12:55:04 UTC (rev 18234)
@@ -27,6 +27,7 @@
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.actions.ActionFactory;
import org.jboss.tools.common.meta.action.XAction;
@@ -45,8 +46,8 @@
private XFilteredTreeConstraint[] filters = new XFilteredTreeConstraint[0];
private SelectionNotifier notifier;
- public SampleTreeForm() {
- tree = new XModelObjectTreeViewComponent();
+ public SampleTreeForm(IEditorPart part) {
+ tree = new XModelObjectTreeViewComponent(part);
headingText = "Tree Form";
setCollapsable(Boolean.FALSE.booleanValue());
createActionMapping();