Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Prouvost2018-02-06 18:31:55 +0000
committerOlivier Prouvost2018-02-13 15:50:28 +0000
commit7ca877ed5a9cb79e8c95b40e4d7c18abf6a9d67a (patch)
tree3450be305591b664d37b0b3a8e42b8a94cda0c22
parentd8ae5aaa31a7cd17d62edb3bac60fd99f680aa0b (diff)
downloadeclipse.platform.ui.tools-7ca877ed5a9cb79e8c95b40e4d7c18abf6a9d67a.tar.gz
eclipse.platform.ui.tools-7ca877ed5a9cb79e8c95b40e4d7c18abf6a9d67a.tar.xz
eclipse.platform.ui.tools-7ca877ed5a9cb79e8c95b40e4d7c18abf6a9d67a.zip
Bug 509868 - Mark MInput and MInputPart for deletionI20180213-2000
Change-Id: Ia078e6236d682892d256b601a340f3feb6699fce Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java2
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties4
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java2
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java3
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java4
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java2
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java13
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java4
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java2
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java2
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java6
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java7
12 files changed, 17 insertions, 34 deletions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index b366d81d..71072d42 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -17,7 +17,7 @@ package org.eclipse.e4.tools.emf.ui.internal;
public class Messages {
- public String PartEditor_InputPart;
+ public String PartEditor_Part;
public String XmiTab_TypeTextToSearch;
public String ModelEditor_Import3x;
public String E4StringPickList_Replace;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 7c2211e4..e6b40578 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -15,7 +15,7 @@
# * Patrik Suzzi <psuzzi@gmail.com> - Bug 509606
# ******************************************************************************
-PartEditor_InputPart=Input Part
+PartEditor_Part=Part
XmiTab_TypeTextToSearch=type text to search (press <ENTER> to search for next instance)
ModelEditor_Import3x=Import 3x
E4StringPickList_Replace=Replace
@@ -163,8 +163,6 @@ HandlerEditor_Description=Handler
HandlerEditor_Command=Command
HandlerEditor_ClassURI=Class URI
-InputPartEditor_Label=InputPart
-InputPartEditor_InputURI=Input URI
KeyBindingEditor_Label=KeyBinding
KeyBindingEditor_Description=Binding
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 28e90918..8b8219fe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -301,7 +301,7 @@ public class AreaEditor extends AbstractComponentEditor {
pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER,
BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
- BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA,
+ AdvancedPackageImpl.Literals.AREA,
AdvancedPackageImpl.Literals.PLACEHOLDER });
pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index 85f0ec82..c3fa4539 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -160,7 +160,7 @@ public class CompositePartEditor extends AbstractComponentEditor {
actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
@Override
public void run() {
- handleImportChild(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
+ handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_EDITOR);
}
});
@@ -335,7 +335,6 @@ public class CompositePartEditor extends AbstractComponentEditor {
eClassList.add(new FeatureClass("PartSashContainer", BasicPackageImpl.Literals.PART_SASH_CONTAINER)); //$NON-NLS-1$
eClassList.add(new FeatureClass("PartStack", BasicPackageImpl.Literals.PART_STACK)); //$NON-NLS-1$
eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART)); //$NON-NLS-1$
- eClassList.add(new FeatureClass("InputPart", BasicPackageImpl.Literals.INPUT_PART)); //$NON-NLS-1$
eClassList.add(new FeatureClass("Area", AdvancedPackageImpl.Literals.AREA)); //$NON-NLS-1$
eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER)); //$NON-NLS-1$
eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.COMPOSITE_PART,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
index 719768c6..f781e310 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java
@@ -103,8 +103,8 @@ public class PartEditor extends AbstractComponentEditor {
@Override
public String getLabel(Object element) {
- if (element == BasicPackageImpl.Literals.INPUT_PART) {
- return Messages.PartEditor_InputPart;
+ if (element == BasicPackageImpl.Literals.PART) {
+ return Messages.PartEditor_Part;
}
return Messages.PartEditor_Label;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index ead9a83a..695783e9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -155,7 +155,7 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
actionsImport.add(new Action("Editors", createImageDescriptor(ResourceProvider.IMG_Part)) { //$NON-NLS-1$
@Override
public void run() {
- handleImportChild(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
+ handleImportChild(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_EDITOR);
}
});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
index de828234..a8ca4783 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java
@@ -32,7 +32,6 @@ import org.eclipse.e4.tools.emf.ui.internal.common.uistructure.UIViewer;
import org.eclipse.e4.tools.emf.ui.internal.imp.ModelImportWizard;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
-import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
@@ -137,7 +136,7 @@ public class PartStackEditor extends AbstractComponentEditor {
.add(new Action(Messages.PartStackEditor_Editors, createImageDescriptor(ResourceProvider.IMG_Part)) {
@Override
public void run() {
- handleImportChild(BasicPackageImpl.Literals.INPUT_PART);
+ handleImportChild(BasicPackageImpl.Literals.PART);
}
});
@@ -345,16 +344,6 @@ public class PartStackEditor extends AbstractComponentEditor {
}
}
- if (eClass == BasicPackageImpl.Literals.INPUT_PART) {
- final ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this, resourcePool);
- final WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard);
- if (wizardDialog.open() == Window.OK) {
- final MPart[] parts = (MPart[]) wizard.getElements(MInputPart.class);
- for (final MPart part : parts) {
- addToModel((EObject) part);
- }
- }
- }
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index 81bf57a4..aa6f62e8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -143,7 +143,9 @@ public class VPerspectiveControlEditor extends AbstractComponentEditor {
pickList.setContentProvider(new ArrayContentProvider());
pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
- pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
+ pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER,
+ BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
+ AdvancedPackageImpl.Literals.AREA, AdvancedPackageImpl.Literals.PLACEHOLDER });
pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART_SASH_CONTAINER));
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
index b02174c7..7d17f586 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VSnippetsEditor.java
@@ -202,7 +202,7 @@ public class VSnippetsEditor extends AbstractComponentEditor {
pickList.setInput(new EClass[] { BasicPackageImpl.Literals.TRIMMED_WINDOW, BasicPackageImpl.Literals.WINDOW,
AdvancedPackageImpl.Literals.PERSPECTIVE_STACK, AdvancedPackageImpl.Literals.PERSPECTIVE,
AdvancedPackageImpl.Literals.AREA, BasicPackageImpl.Literals.PART_SASH_CONTAINER,
- BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART,
+ BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
BasicPackageImpl.Literals.TRIM_BAR, BasicPackageImpl.Literals.TRIM_ELEMENT, });
pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
index 7c83d2bd..9cc43a7b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowControlEditor.java
@@ -164,7 +164,7 @@ public class VWindowControlEditor extends AbstractComponentEditor {
pickList
.setInput(new EClass[] { AdvancedPackageImpl.Literals.PERSPECTIVE_STACK,
BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART_STACK,
- BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART,
+ BasicPackageImpl.Literals.PART,
AdvancedPackageImpl.Literals.AREA });
pickList.setSelection(new StructuredSelection(AdvancedPackageImpl.Literals.PERSPECTIVE_STACK));
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
index e294920b..5fbbf31c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java
@@ -109,7 +109,7 @@ public class VWindowSharedElementsEditor extends AbstractComponentEditor {
actionsImport.add(new Action(Messages.VWindowSharedElementsEditor_Editors, createImageDescriptor(ResourceProvider.IMG_Part)) {
@Override
public void run() {
- handleImport(BasicPackageImpl.Literals.INPUT_PART, RegistryUtil.HINT_EDITOR);
+ handleImport(BasicPackageImpl.Literals.PART, RegistryUtil.HINT_EDITOR);
}
});
@@ -178,7 +178,9 @@ public class VWindowSharedElementsEditor extends AbstractComponentEditor {
viewer.setInput(prop.observeDetail(getMaster()));
pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
- pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART, BasicPackageImpl.Literals.INPUT_PART, BasicPackageImpl.Literals.PART_STACK, AdvancedPackageImpl.Literals.AREA });
+ pickList.setInput(
+ new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER, BasicPackageImpl.Literals.PART,
+ BasicPackageImpl.Literals.PART_STACK, AdvancedPackageImpl.Literals.AREA });
pickList.setSelection(new StructuredSelection(BasicPackageImpl.Literals.PART));
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
index a3e0d63c..7cf643e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java
@@ -31,7 +31,6 @@ import org.eclipse.e4.ui.model.application.commands.MHandler;
import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
-import org.eclipse.e4.ui.model.application.ui.basic.MInputPart;
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
@@ -90,8 +89,6 @@ public class RegistryUtil {
return getViewsAsCompatibilityViews(elements);
} else if (t.equals(MPart.class)) {
return getViews(elements);
- } else if (t.equals(MInputPart.class)) {
- return getEditors(elements);
} else if (t.equals(MHandler.class)) {
return getHandlers(elements, application);
} else if (t.equals(MPartDescriptor.class) && HINT_EDITOR.equals(hint)) {
@@ -441,10 +438,6 @@ public class RegistryUtil {
return new RegistryStruct(EMPTY_STRING, "org.eclipse.ui.views", "view", NAME); //$NON-NLS-1$ //$NON-NLS-2$
}
- else if (applicationElement == MInputPart.class) {
- return new RegistryStruct("", "org.eclipse.ui.editors", "editor", "name"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
-
else if (applicationElement == MPartDescriptor.class) {
if (hint == HINT_EDITOR)
{

Back to the top