Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2014-03-07 16:05:24 -0500
committerLars Vogel2014-03-10 05:20:46 -0400
commitf5ba47ed4ffea46c8f91c478aeb8876929d3db17 (patch)
tree0ddb81a2435c503408a2513f2c356a1a9476f521
parent5b9b8ffb946612dc86346befb7bb9b57fdabec6d (diff)
downloadorg.eclipse.e4.tools-f5ba47ed4ffea46c8f91c478aeb8876929d3db17.tar.gz
org.eclipse.e4.tools-f5ba47ed4ffea46c8f91c478aeb8876929d3db17.tar.xz
org.eclipse.e4.tools-f5ba47ed4ffea46c8f91c478aeb8876929d3db17.zip
Bug 426038 - Get rid of MInputPart in the model editorI20140311-2200I20140310-2200
MInputPart has been deprecated Change-Id: Ifa37b57fc938b1bb88ad4a844c0239b3bbeb9ed4 Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java8
-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/ModelEditor.java2
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java6
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java41
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java7
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java7
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java6
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java7
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java7
10 files changed, 1 insertions, 94 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 8fc441e0..9ebdff81 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
@@ -118,9 +118,6 @@ public class Messages {
public String HandlerEditor_Command;
public String HandlerEditor_ClassURI;
- public String InputPartEditor_Label;
- public String InputPartEditor_InputURI;
-
public String KeyBindingEditor_Label;
public String KeyBindingEditor_Description;
public String KeyBindingEditor_Sequence;
@@ -210,7 +207,6 @@ public class Messages {
public String PartSashContainerEditor_AddPartSashContainer;
public String PartSashContainerEditor_AddPartStack;
public String PartSashContainerEditor_AddPart;
- public String PartSashContainerEditor_AddInputPart;
public String PartSashContainerEditor_AddArea;
public String PartSashContainerEditor_AddPlaceholder;
@@ -220,7 +216,6 @@ public class Messages {
public String PartStackEditor_Parts;
public String PartStackEditor_ContainerData;
public String PartStackEditor_AddPart;
- public String PartStackEditor_AddInputPart;
public String PartStackEditor_AddPlaceholder;
public String PerspectiveEditor_Label;
@@ -233,7 +228,6 @@ public class Messages {
public String PerspectiveEditor_AddPartSashContainer;
public String PerspectiveEditor_AddPartStack;
public String PerspectiveEditor_AddPart;
- public String PerspectiveEditor_AddInputPart;
public String PerspectiveEditor_AddArea;
public String PerspectiveEditor_AddPlaceholder;
@@ -465,7 +459,6 @@ public class Messages {
public String VWindowControlEditor_AddPartSashContainer;
public String VWindowControlEditor_AddPartStack;
public String VWindowControlEditor_AddPart;
- public String VWindowControlEditor_AddInputPart;
public String VWindowControlEditor_AddArea;
public String VWindowEditor_TreeLabel;
@@ -481,7 +474,6 @@ public class Messages {
public String VWindowSharedElementsEditor_Controls;
public String VWindowSharedElementsEditor_AddPartSashContainer;
public String VWindowSharedElementsEditor_AddPart;
- public String VWindowSharedElementsEditor_AddInputPart;
public String VWindowTrimEditor_TreeLabel;
public String VWindowTrimEditor_TreeLabelDescription;
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 49868efd..33ced541 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
@@ -214,7 +214,6 @@ PartSashContainerEditor_ContainerData=Container Data
PartSashContainerEditor_AddPartSashContainer=PartSashContainer
PartSashContainerEditor_AddPartStack=PartStack
PartSashContainerEditor_AddPart=Part
-PartSashContainerEditor_AddInputPart=Input Part
PartSashContainerEditor_AddArea=Area
PartSashContainerEditor_AddPlaceholder=Placeholder
@@ -224,7 +223,6 @@ PartStackEditor_SelectedElement=Selected Element
PartStackEditor_Parts=Parts
PartStackEditor_ContainerData=Container Data
PartStackEditor_AddPart=Part
-PartStackEditor_AddInputPart=Input Part
PartStackEditor_AddPlaceholder=Placeholder
PerspectiveEditor_Label=Perspective
@@ -473,7 +471,6 @@ VWindowControlEditor_AddPerspectiveStack=Perspective Stack
VWindowControlEditor_AddPartSashContainer=Part Sash Container
VWindowControlEditor_AddPartStack=Part Stack
VWindowControlEditor_AddPart=Part
-VWindowControlEditor_AddInputPart=Input Part
VWindowControlEditor_AddArea=Area
VWindowEditor_TreeLabel=Windows and Dialogs
@@ -489,7 +486,6 @@ VWindowSharedElementsEditor_TreeLabelDescription=Shared Elements Bla Bla Bla Bla
VWindowSharedElementsEditor_Controls=Controls
VWindowSharedElementsEditor_AddPartSashContainer=Part Sash Container
VWindowSharedElementsEditor_AddPart=Part
-VWindowSharedElementsEditor_AddInputPart=Input Part
VWindowSharedElementsEditor_AddPartStack=Part Stack
VWindowTrimEditor_TreeLabel=Window Trims
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index a64d5f22..1388a87e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -80,7 +80,6 @@ import org.eclipse.e4.tools.emf.ui.internal.common.component.DynamicMenuContribu
import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledMenuItemEditor;
import org.eclipse.e4.tools.emf.ui.internal.common.component.HandledToolItemEditor;
import org.eclipse.e4.tools.emf.ui.internal.common.component.HandlerEditor;
-import org.eclipse.e4.tools.emf.ui.internal.common.component.InputPartEditor;
import org.eclipse.e4.tools.emf.ui.internal.common.component.KeyBindingEditor;
import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuContributionEditor;
import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuEditor;
@@ -1231,7 +1230,6 @@ public class ModelEditor {
registerEditor(BasicPackageImpl.Literals.PART_SASH_CONTAINER, ContextInjectionFactory.make(PartSashContainerEditor.class, context));
registerEditor(AdvancedPackageImpl.Literals.AREA, ContextInjectionFactory.make(AreaEditor.class, context));
registerEditor(BasicPackageImpl.Literals.PART_STACK, ContextInjectionFactory.make(PartStackEditor.class, context));
- registerEditor(BasicPackageImpl.Literals.INPUT_PART, ContextInjectionFactory.make(InputPartEditor.class, context));
registerEditor(BasicPackageImpl.Literals.TRIM_BAR, ContextInjectionFactory.make(TrimBarEditor.class, context));
registerEditor(BasicPackageImpl.Literals.DIALOG, ContextInjectionFactory.make(DialogEditor.class, context));
registerEditor(BasicPackageImpl.Literals.WIZARD_DIALOG, ContextInjectionFactory.make(WizardDialogEditor.class, context));
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 38ab3a21..1bf9f03d 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
@@ -118,12 +118,6 @@ public class AreaEditor extends AbstractComponentEditor {
handleAddChild(BasicPackageImpl.Literals.PART);
}
});
- actions.add(new Action(Messages.PartSashContainerEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
- @Override
- public void run() {
- handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
- }
- });
actions.add(new Action(Messages.PartSashContainerEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
@Override
public void run() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
deleted file mode 100644
index 3810c7bb..00000000
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/InputPartEditor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.e4.tools.emf.ui.internal.common.component;
-
-import javax.inject.Inject;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
-import org.eclipse.emf.databinding.EMFDataBindingContext;
-import org.eclipse.emf.databinding.edit.EMFEditProperties;
-import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-public class InputPartEditor extends PartEditor {
-
- @Inject
- public InputPartEditor() {
- super();
- }
-
- @Override
- public String getLabel(Object element) {
- return Messages.InputPartEditor_Label;
- }
-
- @Override
- protected void createSubformElements(Composite parent, EMFDataBindingContext context, IObservableValue master) {
- IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
-
- ControlFactory.createTextField(parent, Messages.InputPartEditor_InputURI, master, context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.INPUT__INPUT_URI));
- }
-}
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 a7cb95e7..898b1b78 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
@@ -120,12 +120,7 @@ public class PartSashContainerEditor extends AbstractComponentEditor {
handleAddChild(BasicPackageImpl.Literals.PART);
}
});
- actions.add(new Action(Messages.PartSashContainerEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
- @Override
- public void run() {
- handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
- }
- });
+
actions.add(new Action(Messages.PartSashContainerEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
@Override
public void run() {
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 2a4c7516..d1267cb1 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
@@ -103,12 +103,6 @@ public class PartStackEditor extends AbstractComponentEditor {
handleAddChild(BasicPackageImpl.Literals.PART);
}
});
- actions.add(new Action(Messages.PartStackEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
- @Override
- public void run() {
- handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
- }
- });
actions.add(new Action(Messages.PartStackEditor_AddPlaceholder, createImageDescriptor(ResourceProvider.IMG_Placeholder)) {
@Override
public void run() {
@@ -257,7 +251,6 @@ public class PartStackEditor extends AbstractComponentEditor {
});
List<FeatureClass> eClassList = new ArrayList<FeatureClass>();
eClassList.add(new FeatureClass("Part", BasicPackageImpl.Literals.PART));
- eClassList.add(new FeatureClass("Input Part", BasicPackageImpl.Literals.INPUT_PART));
eClassList.add(new FeatureClass("Placeholder", AdvancedPackageImpl.Literals.PLACEHOLDER));
eClassList.addAll(getEditor().getFeatureClasses(BasicPackageImpl.Literals.PART_STACK, UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN));
childrenDropDown.setInput(eClassList);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
index 136808df..caa2b8b3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveEditor.java
@@ -104,12 +104,6 @@ public class PerspectiveEditor extends AbstractComponentEditor {
handleAddChild(BasicPackageImpl.Literals.PART);
}
});
- actions.add(new Action(Messages.PerspectiveEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
- @Override
- public void run() {
- handleAddChild(BasicPackageImpl.Literals.INPUT_PART);
- }
- });
actions.add(new Action(Messages.PerspectiveEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area)) {
@Override
public void run() {
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 b2cce6db..bcf9e755 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
@@ -87,13 +87,6 @@ public class VPerspectiveControlEditor extends AbstractComponentEditor {
}
});
- actions.add(new Action(Messages.VWindowControlEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
- @Override
- public void run() {
- handleAdd(BasicPackageImpl.Literals.PART);
- }
- });
-
actions.add(new Action(Messages.VWindowControlEditor_AddArea, createImageDescriptor(ResourceProvider.IMG_Area_vertical)) {
@Override
public void run() {
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 aae768d2..78b28e5d 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
@@ -87,13 +87,6 @@ public class VWindowSharedElementsEditor extends AbstractComponentEditor {
}
});
- actions.add(new Action(Messages.VWindowSharedElementsEditor_AddInputPart, createImageDescriptor(ResourceProvider.IMG_Part)) {
- @Override
- public void run() {
- handleAdd(BasicPackageImpl.Literals.INPUT_PART);
- }
- });
-
actions.add(new Action(Messages.VWindowSharedElementsEditor_AddPartStack, createImageDescriptor(ResourceProvider.IMG_PartStack)) {
@Override
public void run() {

Back to the top