TreeFormFactory.createTreeFormMasterDetailComposite refactorized to
createTreeFormComposite
Change-Id: Ied739a7d16794ee204b369f9a9fb3bc840cb6f4a
diff --git a/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/src/org/eclipse/emf/parsley/examples/eclipse4/parsleypart/parts/ParsleyE4ModelPart.java b/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/src/org/eclipse/emf/parsley/examples/eclipse4/parsleypart/parts/ParsleyE4ModelPart.java
index 250ea00..b1e185d 100644
--- a/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/src/org/eclipse/emf/parsley/examples/eclipse4/parsleypart/parts/ParsleyE4ModelPart.java
+++ b/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/src/org/eclipse/emf/parsley/examples/eclipse4/parsleypart/parts/ParsleyE4ModelPart.java
@@ -62,7 +62,7 @@
// Initialize Parsley Tree Form:
// 1) create the tree-form composite
treeFormComposite = treeFormFactory
- .createTreeFormMasterDetailComposite(parent, SWT.BORDER);
+ .createTreeFormComposite(parent, SWT.BORDER);
// 2) initialize and bind the context menu to the tree-form composite
treeActionBarContributor.initialize(editingDomain);
diff --git a/examples/org.eclipse.emf.parsley.examples.rap.ui/src/org/eclipse/emf/parsley/examples/rap/ui/View.java b/examples/org.eclipse.emf.parsley.examples.rap.ui/src/org/eclipse/emf/parsley/examples/rap/ui/View.java
index afa3167..16b3cd5 100644
--- a/examples/org.eclipse.emf.parsley.examples.rap.ui/src/org/eclipse/emf/parsley/examples/rap/ui/View.java
+++ b/examples/org.eclipse.emf.parsley.examples.rap.ui/src/org/eclipse/emf/parsley/examples/rap/ui/View.java
@@ -36,7 +36,7 @@
* it.
*/
public void createPartControl(Composite parent) {
- treeFormComposite = treeFormFactory.createTreeFormMasterDetailComposite(parent,
+ treeFormComposite = treeFormFactory.createTreeFormComposite(parent,
SWT.BORDER);
Resource resource = new ResourceImpl();
diff --git a/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/factories/TreeFormFactory.java b/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/factories/TreeFormFactory.java
index 2ec6213..3b9e6ce 100644
--- a/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/factories/TreeFormFactory.java
+++ b/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/factories/TreeFormFactory.java
@@ -31,10 +31,12 @@
}
- public TreeFormComposite createTreeFormMasterDetailComposite(
- Composite parent, int style) {
- TreeFormComposite treeFormComposite = new TreeFormComposite(parent,
- style);
+ /**
+ * This method is not intended to be extended. Use {link {@link #createComposite(Composite, int)} to customize the creation of the {@link TreeFormComposite}.
+ * @return the TreeFormComposite instance
+ */
+ public TreeFormComposite createTreeFormComposite(Composite parent, int style) {
+ TreeFormComposite treeFormComposite = createComposite(parent, style);
treeFormCompositeMembersInjector.injectMembers(treeFormComposite);
return treeFormComposite;
}
diff --git a/plugins/org.eclipse.emf.parsley.views.common/src/org/eclipse/emf/parsley/views/AbstractSaveableTreeFormView.java b/plugins/org.eclipse.emf.parsley.views.common/src/org/eclipse/emf/parsley/views/AbstractSaveableTreeFormView.java
index c2a654a..77a1e0f 100644
--- a/plugins/org.eclipse.emf.parsley.views.common/src/org/eclipse/emf/parsley/views/AbstractSaveableTreeFormView.java
+++ b/plugins/org.eclipse.emf.parsley.views.common/src/org/eclipse/emf/parsley/views/AbstractSaveableTreeFormView.java
@@ -36,7 +36,7 @@
super.createPartControl(parent);
treeFormComposite = treeFormFactory
- .createTreeFormMasterDetailComposite(parent, SWT.BORDER);
+ .createTreeFormComposite(parent, SWT.BORDER);
treeFormComposite.update(getContents(getResource()));
diff --git a/plugins/org.eclipse.emf.parsley.views.common/src/org/eclipse/emf/parsley/views/OnSelectionTreeFormView.java b/plugins/org.eclipse.emf.parsley.views.common/src/org/eclipse/emf/parsley/views/OnSelectionTreeFormView.java
index 1946caf..09ff164 100644
--- a/plugins/org.eclipse.emf.parsley.views.common/src/org/eclipse/emf/parsley/views/OnSelectionTreeFormView.java
+++ b/plugins/org.eclipse.emf.parsley.views.common/src/org/eclipse/emf/parsley/views/OnSelectionTreeFormView.java
@@ -31,7 +31,7 @@
public void createPartControl(Composite parent) {
super.createPartControl(parent);
- treeFormDetailComposite = treeFormFactory.createTreeFormMasterDetailComposite(parent,
+ treeFormDetailComposite = treeFormFactory.createTreeFormComposite(parent,
SWT.BORDER);
}
