diff options
22 files changed, 3 insertions, 102 deletions
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 df35df62..c44a0789 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 @@ -561,7 +561,7 @@ public class ModelEditor { } }); - form.setWeights(new int[] { 1, 2 }); + form.setWeights(new int[] { 3, 4 }); MenuManager mgr = new MenuManager(); mgr.setRemoveAllWhenShown(true); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java index e8c9bd44..dc6490be 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationAddons.java @@ -45,7 +45,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VApplicationAddons extends AbstractComponentEditor { private Composite composite; @@ -111,10 +110,6 @@ public class VApplicationAddons extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VApplicationAddons_Commands); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java index 2b1af264..ed8e27ee 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java @@ -45,7 +45,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VApplicationCategoriesEditor extends AbstractComponentEditor { private Composite composite; @@ -111,10 +110,6 @@ public class VApplicationCategoriesEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VApplicationCategoriesEditor_Categories); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java index 01a74ca6..d703c464 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VBindingTableEditor.java @@ -45,7 +45,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VBindingTableEditor extends AbstractComponentEditor { private Composite composite; @@ -93,6 +92,7 @@ public class VBindingTableEditor extends AbstractComponentEditor { if (composite == null) { context = new EMFDataBindingContext(); composite = createForm(parent, context, getMaster()); + } VirtualEntry<?> o = (VirtualEntry<?>) object; bindingViewer.setInput(o.getList()); @@ -110,10 +110,6 @@ public class VBindingTableEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VBindingTableEditor_BindingTables); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - bindingViewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); bindingViewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java index 5661672a..64232bb6 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java @@ -46,7 +46,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VCommandEditor extends AbstractComponentEditor { private Composite composite; @@ -114,10 +113,6 @@ public class VCommandEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VCommandEditor_Commands); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java index ab57532a..88994796 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java @@ -45,7 +45,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VHandlerEditor extends AbstractComponentEditor { private Composite composite; @@ -110,10 +109,6 @@ public class VHandlerEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VHandlerEditor_Handlers); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java index 637f2409..c12a3866 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VItemParametersEditor.java @@ -47,7 +47,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VItemParametersEditor extends AbstractComponentEditor { private Composite composite; @@ -114,10 +113,6 @@ public class VItemParametersEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VItemParametersEditor_Parameters); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java index 8870e43a..70c2d3a5 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuContributionsEditor.java @@ -45,7 +45,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VMenuContributionsEditor extends AbstractComponentEditor { private Composite composite; @@ -111,10 +110,6 @@ public class VMenuContributionsEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VMenuContributionsEditor_MenuContributions); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java index 0dcfffff..f5de8e8d 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VMenuEditor.java @@ -52,7 +52,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VMenuEditor extends AbstractComponentEditor { private Composite composite; @@ -135,10 +134,6 @@ public class VMenuEditor extends AbstractComponentEditor { parent = createScrollableContainer(folder); item.setControl(parent.getParent()); - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VMenuEditor_Menus); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java index 257c8e30..723342da 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelFragmentsEditor.java @@ -42,7 +42,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VModelFragmentsEditor extends AbstractComponentEditor { private Composite composite; @@ -96,10 +95,6 @@ public class VModelFragmentsEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VModelFragmentsEditor_Fragments); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java index 2e289aa0..80fb9be8 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VModelImportsEditor.java @@ -53,7 +53,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VModelImportsEditor extends AbstractComponentEditor { private Composite composite; @@ -107,10 +106,6 @@ public class VModelImportsEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VModelImportsEditor_Imports); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); viewer.setContentProvider(new ObservableListContentProvider()); viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages)); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java index 3175fe16..be122480 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java @@ -45,7 +45,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VPartDescriptor extends AbstractComponentEditor { private Composite composite; @@ -110,10 +109,6 @@ public class VPartDescriptor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VPartDescriptor_Descriptors); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); 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 4fa358dd..347d3363 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 @@ -52,7 +52,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VPerspectiveControlEditor extends AbstractComponentEditor { private Composite composite; @@ -145,10 +144,6 @@ public class VPerspectiveControlEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VWindowControlEditor_Controls); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java index e792c05e..cb58e942 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VRootBindingContexts.java @@ -45,7 +45,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VRootBindingContexts extends AbstractComponentEditor { private Composite composite; @@ -111,10 +110,6 @@ public class VRootBindingContexts extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VRootBindingContexts_Contexts); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); 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 1932fa06..df4eac39 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 @@ -42,7 +42,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VSnippetsEditor extends AbstractComponentEditor { private Composite composite; @@ -173,10 +172,6 @@ public class VSnippetsEditor extends AbstractComponentEditor { parent = createScrollableContainer(folder); item.setControl(parent.getParent()); - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VSnippetsEditor_Snippets); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java index 9b5552c2..ab026ff2 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VToolBarContributionsEditor.java @@ -45,7 +45,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VToolBarContributionsEditor extends AbstractComponentEditor { private Composite composite; @@ -110,10 +109,6 @@ public class VToolBarContributionsEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VToolBarContributionsEditor_Contributions); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java index 4a2c6b5d..196ed274 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VTrimContributionsEditor.java @@ -45,7 +45,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VTrimContributionsEditor extends AbstractComponentEditor { private Composite composite; @@ -110,10 +109,6 @@ public class VTrimContributionsEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VTrimContributionsEditor_Contributions); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); 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 1346d55b..cd6e97a2 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 @@ -52,7 +52,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VWindowControlEditor extends AbstractComponentEditor { private Composite composite; @@ -152,10 +151,6 @@ public class VWindowControlEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VWindowControlEditor_Controls); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java index 051f2413..99eb3d8e 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowEditor.java @@ -50,7 +50,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public abstract class VWindowEditor extends AbstractComponentEditor { private Composite composite; @@ -121,10 +120,6 @@ public abstract class VWindowEditor extends AbstractComponentEditor { parent = createScrollableContainer(folder); item.setControl(parent.getParent()); - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VWindowEditor_Windows); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); 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 64587f8a..32c985f9 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 @@ -51,7 +51,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VWindowSharedElementsEditor extends AbstractComponentEditor { private Composite composite; @@ -130,10 +129,6 @@ public class VWindowSharedElementsEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VWindowSharedElementsEditor_Controls); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java index 70fe2b3c..0ffae023 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowTrimEditor.java @@ -42,7 +42,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; public class VWindowTrimEditor extends AbstractComponentEditor { private Composite composite; @@ -107,10 +106,6 @@ public class VWindowTrimEditor extends AbstractComponentEditor { item.setControl(parent.getParent()); { - Label l = new Label(parent, SWT.NONE); - l.setText(Messages.VWindowTrimEditor_Controls); - l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - viewer = new TableViewer(parent); ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java index 9f80ed6b..1a9fa293 100644 --- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java +++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/ToolsPlugin.java @@ -11,7 +11,7 @@ import org.osgi.framework.BundleContext; public class ToolsPlugin extends AbstractUIPlugin { // The plug-in ID public static final String PLUGIN_ID = "org.eclipse.e4.tools"; //$NON-NLS-1$ - + private static ToolsPlugin plugin; private ResourceLocator resourceLocator; |