Bug 335531 - [ModelTooling] Replace NLS-Static stuff through service
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
index 16f2a45..87692fb 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java
@@ -18,9 +18,11 @@
import org.eclipse.emf.ecore.resource.Resource;
public class CommandToStringConverter extends Converter {
+ private Messages Messages;
- public CommandToStringConverter() {
+ public CommandToStringConverter(Messages Messages) {
super(MCommand.class, String.class);
+ this.Messages = Messages;
}
public Object convert(Object fromObject) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
index e9d75fe..b494088 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ImageTooltip.java
@@ -33,10 +33,11 @@
public abstract class ImageTooltip extends ToolTip {
private Image image;
+ private Messages Messages;
- public ImageTooltip(Control control) {
+ public ImageTooltip(Control control, Messages Messages) {
super(control);
-
+ this.Messages = Messages;
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
index e3afa16..5786d64 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java
@@ -16,8 +16,10 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.Util;
+import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.tools.services.Translation;
import org.eclipse.e4.ui.model.application.MApplicationElement;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.ecore.EObject;
@@ -46,6 +48,10 @@
@Inject
private IResourcePool resourcePool;
+ @Inject
+ @Translation
+ protected Messages Messages;
+
public EditingDomain getEditingDomain() {
return editingDomain;
}
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 ee83fd6..0253df7 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
@@ -10,580 +10,574 @@
******************************************************************************/
package org.eclipse.e4.tools.emf.ui.internal;
-import org.eclipse.osgi.util.NLS;
+public class Messages {
-public class Messages extends NLS {
+ public String ModelTooling_Common_Up;
+ public String ModelTooling_Common_Down;
+ public String ModelTooling_Common_AddEllipsis;
+ public String ModelTooling_Common_Add;
+ public String ModelTooling_Common_Remove;
+ public String ModelTooling_Common_Id;
+ public String ModelTooling_Common_RefId;
+ public String ModelTooling_Common_FindEllipsis;
- public static String ModelTooling_Common_Up;
- public static String ModelTooling_Common_Down;
- public static String ModelTooling_Common_AddEllipsis;
- public static String ModelTooling_Common_Add;
- public static String ModelTooling_Common_Remove;
- public static String ModelTooling_Common_Id;
- public static String ModelTooling_Common_RefId;
- public static String ModelTooling_Common_FindEllipsis;
+ public String ModelTooling_UIElement_ToBeRendered;
+ public String ModelTooling_UIElement_Visible;
+ public String ModelTooling_UIElement_VisibleWhen;
+ public String ModelTooling_UIElement_AccessibilityPhrase;
- public static String ModelTooling_UIElement_ToBeRendered;
- public static String ModelTooling_UIElement_Visible;
- public static String ModelTooling_UIElement_VisibleWhen;
- public static String ModelTooling_UIElement_AccessibilityPhrase;
+ public String ModelTooling_Context_Variables;
+ public String ModelTooling_Context_Properties;
- public static String ModelTooling_Context_Variables;
- public static String ModelTooling_Context_Properties;
+ public String ModelTooling_ApplicationElement_Tags;
+ public String ModelTooling_Contribution_PersistedState;
- public static String ModelTooling_ApplicationElement_Tags;
- public static String ModelTooling_Contribution_PersistedState;
+ public String AbstractCommandSelectionDialog_Label_CommandId;
- public static String AbstractCommandSelectionDialog_Label_CommandId;
+ public String ApplicationEditor_Label;
+ public String ApplicationEditor_Description;
+ public String ApplicationEditor_Handlers;
+ public String ApplicationEditor_PartDescriptors;
+ public String ApplicationEditor_BindingTables;
+ public String ApplicationEditor_Commands;
+ public String ApplicationEditor_Windows;
+ public String ApplicationEditor_Addons;
+ public String ApplicationEditor_MenuContributions;
+ public String ApplicationEditor_ToolBarContributions;
+ public String ApplicationEditor_TrimContributions;
+ public String ApplicationEditor_RootContexts;
+ public String ApplicationEditor_BindingContexts;
+ public String ApplicationEditor_Categories;
- public static String ApplicationEditor_Label;
- public static String ApplicationEditor_Description;
- public static String ApplicationEditor_Handlers;
- public static String ApplicationEditor_PartDescriptors;
- public static String ApplicationEditor_BindingTables;
- public static String ApplicationEditor_Commands;
- public static String ApplicationEditor_Windows;
- public static String ApplicationEditor_Addons;
- public static String ApplicationEditor_MenuContributions;
- public static String ApplicationEditor_ToolBarContributions;
- public static String ApplicationEditor_TrimContributions;
- public static String ApplicationEditor_RootContexts;
- public static String ApplicationEditor_BindingContexts;
- public static String ApplicationEditor_Categories;
+ public String BindingTableEditor_Label;
+ public String BindingTableEditor_Description;
+ public String BindingTableEditor_ContextId;
+ public String BindingTableEditor_Keybindings;
+ public String BindingTableEditor_KeySequence;
+ public String BindingTableEditor_Command;
+ public String BindingTableEditor_AddKeyBinding;
- public static String BindingTableEditor_Label;
- public static String BindingTableEditor_Description;
- public static String BindingTableEditor_ContextId;
- public static String BindingTableEditor_Keybindings;
- public static String BindingTableEditor_KeySequence;
- public static String BindingTableEditor_Command;
- public static String BindingTableEditor_AddKeyBinding;
+ public String CommandEditor_Label;
+ public String CommandEditor_Description;
+ public String CommandEditor_Name;
+ public String CommandEditor_LabelDescription;
+ public String CommandEditor_Parameters;
+ public String CommandEditor_ParameterName;
+ public String CommandEditor_ParameterTypeId;
+ public String CommandEditor_ParameterOptional;
+ public String CommandEditor_ParameterOptional_No;
+ public String CommandEditor_ParameterOptional_Yes;
+ public String CommandEditor_ParameterId;
+ public String CommandEditor_Category;
+ public String CommandEditor_AddCommandParameter;
- public static String CommandEditor_Label;
- public static String CommandEditor_Description;
- public static String CommandEditor_Name;
- public static String CommandEditor_LabelDescription;
- public static String CommandEditor_Parameters;
- public static String CommandEditor_ParameterName;
- public static String CommandEditor_ParameterTypeId;
- public static String CommandEditor_ParameterOptional;
- public static String CommandEditor_ParameterOptional_No;
- public static String CommandEditor_ParameterOptional_Yes;
- public static String CommandEditor_ParameterId;
- public static String CommandEditor_Category;
- public static String CommandEditor_AddCommandParameter;
+ public String DirectMenuItemEditor_Label;
+ public String DirectMenuItemEditor_Description;
+ public String DirectMenuItemEditor_ClassURI;
- public static String DirectMenuItemEditor_Label;
- public static String DirectMenuItemEditor_Description;
- public static String DirectMenuItemEditor_ClassURI;
+ public String ControlFactory_Key;
+ public String ControlFactory_Value;
+ public String ControlFactory_KeyValueShellTitle;
- public static String ControlFactory_Key;
- public static String ControlFactory_Value;
- public static String ControlFactory_KeyValueShellTitle;
+ public String DirectToolItemEditor_ClassURI;
+ public String DirectToolItemEditor_Label;
+ public String DirectToolItemEditor_Description;
- public static String DirectToolItemEditor_ClassURI;
- public static String DirectToolItemEditor_Label;
- public static String DirectToolItemEditor_Description;
+ public String HandledMenuItemEditor_Label;
+ public String HandledMenuItemEditor_Description;
+ public String HandledMenuItemEditor_Command;
+ public String HandledMenuItemEditor_Parameters;
+ public String HandledMenuItemEditor_Tag;
+ public String HandledMenuItemEditor_Value;
- public static String HandledMenuItemEditor_Label;
- public static String HandledMenuItemEditor_Description;
- public static String HandledMenuItemEditor_Command;
- public static String HandledMenuItemEditor_Parameters;
- public static String HandledMenuItemEditor_Tag;
- public static String HandledMenuItemEditor_Value;
+ public String HandledToolItemEditor_Command;
+ public String HandledToolItemEditor_Parameters;
+ public String HandledToolItemEditor_ParametersName;
+ public String HandledToolItemEditor_ParametersValue;
+ public String HandledToolItemEditor_Label;
+ public String HandledToolItemEditor_Description;
- public static String HandledToolItemEditor_Command;
- public static String HandledToolItemEditor_Parameters;
- public static String HandledToolItemEditor_ParametersName;
- public static String HandledToolItemEditor_ParametersValue;
- public static String HandledToolItemEditor_Label;
- public static String HandledToolItemEditor_Description;
+ public String HandlerEditor_Label;
+ public String HandlerEditor_Description;
+ public String HandlerEditor_Command;
+ public String HandlerEditor_ClassURI;
- public static String HandlerEditor_Label;
- public static String HandlerEditor_Description;
- public static String HandlerEditor_Command;
- public static String HandlerEditor_ClassURI;
+ public String InputPartEditor_Label;
+ public String InputPartEditor_InputURI;
- public static String InputPartEditor_Label;
- public static String InputPartEditor_InputURI;
+ public String KeyBindingEditor_Label;
+ public String KeyBindingEditor_Description;
+ public String KeyBindingEditor_Sequence;
+ public String KeyBindingEditor_Command;
+ public String KeyBindingEditor_Parameters;
+ public String KeyBindingEditor_SequenceNotComplete;
+ public String KeyBindingEditor_SequenceEmpty;
+ public String KeyBindingEditor_AddParameter;
- public static String KeyBindingEditor_Label;
- public static String KeyBindingEditor_Description;
- public static String KeyBindingEditor_Sequence;
- public static String KeyBindingEditor_Command;
- public static String KeyBindingEditor_Parameters;
- public static String KeyBindingEditor_SequenceNotComplete;
- public static String KeyBindingEditor_SequenceEmpty;
- public static String KeyBindingEditor_AddParameter;
+ public String MenuEditor_Label;
+ public String MenuEditor_Description;
+ public String MenuEditor_MenuItems;
+ public String MenuEditor_MenuItemType;
+ public String MenuEditor_MenuItemItemType;
+ public String MenuEditor_HandledMenuItem;
+ public String MenuEditor_Separator;
+ public String MenuEditor_Menu;
+ public String MenuEditor_DirectMenuItem;
+ public String MenuEditor_LabelLabel;
+ public String MenuEditor_Tooltip;
+ public String MenuEditor_IconURI;
+ public String MenuEditor_Children;
+ public String MenuEditor_Mnemonics;
+ public String MenuEditor_AddHandledMenuItem;
+ public String MenuEditor_AddMenu;
+ public String MenuEditor_AddDirectMenuItem;
+ public String MenuEditor_AddSeparator;
- public static String MenuEditor_Label;
- public static String MenuEditor_Description;
- public static String MenuEditor_MenuItems;
- public static String MenuEditor_MenuItemType;
- public static String MenuEditor_MenuItemItemType;
- public static String MenuEditor_HandledMenuItem;
- public static String MenuEditor_Separator;
- public static String MenuEditor_Menu;
- public static String MenuEditor_DirectMenuItem;
- public static String MenuEditor_LabelLabel;
- public static String MenuEditor_Tooltip;
- public static String MenuEditor_IconURI;
- public static String MenuEditor_Children;
- public static String MenuEditor_Mnemonics;
- public static String MenuEditor_AddHandledMenuItem;
- public static String MenuEditor_AddMenu;
- public static String MenuEditor_AddDirectMenuItem;
- public static String MenuEditor_AddSeparator;
+ public String MenuItemEditor_Type;
+ public String MenuItemEditor_Label;
+ public String MenuItemEditor_Tooltip;
+ public String MenuItemEditor_IconURI;
+ public String MenuEditor_MainMenu;
+ public String MenuItemEditor_Enabled;
+ public String MenuItemEditor_Selected;
+ public String MenuItemEditor_Mnemonics;
+ public String MenuItemEditor_NoExpression;
- public static String MenuItemEditor_Type;
- public static String MenuItemEditor_Label;
- public static String MenuItemEditor_Tooltip;
- public static String MenuItemEditor_IconURI;
- public static String MenuEditor_MainMenu;
- public static String MenuItemEditor_Enabled;
- public static String MenuItemEditor_Selected;
- public static String MenuItemEditor_Mnemonics;
- public static String MenuItemEditor_NoExpression;
+ public String MenuSeparatorEditor_Label;
- public static String MenuSeparatorEditor_Label;
+ public String PartDescriptorEditor_Label;
+ public String PartDescriptorEditor_Descriptor;
+ public String PartDescriptorEditor_LabelLabel;
+ public String PartDescriptorEditor_Tooltip;
+ public String PartDescriptorEditor_IconURI;
+ public String PartDescriptorEditor_ClassURI;
+ public String PartDescriptorEditor_Dirtyable;
+ public String PartDescriptorEditor_Closeable;
+ public String PartDescriptorEditor_Multiple;
+ public String PartDescriptorEditor_Category;
+ public String PartDescriptorEditor_Variables;
+ public String PartDescriptorEditor_Properties;
+ public String PartDescriptorEditor_PropertiesKey;
+ public String PartDescriptorEditor_PropertiesValue;
+ public String PartDescriptorEditor_Menus;
+ public String PartDescriptorEditor_Handlers;
+ public String PartDescriptorEditor_ContainerData;
- public static String PartDescriptorEditor_Label;
- public static String PartDescriptorEditor_Descriptor;
- public static String PartDescriptorEditor_LabelLabel;
- public static String PartDescriptorEditor_Tooltip;
- public static String PartDescriptorEditor_IconURI;
- public static String PartDescriptorEditor_ClassURI;
- public static String PartDescriptorEditor_Dirtyable;
- public static String PartDescriptorEditor_Closeable;
- public static String PartDescriptorEditor_Multiple;
- public static String PartDescriptorEditor_Category;
- public static String PartDescriptorEditor_Variables;
- public static String PartDescriptorEditor_Properties;
- public static String PartDescriptorEditor_PropertiesKey;
- public static String PartDescriptorEditor_PropertiesValue;
- public static String PartDescriptorEditor_Menus;
- public static String PartDescriptorEditor_Handlers;
- public static String PartDescriptorEditor_ContainerData;
+ public String PartEditor_Label;
+ public String PartEditor_Description;
+ public String PartEditor_LabelLabel;
+ public String PartEditor_Tooltip;
+ public String PartEditor_IconURI;
+ public String PartEditor_ClassURI;
+ public String PartEditor_Closeable;
+ public String PartEditor_Menus;
+ public String PartEditor_Handlers;
+ public String PartEditor_ContainerData;
+ public String PartEditor_ToolBar;
+ public String PartEditor_BindingContexts;
- public static String PartEditor_Label;
- public static String PartEditor_Description;
- public static String PartEditor_LabelLabel;
- public static String PartEditor_Tooltip;
- public static String PartEditor_IconURI;
- public static String PartEditor_ClassURI;
- public static String PartEditor_Closeable;
- public static String PartEditor_Menus;
- public static String PartEditor_Handlers;
- public static String PartEditor_ContainerData;
- public static String PartEditor_ToolBar;
- public static String PartEditor_BindingContexts;
+ public String PartSashContainerEditor_Label;
+ public String PartSashContainerEditor_Description;
+ public String PartSashContainerEditor_Orientation;
+ public String PartSashContainerEditor_Vertical;
+ public String PartSashContainerEditor_Horizontal;
+ public String PartSashContainerEditor_SelectedElement;
+ public String PartSashContainerEditor_Controls;
+ public String PartSashContainerEditor_ContainerData;
+ public String PartSashContainerEditor_AddPartSashContainer;
+ public String PartSashContainerEditor_AddPartStack;
+ public String PartSashContainerEditor_AddPart;
+ public String PartSashContainerEditor_AddInputPart;
+ public String PartSashContainerEditor_AddArea;
+ public String PartSashContainerEditor_AddPlaceholder;
- public static String PartSashContainerEditor_Label;
- public static String PartSashContainerEditor_Description;
- public static String PartSashContainerEditor_Orientation;
- public static String PartSashContainerEditor_Vertical;
- public static String PartSashContainerEditor_Horizontal;
- public static String PartSashContainerEditor_SelectedElement;
- public static String PartSashContainerEditor_Controls;
- public static String PartSashContainerEditor_ContainerData;
- public static String PartSashContainerEditor_AddPartSashContainer;
- public static String PartSashContainerEditor_AddPartStack;
- public static String PartSashContainerEditor_AddPart;
- public static String PartSashContainerEditor_AddInputPart;
- public static String PartSashContainerEditor_AddArea;
- public static String PartSashContainerEditor_AddPlaceholder;
+ public String PartStackEditor_Label;
+ public String PartStackEditor_Description;
+ public String PartStackEditor_SelectedElement;
+ public String PartStackEditor_Parts;
+ public String PartStackEditor_ContainerData;
+ public String PartStackEditor_AddPart;
+ public String PartStackEditor_AddInputPart;
+ public String PartStackEditor_AddPlaceholder;
- public static String PartStackEditor_Label;
- public static String PartStackEditor_Description;
- public static String PartStackEditor_SelectedElement;
- public static String PartStackEditor_Parts;
- public static String PartStackEditor_ContainerData;
- public static String PartStackEditor_AddPart;
- public static String PartStackEditor_AddInputPart;
- public static String PartStackEditor_AddPlaceholder;
+ public String PerspectiveEditor_Label;
+ public String PerspectiveEditor_Description;
+ public String PerspectiveEditor_LabelLabel;
+ public String PerspectiveEditor_SelectedElement;
+ public String PerspectiveEditor_Tooltip;
+ public String PerspectiveEditor_IconURI;
+ public String PerspectiveEditor_Controls;
+ public String PerspectiveEditor_AddPartSashContainer;
+ public String PerspectiveEditor_AddPartStack;
+ public String PerspectiveEditor_AddPart;
+ public String PerspectiveEditor_AddInputPart;
+ public String PerspectiveEditor_AddArea;
+ public String PerspectiveEditor_AddPlaceholder;
- public static String PerspectiveEditor_Label;
- public static String PerspectiveEditor_Description;
- public static String PerspectiveEditor_LabelLabel;
- public static String PerspectiveEditor_SelectedElement;
- public static String PerspectiveEditor_Tooltip;
- public static String PerspectiveEditor_IconURI;
- public static String PerspectiveEditor_Controls;
- public static String PerspectiveEditor_AddPartSashContainer;
- public static String PerspectiveEditor_AddPartStack;
- public static String PerspectiveEditor_AddPart;
- public static String PerspectiveEditor_AddInputPart;
- public static String PerspectiveEditor_AddArea;
- public static String PerspectiveEditor_AddPlaceholder;
+ public String PerspectiveStackEditor_Perspectives;
+ public String PerspectiveStackEditor_Label;
+ public String PerspectiveStackEditor_Description;
+ public String PerspectiveStackEditor_SelectedElement;
+ public String PerspectiveStackEditor_AddPerspective;
- public static String PerspectiveStackEditor_Perspectives;
- public static String PerspectiveStackEditor_Label;
- public static String PerspectiveStackEditor_Description;
- public static String PerspectiveStackEditor_SelectedElement;
- public static String PerspectiveStackEditor_AddPerspective;
+ public String PlaceholderEditor_Label;
+ public String PlaceholderEditor_Descriptor;
+ public String PlaceholderEditor_Reference;
- public static String PlaceholderEditor_Label;
- public static String PlaceholderEditor_Descriptor;
- public static String PlaceholderEditor_Reference;
+ public String ToolBarEditor_Label;
+ public String ToolBarEditor_Description;
+ public String ToolBarEditor_ToolbarItems;
+ public String ToolBarEditor_ToolbarItemsType;
+ public String ToolBarEditor_ToolbarItemsItemType;
+ public String ToolBarEditor_HandledToolItem;
+ public String ToolBarEditor_DirectToolItem;
+ public String ToolBarEditor_ToolControl;
+ public String ToolBarEditor_Separator;
+ public String ToolBarEditor_AddHandledToolItem;
+ public String ToolBarEditor_AddDirectToolItem;
+ public String ToolBarEditor_AddToolControl;
+ public String ToolBarEditor_AddToolBarSeparator;
- public static String ToolBarEditor_Label;
- public static String ToolBarEditor_Description;
- public static String ToolBarEditor_ToolbarItems;
- public static String ToolBarEditor_ToolbarItemsType;
- public static String ToolBarEditor_ToolbarItemsItemType;
- public static String ToolBarEditor_HandledToolItem;
- public static String ToolBarEditor_DirectToolItem;
- public static String ToolBarEditor_ToolControl;
- public static String ToolBarEditor_Separator;
- public static String ToolBarEditor_AddHandledToolItem;
- public static String ToolBarEditor_AddDirectToolItem;
- public static String ToolBarEditor_AddToolControl;
- public static String ToolBarEditor_AddToolBarSeparator;
+ public String ToolBarSeparatorEditor_Label;
- public static String ToolBarSeparatorEditor_Label;
+ public String ToolControlEditor_Label;
+ public String ToolControlEditor_Description;
+ public String ToolControlEditor_ClassURI;
- public static String ToolControlEditor_Label;
- public static String ToolControlEditor_Description;
- public static String ToolControlEditor_ClassURI;
+ public String VBindingTableEditor_Label;
+ public String VBindingTableEditor_Description;
+ public String VBindingTableEditor_Contexts;
+ public String VBindingTableEditor_Name;
+ public String VBindingTableEditor_LabelDescription;
+ public String VBindingTableEditor_BindingTables;
+ public String VBindingTableEditor_AddBindingTable;
- public static String VBindingTableEditor_Label;
- public static String VBindingTableEditor_Description;
- public static String VBindingTableEditor_Contexts;
- public static String VBindingTableEditor_Name;
- public static String VBindingTableEditor_LabelDescription;
- public static String VBindingTableEditor_BindingTables;
- public static String VBindingTableEditor_AddBindingTable;
+ public String AddonsEditor_ClassURI;
+ public String AddonsEditor_TreeLabel;
+ public String AddonsEditor_TreeLabelDescription;
+ public String AddonsEditor_Tags;
- public static String AddonsEditor_ClassURI;
- public static String AddonsEditor_TreeLabel;
- public static String AddonsEditor_TreeLabelDescription;
- public static String AddonsEditor_Tags;
+ public String ContributionClassDialog_DialogMessage;
+ public String ContributionClassDialog_DialogTitle;
+ public String ContributionClassDialog_Label_Classname;
+ public String ContributionClassDialog_ShellTitle;
- public static String ContributionClassDialog_DialogMessage;
- public static String ContributionClassDialog_DialogTitle;
- public static String ContributionClassDialog_Label_Classname;
- public static String ContributionClassDialog_ShellTitle;
+ public String MenuContributionEditor_MenuItems;
+ public String MenuContributionEditor_MenuItemType;
+ public String MenuContributionEditor_MenuItemItemType;
+ public String MenuContributionEditor_HandledMenuItem;
+ public String MenuContributionEditor_Separator;
+ public String MenuContributionEditor_Menu;
+ public String MenuContributionEditor_DirectMenuItem;
+ public String MenuContributionEditor_ParentId;
+ public String MenuContributionEditor_Position;
+ public String MenuContributionEditor_TreeLabel;
+ public String MenuContributionEditor_TreeLabelDescription;
- public static String MenuContributionEditor_MenuItems;
- public static String MenuContributionEditor_MenuItemType;
- public static String MenuContributionEditor_MenuItemItemType;
- public static String MenuContributionEditor_HandledMenuItem;
- public static String MenuContributionEditor_Separator;
- public static String MenuContributionEditor_Menu;
- public static String MenuContributionEditor_DirectMenuItem;
- public static String MenuContributionEditor_ParentId;
- public static String MenuContributionEditor_Position;
- public static String MenuContributionEditor_TreeLabel;
- public static String MenuContributionEditor_TreeLabelDescription;
+ public String ModelFragmentsEditor_ModelFragments;
+ public String ModelFragmentsEditor_Label;
+ public String ModelFragmentsEditor_Description;
+ public String ModelFragmentsEditor_Imports;
- public static String ModelFragmentsEditor_ModelFragments;
- public static String ModelFragmentsEditor_Label;
- public static String ModelFragmentsEditor_Description;
- public static String ModelFragmentsEditor_Imports;
+ public String StringModelFragment_Label;
+ public String StringModelFragment_Description;
+ public String StringModelFragment_Featurename;
+ public String StringModelFragment_ParentId;
+ public String StringModelFragment_PositionInList;
+ public String StringModelFragment_Elements;
- public static String StringModelFragment_Label;
- public static String StringModelFragment_Description;
- public static String StringModelFragment_Featurename;
- public static String StringModelFragment_ParentId;
- public static String StringModelFragment_PositionInList;
- public static String StringModelFragment_Elements;
-
- public static String FeatureSelectionDialog_Filter;
- public static String FeatureSelectionDialog_ShellTitle;
- public static String FeatureSelectionDialog_DialogTitle;
- public static String FeatureSelectionDialog_DialogMessage;
-
- public static String CategoryEditor_TreeLabel;
- public static String CategoryEditor_TreeLabelDescriptor;
- public static String CategoryEditor_Name;
- public static String CategoryEditor_Description;
- public static String CategoryEditor_Tags;
+ public String FeatureSelectionDialog_Filter;
+ public String FeatureSelectionDialog_ShellTitle;
+ public String FeatureSelectionDialog_DialogTitle;
+ public String FeatureSelectionDialog_DialogMessage;
- public static String CommandCategorySelectionDialog_LabelCategoryId;
+ public String CategoryEditor_TreeLabel;
+ public String CategoryEditor_TreeLabelDescriptor;
+ public String CategoryEditor_Name;
+ public String CategoryEditor_Description;
+ public String CategoryEditor_Tags;
- public static String BindingContextSelectionDialog_LabelContextId;
+ public String CommandCategorySelectionDialog_LabelCategoryId;
- public static String ComponentLabelProvider_invisible;
- public static String ComponentLabelProvider_notrendered;
+ public String BindingContextSelectionDialog_LabelContextId;
- public static String BindingContextEditor_TreeLabel;
- public static String BindingContextEditor_TreeLabelDescription;
- public static String BindingContextEditor_Name;
- public static String BindingContextEditor_Description;
- public static String BindingContextEditor_Subcontexts;
- public static String BindingContextEditor_AddContext;
+ public String ComponentLabelProvider_invisible;
+ public String ComponentLabelProvider_notrendered;
- public static String CommandParameterEditor_TreeLabel;
- public static String CommandParameterEditor_TreeLabelDescritpion;
- public static String CommandParameterEditor_Name;
- public static String CommandParameterEditor_TypeId;
- public static String CommandParameterEditor_Optional;
+ public String BindingContextEditor_TreeLabel;
+ public String BindingContextEditor_TreeLabelDescription;
+ public String BindingContextEditor_Name;
+ public String BindingContextEditor_Description;
+ public String BindingContextEditor_Subcontexts;
+ public String BindingContextEditor_AddContext;
- public static String ParameterEditor_TreeLabel;
- public static String ParameterEditor_TreeLabelDescription;
- public static String ParameterEditor_Name;
- public static String ParameterEditor_Value;
+ public String CommandParameterEditor_TreeLabel;
+ public String CommandParameterEditor_TreeLabelDescritpion;
+ public String CommandParameterEditor_Name;
+ public String CommandParameterEditor_TypeId;
+ public String CommandParameterEditor_Optional;
- public static String PopupMenuEditor_TreeLabel;
- public static String PopupMenuEditor_TreeLabelDescription;
+ public String ParameterEditor_TreeLabel;
+ public String ParameterEditor_TreeLabelDescription;
+ public String ParameterEditor_Name;
+ public String ParameterEditor_Value;
- public static String RenderedMenuEditor_TreeLabel;
+ public String PopupMenuEditor_TreeLabel;
+ public String PopupMenuEditor_TreeLabelDescription;
- public static String RenderedMenuItem_TreeLabel;
- public static String RenderedMenuItem_TreeLabelDescription;
+ public String RenderedMenuEditor_TreeLabel;
- public static String RenderedToolBarEditor_TreeLabel;
+ public String RenderedMenuItem_TreeLabel;
+ public String RenderedMenuItem_TreeLabelDescription;
- public static String ToolBarContributionEditor_TreeLabel;
- public static String ToolBarContributionEditor_TreeLabelDescription;
+ public String RenderedToolBarEditor_TreeLabel;
- public static String ToolItemEditor_Type;
- public static String ToolItemEditor_Label;
- public static String ToolItemEditor_ToolTip;
- public static String ToolItemEditor_IconURI;
- public static String ToolItemEditor_Enabled;
- public static String ToolItemEditor_Selected;
- public static String ToolItemEditor_NoExpression;
+ public String ToolBarContributionEditor_TreeLabel;
+ public String ToolBarContributionEditor_TreeLabelDescription;
- public static String TrimBarEditor_TreeLabel;
- public static String TrimBarEditor_TreeLabelDescription;
- public static String TrimBarEditor_Side;
- public static String TrimBarEditor_Controls;
- public static String TrimBarEditor_AddToolBar;
- public static String TrimBarEditor_AddToolControl;
+ public String ToolItemEditor_Type;
+ public String ToolItemEditor_Label;
+ public String ToolItemEditor_ToolTip;
+ public String ToolItemEditor_IconURI;
+ public String ToolItemEditor_Enabled;
+ public String ToolItemEditor_Selected;
+ public String ToolItemEditor_NoExpression;
- public static String TrimContributionEditor_TreeLabel;
- public static String TrimContributionEditor_TreeLabelDescription;
- public static String TrimContributionEditor_ParentId;
- public static String TrimContributionEditor_Position;
- public static String TrimContributionEditor_Controls;
+ public String TrimBarEditor_TreeLabel;
+ public String TrimBarEditor_TreeLabelDescription;
+ public String TrimBarEditor_Side;
+ public String TrimBarEditor_Controls;
+ public String TrimBarEditor_AddToolBar;
+ public String TrimBarEditor_AddToolControl;
- public static String TrimmedWindowEditor_TrimBars;
- public static String TrimmedWindowEditor_TreeLabel;
+ public String TrimContributionEditor_TreeLabel;
+ public String TrimContributionEditor_TreeLabelDescription;
+ public String TrimContributionEditor_ParentId;
+ public String TrimContributionEditor_Position;
+ public String TrimContributionEditor_Controls;
- public static String WindowEditor_AddMainMenu;
- public static String WindowEditor_TreeLabel;
- public static String WindowEditor_TreeLabelDescription;
- public static String WindowEditor_X;
- public static String WindowEditor_Y;
- public static String WindowEditor_Width;
- public static String WindowEditor_Height;
- public static String WindowEditor_Label;
- public static String WindowEditor_Tooltip;
- public static String WindowEditor_IconURI;
- public static String WindowEditor_MainMenu;
- public static String WindowEditor_SelectedElement;
- public static String WindowEditor_BindingContexts;
- public static String WindowEditor_Handlers;
- public static String WindowEditor_Windows;
- public static String WindowEditor_Controls;
- public static String WindowEditor_SharedElements;
+ public String TrimmedWindowEditor_TrimBars;
+ public String TrimmedWindowEditor_TreeLabel;
- public static String VApplicationAddons_AddAddon;
- public static String VApplicationAddons_TreeLabel;
- public static String VApplicationAddons_TreeLabelDescription;
- public static String VApplicationAddons_Commands;
+ public String WindowEditor_AddMainMenu;
+ public String WindowEditor_TreeLabel;
+ public String WindowEditor_TreeLabelDescription;
+ public String WindowEditor_X;
+ public String WindowEditor_Y;
+ public String WindowEditor_Width;
+ public String WindowEditor_Height;
+ public String WindowEditor_Label;
+ public String WindowEditor_Tooltip;
+ public String WindowEditor_IconURI;
+ public String WindowEditor_MainMenu;
+ public String WindowEditor_SelectedElement;
+ public String WindowEditor_BindingContexts;
+ public String WindowEditor_Handlers;
+ public String WindowEditor_Windows;
+ public String WindowEditor_Controls;
+ public String WindowEditor_SharedElements;
- public static String VApplicationCategoriesEditor_TreeLabel;
- public static String VApplicationCategoriesEditor_TreeLabelDescription;
- public static String VApplicationCategoriesEditor_Categories;
- public static String VApplicationCategoriesEditor_AddCategory;
+ public String VApplicationAddons_AddAddon;
+ public String VApplicationAddons_TreeLabel;
+ public String VApplicationAddons_TreeLabelDescription;
+ public String VApplicationAddons_Commands;
- public static String VCommandEditor_TreeLabel;
- public static String VCommandEditor_TreeLabelDescription;
- public static String VCommandEditor_Commands;
- public static String VCommandEditor_AddCommand;
+ public String VApplicationCategoriesEditor_TreeLabel;
+ public String VApplicationCategoriesEditor_TreeLabelDescription;
+ public String VApplicationCategoriesEditor_Categories;
+ public String VApplicationCategoriesEditor_AddCategory;
- public static String VHandlerEditor_TreeLabel;
- public static String VHandlerEditor_TreeLabelDescription;
- public static String VHandlerEditor_Handlers;
- public static String VHandlerEditor_AddHandler;
+ public String VCommandEditor_TreeLabel;
+ public String VCommandEditor_TreeLabelDescription;
+ public String VCommandEditor_Commands;
+ public String VCommandEditor_AddCommand;
- public static String VMenuContributionsEditor_TreeLabel;
- public static String VMenuContributionsEditor_TreeLabelDescription;
- public static String VMenuContributionsEditor_MenuContributions;
- public static String VMenuContributionsEditor_AddMenuContribution;
+ public String VHandlerEditor_TreeLabel;
+ public String VHandlerEditor_TreeLabelDescription;
+ public String VHandlerEditor_Handlers;
+ public String VHandlerEditor_AddHandler;
- public static String VMenuEditor_TreeLabel;
- public static String VMenuEditor_TreeLabelDescription;
- public static String VMenuEditor_Menus;
- public static String VMenuEditor_AddMenuContribution;
+ public String VMenuContributionsEditor_TreeLabel;
+ public String VMenuContributionsEditor_TreeLabelDescription;
+ public String VMenuContributionsEditor_MenuContributions;
+ public String VMenuContributionsEditor_AddMenuContribution;
- public static String VModelFragmentsEditor_TreeLabel;
- public static String VModelFragmentsEditor_TreeLabelDescription;
- public static String VModelFragmentsEditor_Fragments;
+ public String VMenuEditor_TreeLabel;
+ public String VMenuEditor_TreeLabelDescription;
+ public String VMenuEditor_Menus;
+ public String VMenuEditor_AddMenuContribution;
- public static String VModelImportsEditor_TreeLabel;
- public static String VModelImportsEditor_TreeLabelDescription;
- public static String VModelImportsEditor_Imports;
+ public String VModelFragmentsEditor_TreeLabel;
+ public String VModelFragmentsEditor_TreeLabelDescription;
+ public String VModelFragmentsEditor_Fragments;
- public static String VPartDescriptor_TreeLabel;
- public static String VPartDescriptor_TreeLabelDescription;
- public static String VPartDescriptor_Descriptors;
- public static String VPartDescriptor_AddPartDescriptor;
+ public String VModelImportsEditor_TreeLabel;
+ public String VModelImportsEditor_TreeLabelDescription;
+ public String VModelImportsEditor_Imports;
- public static String VToolBarContributionsEditor_Contributions;
- public static String VToolBarContributionsEditor_TreeLabelDescription;
- public static String VToolBarContributionsEditor_TreeLabel;
- public static String VToolBarContributionsEditor_AddToolBarContribution;
+ public String VPartDescriptor_TreeLabel;
+ public String VPartDescriptor_TreeLabelDescription;
+ public String VPartDescriptor_Descriptors;
+ public String VPartDescriptor_AddPartDescriptor;
- public static String VTrimContributionsEditor_TreeLabel;
- public static String VTrimContributionsEditor_TreeLabelDescription;
- public static String VTrimContributionsEditor_Contributions;
- public static String VTrimContributionsEditor_AddTrimContribution;
+ public String VToolBarContributionsEditor_Contributions;
+ public String VToolBarContributionsEditor_TreeLabelDescription;
+ public String VToolBarContributionsEditor_TreeLabel;
+ public String VToolBarContributionsEditor_AddToolBarContribution;
- public static String VWindowControlEditor_TreeLabel;
- public static String VWindowControlEditor_TreeLabelDescription;
- public static String VWindowControlEditor_Controls;
- public static String VWindowControlEditor_AddPerspectiveStack;
- public static String VWindowControlEditor_AddPartSashContainer;
- public static String VWindowControlEditor_AddPartStack;
- public static String VWindowControlEditor_AddPart;
- public static String VWindowControlEditor_AddInputPart;
- public static String VWindowControlEditor_AddArea;
+ public String VTrimContributionsEditor_TreeLabel;
+ public String VTrimContributionsEditor_TreeLabelDescription;
+ public String VTrimContributionsEditor_Contributions;
+ public String VTrimContributionsEditor_AddTrimContribution;
- public static String VWindowEditor_TreeLabel;
- public static String VWindowEditor_TreeLabelDescription;
- public static String VWindowEditor_Windows;
- public static String VWindowEditor_AddTrimmedWindow;
- public static String VWindowEditor_AddWindow;
+ public String VWindowControlEditor_TreeLabel;
+ public String VWindowControlEditor_TreeLabelDescription;
+ public String VWindowControlEditor_Controls;
+ public String VWindowControlEditor_AddPerspectiveStack;
+ public String VWindowControlEditor_AddPartSashContainer;
+ public String VWindowControlEditor_AddPartStack;
+ public String VWindowControlEditor_AddPart;
+ public String VWindowControlEditor_AddInputPart;
+ public String VWindowControlEditor_AddArea;
- public static String VWindowSharedElementsEditor_TreeLabel;
- public static String VWindowSharedElementsEditor_TreeLabelDescription;
- public static String VWindowSharedElementsEditor_Controls;
- public static String VWindowSharedElementsEditor_AddPartSashContainer;
- public static String VWindowSharedElementsEditor_AddPart;
- public static String VWindowSharedElementsEditor_AddInputPart;
+ public String VWindowEditor_TreeLabel;
+ public String VWindowEditor_TreeLabelDescription;
+ public String VWindowEditor_Windows;
+ public String VWindowEditor_AddTrimmedWindow;
+ public String VWindowEditor_AddWindow;
- public static String VWindowTrimEditor_TreeLabel;
- public static String VWindowTrimEditor_TreeLabelDescription;
- public static String VWindowTrimEditor_Controls;
- public static String VWindowTrimEditor_AddWindowTrim;
+ public String VWindowSharedElementsEditor_TreeLabel;
+ public String VWindowSharedElementsEditor_TreeLabelDescription;
+ public String VWindowSharedElementsEditor_Controls;
+ public String VWindowSharedElementsEditor_AddPartSashContainer;
+ public String VWindowSharedElementsEditor_AddPart;
+ public String VWindowSharedElementsEditor_AddInputPart;
- public static String AbstractIconDialog_IconName;
+ public String VWindowTrimEditor_TreeLabel;
+ public String VWindowTrimEditor_TreeLabelDescription;
+ public String VWindowTrimEditor_Controls;
+ public String VWindowTrimEditor_AddWindowTrim;
- public static String BindingContextSelectionDialog_ShellTitle;
- public static String BindingContextSelectionDialog_Title;
- public static String BindingContextSelectionDialog_Message;
- public static String BindingContextSelectionDialog_NoIdReference;
+ public String AbstractIconDialog_IconName;
- public static String CommandCategorySelectionDialog_ShellTitle;
- public static String CommandCategorySelectionDialog_Title;
- public static String CommandCategorySelectionDialog_Message;
+ public String BindingContextSelectionDialog_ShellTitle;
+ public String BindingContextSelectionDialog_Title;
+ public String BindingContextSelectionDialog_Message;
+ public String BindingContextSelectionDialog_NoIdReference;
- public static String FindImportElementDialog_ShellTitle;
- public static String FindImportElementDialog_Title;
- public static String FindImportElementDialog_Message;
- public static String FindImportElementDialog_Search;
- public static String FindImportElementDialog_ClearCache;
- public static String FindImportElementDialog_NoIdReference;
- public static String FindImportElementDialog_noId;
+ public String CommandCategorySelectionDialog_ShellTitle;
+ public String CommandCategorySelectionDialog_Title;
+ public String CommandCategorySelectionDialog_Message;
- public static String FindParentReferenceElementDialog_ShellTitle;
- public static String FindParentReferenceElementDialog_Title;
- public static String FindParentReferenceElementDialog_Message;
- public static String FindParentReferenceElementDialog_ContainerType;
- public static String FindParentReferenceElementDialog_Search;
- public static String FindParentReferenceElementDialog_NoId;
- public static String FindParentReferenceElementDialog_ClearCache;
- public static String FindParentReferenceElementDialog_NoReferenceId;
+ public String FindImportElementDialog_ShellTitle;
+ public String FindImportElementDialog_Title;
+ public String FindImportElementDialog_Message;
+ public String FindImportElementDialog_Search;
+ public String FindImportElementDialog_ClearCache;
+ public String FindImportElementDialog_NoIdReference;
+ public String FindImportElementDialog_noId;
- public static String HandledMenuItemCommandSelectionDialog_ShellTitle;
- public static String HandledMenuItemCommandSelectionDialog_DialogTitle;
- public static String HandledMenuItemCommandSelectionDialog_DialogMessage;
+ public String FindParentReferenceElementDialog_ShellTitle;
+ public String FindParentReferenceElementDialog_Title;
+ public String FindParentReferenceElementDialog_Message;
+ public String FindParentReferenceElementDialog_ContainerType;
+ public String FindParentReferenceElementDialog_Search;
+ public String FindParentReferenceElementDialog_NoId;
+ public String FindParentReferenceElementDialog_ClearCache;
+ public String FindParentReferenceElementDialog_NoReferenceId;
- public static String HandledToolItemCommandSelectionDialog_ShellTitle;
- public static String HandledToolItemCommandSelectionDialog_DialogTitle;
- public static String HandledToolItemCommandSelectionDialog_DialogMessage;
+ public String HandledMenuItemCommandSelectionDialog_ShellTitle;
+ public String HandledMenuItemCommandSelectionDialog_DialogTitle;
+ public String HandledMenuItemCommandSelectionDialog_DialogMessage;
- public static String HandlerCommandSelectionDialog_ShellTitle;
- public static String HandlerCommandSelectionDialog_DialogTitle;
- public static String HandlerCommandSelectionDialog_DialogMessage;
+ public String HandledToolItemCommandSelectionDialog_ShellTitle;
+ public String HandledToolItemCommandSelectionDialog_DialogTitle;
+ public String HandledToolItemCommandSelectionDialog_DialogMessage;
- public static String KeyBindingCommandSelectionDialog_ShellTitle;
- public static String KeyBindingCommandSelectionDialog_DialogTitle;
- public static String KeyBindingCommandSelectionDialog_DialogMessage;
+ public String HandlerCommandSelectionDialog_ShellTitle;
+ public String HandlerCommandSelectionDialog_DialogTitle;
+ public String HandlerCommandSelectionDialog_DialogMessage;
- public static String MenuIconDialogEditor_ShellTitle;
- public static String MenuIconDialogEditor_DialogTitle;
- public static String MenuIconDialogEditor_DialogMessage;
+ public String KeyBindingCommandSelectionDialog_ShellTitle;
+ public String KeyBindingCommandSelectionDialog_DialogTitle;
+ public String KeyBindingCommandSelectionDialog_DialogMessage;
- public static String MenuItemIconDialogEditor_ShellTitle;
- public static String MenuItemIconDialogEditor_DialogTitle;
- public static String MenuItemIconDialogEditor_DialogMessage;
+ public String MenuIconDialogEditor_ShellTitle;
+ public String MenuIconDialogEditor_DialogTitle;
+ public String MenuIconDialogEditor_DialogMessage;
- public static String PartDescriptorIconDialogEditor_ShellTitle;
- public static String PartDescriptorIconDialogEditor_DialogTitle;
- public static String PartDescriptorIconDialogEditor_DialogMessage;
+ public String MenuItemIconDialogEditor_ShellTitle;
+ public String MenuItemIconDialogEditor_DialogTitle;
+ public String MenuItemIconDialogEditor_DialogMessage;
- public static String PartIconDialogEditor_ShellTitle;
- public static String PartIconDialogEditor_DialogTitle;
- public static String PartIconDialogEditor_DialogMessage;
+ public String PartDescriptorIconDialogEditor_ShellTitle;
+ public String PartDescriptorIconDialogEditor_DialogTitle;
+ public String PartDescriptorIconDialogEditor_DialogMessage;
- public static String PerspectiveIconDialogEditor_ShellTitle;
- public static String PerspectiveIconDialogEditor_DialogTitle;
- public static String PerspectiveIconDialogEditor_DialogMessage;
+ public String PartIconDialogEditor_ShellTitle;
+ public String PartIconDialogEditor_DialogTitle;
+ public String PartIconDialogEditor_DialogMessage;
- public static String SharedElementsDialog_ShellTitle;
- public static String SharedElementsDialog_Title;
- public static String SharedElementsDialog_Message;
- public static String SharedElementsDialog_Name;
+ public String PerspectiveIconDialogEditor_ShellTitle;
+ public String PerspectiveIconDialogEditor_DialogTitle;
+ public String PerspectiveIconDialogEditor_DialogMessage;
- public static String ToolItemIconDialogEditor_ShellTitle;
- public static String ToolItemIconDialogEditor_DialogTitle;
- public static String ToolItemIconDialogEditor_DialogMessage;
+ public String SharedElementsDialog_ShellTitle;
+ public String SharedElementsDialog_Title;
+ public String SharedElementsDialog_Message;
+ public String SharedElementsDialog_Name;
- public static String WindowIconDialogEditor_ShellTitle;
- public static String WindowIconDialogEditor_DialogTitle;
- public static String WindowIconDialogEditor_DialogMessage;
+ public String ToolItemIconDialogEditor_ShellTitle;
+ public String ToolItemIconDialogEditor_DialogTitle;
+ public String ToolItemIconDialogEditor_DialogMessage;
- public static String ImageTooltip_UnknownError;
- public static String ImageTooltip_FileNotFound;
- public static String ImageTooltip_Icon;
- public static String ImageTooltip_Name;
- public static String ImageTooltip_Dimension;
- public static String ImageTooltip_FileSize;
+ public String WindowIconDialogEditor_ShellTitle;
+ public String WindowIconDialogEditor_DialogTitle;
+ public String WindowIconDialogEditor_DialogMessage;
- public static String VItemParametersEditor_TreeLabel;
- public static String VItemParametersEditor_TreeLabelDescription;
- public static String VItemParametersEditor_Parameters;
- public static String VItemParametersEditor_AddParameter;
+ public String ImageTooltip_UnknownError;
+ public String ImageTooltip_FileNotFound;
+ public String ImageTooltip_Icon;
+ public String ImageTooltip_Name;
+ public String ImageTooltip_Dimension;
+ public String ImageTooltip_FileSize;
- public static String CoreExpressionEditor_TreeLabel;
- public static String CoreExpressionEditor_TreeLabelDescription;
- public static String CoreExpressionEditor_ExpressionId;
+ public String VItemParametersEditor_TreeLabel;
+ public String VItemParametersEditor_TreeLabelDescription;
+ public String VItemParametersEditor_Parameters;
+ public String VItemParametersEditor_AddParameter;
- public static String ExpressionIdDialog_ShellTitle;
- public static String ExpressionIdDialog_DialogTitle;
- public static String ExpressionIdDialog_DialogMessage;
- public static String ExpressionIdDialog_Id;
+ public String CoreExpressionEditor_TreeLabel;
+ public String CoreExpressionEditor_TreeLabelDescription;
+ public String CoreExpressionEditor_ExpressionId;
- public static String CommandToStringConverter_None;
+ public String ExpressionIdDialog_ShellTitle;
+ public String ExpressionIdDialog_DialogTitle;
+ public String ExpressionIdDialog_DialogMessage;
+ public String ExpressionIdDialog_Id;
- public static String VRootBindingContexts_AddContext;
- public static String VRootBindingContexts_TreeLabel;
- public static String VRootBindingContexts_TreeLabelDescription;
- public static String VRootBindingContexts_Contexts;
+ public String CommandToStringConverter_None;
- public static String AreaEditor_Label;
- public static String AreaEditor_Description;
- public static String AreaEditor_Orientation;
- public static String AreaEditor_Horizontal;
- public static String AreaEditor_SelectedElement;
- public static String AreaEditor_ContainerData;
- public static String AreaEditor_Controls;
- public static String AreaEditor_Vertical;
- public static String AreaEditor_LabelLabel;
- public static String AreaEditor_Tooltip;
- public static String AreaEditor_IconURI;
+ public String VRootBindingContexts_AddContext;
+ public String VRootBindingContexts_TreeLabel;
+ public String VRootBindingContexts_TreeLabelDescription;
+ public String VRootBindingContexts_Contexts;
- public static String AreaIconDialogEditor_ShellTitle;
- public static String AreaIconDialogEditor_DialogTitle;
- public static String AreaIconDialogEditor_DialogMessage;
+ public String AreaEditor_Label;
+ public String AreaEditor_Description;
+ public String AreaEditor_Orientation;
+ public String AreaEditor_Horizontal;
+ public String AreaEditor_SelectedElement;
+ public String AreaEditor_ContainerData;
+ public String AreaEditor_Controls;
+ public String AreaEditor_Vertical;
+ public String AreaEditor_LabelLabel;
+ public String AreaEditor_Tooltip;
+ public String AreaEditor_IconURI;
- public static String ModelEditor_Delete;
+ public String AreaIconDialogEditor_ShellTitle;
+ public String AreaIconDialogEditor_DialogTitle;
+ public String AreaIconDialogEditor_DialogMessage;
- static {
- NLS.initializeMessages(Messages.class.getName(), Messages.class);
- }
-}
+ public String ModelEditor_Delete;
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
index 22653dd..f7e54e9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java
@@ -33,6 +33,8 @@
private Font font;
+ private Messages Messages;
+
private static Styler NOT_RENDERED_STYLER = new Styler() {
{
JFaceResources.getColorRegistry().put(NOT_RENDERED_KEY, new RGB(200, 200, 200));
@@ -44,8 +46,9 @@
}
};
- public ComponentLabelProvider(ModelEditor editor) {
+ public ComponentLabelProvider(ModelEditor editor, Messages Messages) {
this.editor = editor;
+ this.Messages = Messages;
}
@Override
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 35ff67a..0334871 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
@@ -117,6 +117,7 @@
import org.eclipse.e4.tools.services.IClipboardService;
import org.eclipse.e4.tools.services.IClipboardService.Handler;
import org.eclipse.e4.tools.services.IResourcePool;
+import org.eclipse.e4.tools.services.Translation;
import org.eclipse.e4.ui.di.Focus;
import org.eclipse.e4.ui.di.Persist;
import org.eclipse.e4.ui.model.application.MApplicationElement;
@@ -233,6 +234,10 @@
@Optional
private IExtensionLookup extensionLookup;
+ @Inject
+ @Translation
+ private Messages messages;
+
private ObservablesManager obsManager;
private final IResourcePool resourcePool;
@@ -244,7 +249,10 @@
this.context = context;
this.context.set(ModelEditor.class, this);
this.obsManager = new ObservablesManager();
+ }
+ @PostConstruct
+ void postCreate(Composite composite) {
context.set(ModelEditor.class, this);
context.set(IResourcePool.class, resourcePool);
context.set(EditingDomain.class, modelProvider.getEditingDomain());
@@ -394,7 +402,7 @@
}
if (o.eContainer() != null) {
- actions.add(new Action(Messages.ModelEditor_Delete, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
+ actions.add(new Action(messages.ModelEditor_Delete, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) {
public void run() {
if (o.eContainingFeature().isMany()) {
Command cmd = RemoveCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o.eContainer(), o.eContainingFeature(), o);
@@ -420,10 +428,6 @@
}
});
viewer.getControl().setMenu(mgr.createContextMenu(viewer.getControl()));
- }
-
- @PostConstruct
- void postCreate() {
viewer.setSelection(new StructuredSelection(modelProvider.getRoot()));
}
@@ -527,7 +531,7 @@
ShadowComposite editingArea = new ShadowComposite(parent, SWT.NONE);
editingArea.setLayout(new FillLayout());
final TreeViewer viewer = new TreeViewer(editingArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
- viewer.setLabelProvider(new ComponentLabelProvider(this));
+ viewer.setLabelProvider(new ComponentLabelProvider(this, messages));
ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider(new ObservableFactoryImpl(), new TreeStructureAdvisorImpl());
viewer.setContentProvider(contentProvider);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
index 187100e..6a88ffc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java
@@ -22,7 +22,6 @@
import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
import org.eclipse.e4.ui.model.application.MContribution;
@@ -131,7 +130,7 @@
}
if (getEditor().isModelFragment() && isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -177,14 +176,14 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+ ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
dialog.open();
}
});
}
- ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createStringListWidget(parent, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.AddonsEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index b939e4b..7f73e00 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -15,7 +15,6 @@
import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -125,8 +124,8 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createStringListWidget(parent, this, Messages.ApplicationEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ApplicationEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
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 a1a04c1..2f3af7c 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
@@ -21,7 +21,6 @@
import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.AreaIconDialogEditor;
@@ -168,7 +167,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -199,7 +198,7 @@
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
- new ImageTooltip(t) {
+ new ImageTooltip(t, Messages) {
@Override
protected URI getImageURI() {
@@ -219,7 +218,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPart) getMaster().getValue());
+ AreaIconDialogEditor dialog = new AreaIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPart) getMaster().getValue(), Messages);
dialog.open();
}
});
@@ -273,7 +272,7 @@
viewer.getControl().setLayoutData(gd);
ObservableListContentProvider cp = new ObservableListContentProvider();
viewer.setContentProvider(cp);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
viewer.setInput(prop.observeDetail(getMaster()));
@@ -391,7 +390,7 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
index 0d11403..86b346b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingContextEditor.java
@@ -20,7 +20,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.ui.model.application.commands.MBindingContext;
@@ -151,7 +150,7 @@
}
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -170,7 +169,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN);
viewer.setInput(prop.observeDetail(master));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
index 8910c27..c389c96 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java
@@ -20,7 +20,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.BindingContextSelectionDialog;
@@ -145,7 +144,7 @@
}
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -177,7 +176,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(b.getShell(), getEditor().getModelProvider());
+ BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(b.getShell(), getEditor().getModelProvider(), Messages);
if (dialog.open() == BindingContextSelectionDialog.OK) {
Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT_ID, dialog.getSelectedId());
if (cmd.canExecute()) {
@@ -200,7 +199,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
IEMFListProperty prop = EMFProperties.list(CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS);
viewer.setInput(prop.observeDetail(getMaster()));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
index 37feab8..b6e35c2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CategoryEditor.java
@@ -16,7 +16,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -109,7 +108,7 @@
}
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -117,7 +116,7 @@
ControlFactory.createTextField(parent, Messages.ModelTooling_Common_Id, master, context, textProp, EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID));
ControlFactory.createTextField(parent, Messages.CategoryEditor_Name, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__NAME));
ControlFactory.createTextField(parent, Messages.CategoryEditor_Description, master, context, textProp, EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.CATEGORY__DESCRIPTION));
- ControlFactory.createStringListWidget(parent, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.CategoryEditor_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index d0b144a..a49e84e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -19,7 +19,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.CommandCategorySelectionDialog;
@@ -142,7 +141,7 @@
}
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -205,7 +204,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- CommandCategorySelectionDialog dialog = new CommandCategorySelectionDialog(b.getShell(), getEditor().getModelProvider(), (MCommand) getMaster().getValue());
+ CommandCategorySelectionDialog dialog = new CommandCategorySelectionDialog(b.getShell(), getEditor().getModelProvider(), (MCommand) getMaster().getValue(), Messages);
dialog.open();
}
});
@@ -220,7 +219,7 @@
final TableViewer viewer = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER);
ObservableListContentProvider cp = new ObservableListContentProvider();
viewer.setContentProvider(cp);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 120;
@@ -321,7 +320,7 @@
});
}
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
index 84a80f0..351ed51 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandParameterEditor.java
@@ -16,7 +16,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.ui.model.application.commands.MCommandParameter;
import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -120,7 +119,7 @@
}
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index 3f528a2..c14d9ce 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -106,7 +106,7 @@
});
}
- public static void createMapProperties(Composite parent, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+ public static void createMapProperties(Composite parent, final Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
Label l = new Label(parent, SWT.NONE);
l.setText(label);
GridData gd = new GridData(GridData.END, GridData.BEGINNING, false, false);
@@ -273,7 +273,7 @@
}
- public static void createFindImport(Composite parent, final AbstractComponentEditor editor, EMFDataBindingContext context) {
+ public static void createFindImport(Composite parent, final Messages Messages, final AbstractComponentEditor editor, EMFDataBindingContext context) {
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
Label l = new Label(parent, SWT.NONE);
@@ -291,7 +291,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- FindImportElementDialog dialog = new FindImportElementDialog(b.getShell(), editor, (EObject) editor.getMaster().getValue());
+ FindImportElementDialog dialog = new FindImportElementDialog(b.getShell(), editor, (EObject) editor.getMaster().getValue(), Messages);
dialog.open();
}
});
@@ -363,7 +363,7 @@
});
}
- public static void createStringListWidget(Composite parent, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
+ public static void createStringListWidget(Composite parent, Messages Messages, final AbstractComponentEditor editor, String label, final EStructuralFeature feature, int vIndent) {
Label l = new Label(parent, SWT.NONE);
l.setText(label);
GridData gd = new GridData(GridData.END, GridData.BEGINNING, false, false);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
index 9a1e285..7834e8d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CoreExpressionEditor.java
@@ -14,7 +14,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ExpressionIdDialog;
import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
@@ -110,7 +109,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- ExpressionIdDialog dialog = new ExpressionIdDialog(t.getShell(), getEditor().getExtensionLookup(), (MCoreExpression) getMaster().getValue(), getEditingDomain(), getEditor().isLiveModel());
+ ExpressionIdDialog dialog = new ExpressionIdDialog(t.getShell(), getEditor().getExtensionLookup(), (MCoreExpression) getMaster().getValue(), getEditingDomain(), getEditor().isLiveModel(), Messages);
dialog.open();
}
});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
index 0c4a791..411a157 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java
@@ -21,7 +21,6 @@
import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
import org.eclipse.e4.ui.model.application.MContribution;
@@ -115,7 +114,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+ ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
dialog.open();
}
});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
index d4ecc7c..f435c89 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java
@@ -21,7 +21,6 @@
import org.eclipse.e4.tools.emf.ui.common.ContributionURIValidator;
import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator;
import org.eclipse.e4.tools.emf.ui.common.Util;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
import org.eclipse.e4.ui.model.application.MContribution;
@@ -103,7 +102,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+ ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
dialog.open();
}
});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
index 97e0d0c..f7e952a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java
@@ -19,7 +19,6 @@
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -98,7 +97,7 @@
Text t = new Text(parent, SWT.BORDER);
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
t.setEditable(false);
- context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
+ context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -107,7 +106,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- HandledMenuItemCommandSelectionDialog dialog = new HandledMenuItemCommandSelectionDialog(b.getShell(), (MHandledItem) getMaster().getValue(), resource);
+ HandledMenuItemCommandSelectionDialog dialog = new HandledMenuItemCommandSelectionDialog(b.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
dialog.open();
}
});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
index 0e8fb3c..2044e07 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java
@@ -19,7 +19,6 @@
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.CommandToStringConverter;
import org.eclipse.e4.tools.emf.ui.common.IModelResource;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -87,7 +86,7 @@
Text t = new Text(parent, SWT.BORDER);
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
t.setEditable(false);
- context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
+ context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), MenuPackageImpl.Literals.HANDLED_ITEM__COMMAND).observeDetail(master), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -96,7 +95,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- HandledToolItemCommandSelectionDialog dialog = new HandledToolItemCommandSelectionDialog(b.getShell(), (MHandledItem) getMaster().getValue(), resource);
+ HandledToolItemCommandSelectionDialog dialog = new HandledToolItemCommandSelectionDialog(b.getShell(), (MHandledItem) getMaster().getValue(), resource, Messages);
dialog.open();
}
});
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index 5cfdb4e..6130636 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -24,7 +24,6 @@
import org.eclipse.e4.tools.emf.ui.common.IModelResource;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.HandlerCommandSelectionDialog;
@@ -130,7 +129,7 @@
}
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -156,7 +155,7 @@
Text t = new Text(parent, SWT.BORDER);
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
t.setEditable(false);
- context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.HANDLER__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
+ context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.HANDLER__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -165,7 +164,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- HandlerCommandSelectionDialog dialog = new HandlerCommandSelectionDialog(b.getShell(), (MHandler) getMaster().getValue(), resource);
+ HandlerCommandSelectionDialog dialog = new HandlerCommandSelectionDialog(b.getShell(), (MHandler) getMaster().getValue(), resource, Messages);
dialog.open();
}
});
@@ -202,13 +201,13 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+ ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
dialog.open();
}
});
}
- ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
index 0009adc..1b31435 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java
@@ -26,7 +26,6 @@
import org.eclipse.e4.tools.emf.ui.common.IModelResource;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.KeyBindingCommandSelectionDialog;
@@ -154,7 +153,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -194,7 +193,7 @@
Text t = new Text(parent, SWT.BORDER);
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
t.setEditable(false);
- context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter()));
+ context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.KEY_BINDING__COMMAND).observeDetail(getMaster()), new UpdateValueStrategy(), new UpdateValueStrategy().setConverter(new CommandToStringConverter(Messages)));
final Button b = new Button(parent, SWT.PUSH | SWT.FLAT);
b.setText(Messages.ModelTooling_Common_FindEllipsis);
@@ -203,7 +202,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- KeyBindingCommandSelectionDialog dialog = new KeyBindingCommandSelectionDialog(b.getShell(), (MKeyBinding) getMaster().getValue(), resource);
+ KeyBindingCommandSelectionDialog dialog = new KeyBindingCommandSelectionDialog(b.getShell(), (MKeyBinding) getMaster().getValue(), resource, Messages);
dialog.open();
}
});
@@ -216,7 +215,7 @@
final TableViewer viewer = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER);
ObservableListContentProvider cp = new ObservableListContentProvider();
viewer.setContentProvider(cp);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 120;
@@ -317,7 +316,7 @@
b.setImage(createImage(ResourceProvider.IMG_Obj16_table_delete));
b.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 1eda5ff..b0eea46 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -18,7 +18,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -158,7 +157,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -212,7 +211,7 @@
final TableViewer viewer = new TableViewer(parent);
ObservableListContentProvider cp = new ObservableListContentProvider();
viewer.setContentProvider(cp);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
@@ -337,7 +336,7 @@
ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 9ff089b..90e6eda 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -30,7 +30,6 @@
import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.MenuItemEditor.EClass2EObject;
@@ -207,7 +206,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -264,7 +263,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
viewer.setInput(prop.observeDetail(master));
@@ -396,7 +395,7 @@
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
- new ImageTooltip(t) {
+ new ImageTooltip(t, Messages) {
@Override
protected URI getImageURI() {
@@ -416,7 +415,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), project, getEditingDomain(), (MMenu) getMaster().getValue());
+ MenuIconDialogEditor dialog = new MenuIconDialogEditor(b.getShell(), project, getEditingDomain(), (MMenu) getMaster().getValue(), Messages);
dialog.open();
}
});
@@ -446,13 +445,13 @@
list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
combo.setInput(list);
- context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject()), new UpdateValueStrategy().setConverter(new EObject2EClass()));
+ context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)), new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
}
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index 2e13157..251fda8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -136,7 +136,7 @@
}
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -222,7 +222,7 @@
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
- new ImageTooltip(t) {
+ new ImageTooltip(t, Messages) {
@Override
protected URI getImageURI() {
@@ -242,7 +242,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), project, getEditingDomain(), (MMenuItem) getMaster().getValue());
+ MenuItemIconDialogEditor dialog = new MenuItemIconDialogEditor(b.getShell(), project, getEditingDomain(), (MMenuItem) getMaster().getValue(), Messages);
dialog.open();
}
});
@@ -310,7 +310,7 @@
list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
combo.setInput(list);
- context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject()), new UpdateValueStrategy().setConverter(new EObject2EClass()));
+ context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)), new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
}
createFormSubTypeForm(parent, context, master);
@@ -318,7 +318,7 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
@@ -345,8 +345,11 @@
}
static class EObject2EClass extends Converter {
- public EObject2EClass() {
+ Messages Messages;
+
+ public EObject2EClass(Messages Messages) {
super(EObject.class, EClass.class);
+ this.Messages = Messages;
}
public Object convert(Object fromObject) {
@@ -358,9 +361,11 @@
}
static class EClass2EObject extends Converter {
+ Messages Messages;
- public EClass2EObject() {
+ public EClass2EObject(Messages Messages) {
super(EClass.class, EObject.class);
+ this.Messages = Messages;
}
public Object convert(Object fromObject) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
index e52fe9b..0ac8e5e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuSeparatorEditor.java
@@ -16,7 +16,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -111,7 +110,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -133,7 +132,7 @@
ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
index ee4d947..2ee762c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ModelFragmentsEditor.java
@@ -18,7 +18,6 @@
import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
@@ -112,7 +111,7 @@
final TableViewer viewer = new TableViewer(parent);
viewer.setContentProvider(new ObservableListContentProvider());
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 200;
viewer.getControl().setLayoutData(gd);
@@ -253,7 +252,7 @@
final TableViewer viewer = new TableViewer(parent);
viewer.setContentProvider(new ObservableListContentProvider());
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 200;
viewer.getControl().setLayoutData(gd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
index 959afa1..22e06e5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ParameterEditor.java
@@ -16,7 +16,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.ui.model.application.commands.MParameter;
import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
@@ -116,7 +115,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index d8cb3f9..d786110 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -23,7 +23,6 @@
import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -143,7 +142,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -196,7 +195,7 @@
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
- new ImageTooltip(t) {
+ new ImageTooltip(t, Messages) {
@Override
protected URI getImageURI() {
@@ -216,7 +215,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPartDescriptor) getMaster().getValue());
+ PartDescriptorIconDialogEditor dialog = new PartDescriptorIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), Messages);
dialog.open();
}
});
@@ -239,7 +238,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI);
+ ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MPartDescriptor) getMaster().getValue(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CONTRIBUTION_URI, Messages);
dialog.open();
}
});
@@ -335,7 +334,7 @@
context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), BasicPackageImpl.Literals.PART_DESCRIPTOR__CATEGORY).observeDetail(master));
}
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
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 705f7ad..af1321b 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
@@ -28,7 +28,6 @@
import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -162,7 +161,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -181,7 +180,7 @@
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
- new ImageTooltip(t) {
+ new ImageTooltip(t, Messages) {
@Override
protected URI getImageURI() {
@@ -201,7 +200,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPart) getMaster().getValue());
+ PartIconDialogEditor dialog = new PartIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPart) getMaster().getValue(), Messages);
dialog.open();
}
});
@@ -238,7 +237,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+ ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
dialog.open();
}
});
@@ -275,11 +274,11 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.PartEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.PartEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
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 3c40cb9..29912ff 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
@@ -20,7 +20,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -200,7 +199,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -267,7 +266,7 @@
viewer.getControl().setLayoutData(gd);
ObservableListContentProvider cp = new ObservableListContentProvider();
viewer.setContentProvider(cp);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
viewer.setInput(prop.observeDetail(getMaster()));
@@ -377,7 +376,7 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
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 f5a3904..9830102 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
@@ -20,7 +20,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -169,7 +168,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -211,7 +210,7 @@
final TableViewer viewer = new TableViewer(parent);
viewer.setContentProvider(new ObservableListContentProvider());
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
@@ -322,7 +321,7 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
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 4d16607..fe375de 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
@@ -23,7 +23,6 @@
import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.PerspectiveIconDialogEditor;
@@ -212,7 +211,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -269,7 +268,7 @@
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
- new ImageTooltip(t) {
+ new ImageTooltip(t, Messages) {
@Override
protected URI getImageURI() {
@@ -287,7 +286,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPerspective) getMaster().getValue());
+ PerspectiveIconDialogEditor dialog = new PerspectiveIconDialogEditor(b.getShell(), project, getEditingDomain(), (MPerspective) getMaster().getValue(), Messages);
dialog.open();
}
});
@@ -304,7 +303,7 @@
viewer.getControl().setLayoutData(gd);
ObservableListContentProvider cp = new ObservableListContentProvider();
viewer.setContentProvider(cp);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
viewer.setInput(prop.observeDetail(getMaster()));
@@ -414,9 +413,9 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
index 4bb7e63..164d4c9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java
@@ -20,7 +20,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -156,7 +155,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -185,7 +184,7 @@
final TableViewer viewer = new TableViewer(parent);
viewer.setContentProvider(new ObservableListContentProvider());
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
@@ -283,7 +282,7 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
index ecfd5c3..ab49f99 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java
@@ -19,7 +19,6 @@
import org.eclipse.e4.tools.emf.ui.common.IModelResource;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.SharedElementsDialog;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -150,7 +149,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -214,14 +213,14 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(), getEditor(), (MPlaceholder) getMaster().getValue(), resource);
+ SharedElementsDialog dialog = new SharedElementsDialog(b.getShell(), getEditor(), (MPlaceholder) getMaster().getValue(), resource, Messages);
dialog.open();
}
});
}
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
index 8792ca3..799ea94 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PopupMenuEditor.java
@@ -12,7 +12,6 @@
import javax.inject.Inject;
import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
import org.eclipse.emf.databinding.EMFDataBindingContext;
import org.eclipse.swt.widgets.Composite;
@@ -28,8 +27,8 @@
protected Composite createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean rootMenu, boolean isImport) {
Composite comp = super.createForm(parent, context, master, rootMenu, isImport);
if (!isImport) {
- ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createStringListWidget(comp, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(comp, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
}
return comp;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index c042378..f4d76d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -18,7 +18,6 @@
import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.FeatureSelectionDialog;
@@ -139,7 +138,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- FindParentReferenceElementDialog dialog = new FindParentReferenceElementDialog(b.getShell(), StringModelFragment.this, (MStringModelFragment) getMaster().getValue());
+ FindParentReferenceElementDialog dialog = new FindParentReferenceElementDialog(b.getShell(), StringModelFragment.this, (MStringModelFragment) getMaster().getValue(), Messages);
dialog.open();
}
});
@@ -170,7 +169,7 @@
button.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(), getEditingDomain(), (MStringModelFragment) getMaster().getValue());
+ FeatureSelectionDialog dialog = new FeatureSelectionDialog(button.getShell(), getEditingDomain(), (MStringModelFragment) getMaster().getValue(), Messages);
dialog.open();
}
});
@@ -197,7 +196,7 @@
final TableViewer viewer = new TableViewer(parent);
viewer.setContentProvider(new ObservableListContentProvider());
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index 3066944..cd929bf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -18,7 +18,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -159,7 +158,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -217,7 +216,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 120;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
viewer.setInput(prop.observeDetail(master));
@@ -339,7 +338,7 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
index 886265d..da90978 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarEditor.java
@@ -20,7 +20,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -187,7 +186,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -219,7 +218,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 120;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
IEMFListProperty prop = EMFEditProperties.list(getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
viewer.setInput(prop.observeDetail(master));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
index 0d5c01c..cc8876b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarSeparatorEditor.java
@@ -16,7 +16,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -122,7 +121,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -139,9 +138,9 @@
context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID).observeDetail(getMaster()));
}
ControlFactory.createTextField(parent, Messages.ModelTooling_UIElement_AccessibilityPhrase, getMaster(), context, textProp, EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__ACCESSIBILITY_PHRASE));
- ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED)); //$NON-NLS-1$
- ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createCheckBox(parent, "To Be Rendered", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
+ ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
index 0d13951..993a36a 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolControlEditor.java
@@ -18,7 +18,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs.ContributionClassDialog;
import org.eclipse.e4.ui.model.application.MContribution;
@@ -134,7 +133,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -170,7 +169,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI);
+ ContributionClassDialog dialog = new ContributionClassDialog(b.getShell(), project, getEditingDomain(), (MContribution) getMaster().getValue(), ApplicationPackageImpl.Literals.CONTRIBUTION__CONTRIBUTION_URI, Messages);
dialog.open();
}
});
@@ -179,8 +178,8 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Contribution_PersistedState, ApplicationPackageImpl.Literals.CONTRIBUTION__PERSISTED_STATE, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 10d8051..43e56a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -117,7 +117,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -187,7 +187,7 @@
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
context.bindValue(textProp.observe(t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
- new ImageTooltip(t) {
+ new ImageTooltip(t, Messages) {
@Override
protected URI getImageURI() {
@@ -207,7 +207,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), project, getEditingDomain(), (MToolItem) getMaster().getValue());
+ ToolItemIconDialogEditor dialog = new ToolItemIconDialogEditor(b.getShell(), project, getEditingDomain(), (MToolItem) getMaster().getValue(), Messages);
dialog.open();
}
});
@@ -275,7 +275,7 @@
list.add(UiPackageImpl.Literals.CORE_EXPRESSION);
list.addAll(getEditor().getFeatureClasses(UiPackageImpl.Literals.EXPRESSION, UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN));
combo.setInput(list);
- context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject()), new UpdateValueStrategy().setConverter(new EObject2EClass()));
+ context.bindValue(ViewerProperties.singleSelection().observe(combo), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN).observeDetail(getMaster()), new UpdateValueStrategy().setConverter(new EClass2EObject(Messages)), new UpdateValueStrategy().setConverter(new EObject2EClass(Messages)));
}
// ------------------------------------------------------------
@@ -284,7 +284,7 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
}
protected void createSubTypeFormElements(Composite parent, EMFDataBindingContext context, WritableValue master) {
@@ -313,8 +313,11 @@
}
static class EObject2EClass extends Converter {
- public EObject2EClass() {
+ private Messages Messages;
+
+ public EObject2EClass(Messages Messages) {
super(EObject.class, EClass.class);
+ this.Messages = Messages;
}
public Object convert(Object fromObject) {
@@ -326,9 +329,11 @@
}
static class EClass2EObject extends Converter {
+ private Messages Messages;
- public EClass2EObject() {
+ public EClass2EObject(Messages Messages) {
super(EClass.class, EObject.class);
+ this.Messages = Messages;
}
public Object convert(Object fromObject) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 1c2ba01..2fc3431 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -21,7 +21,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
@@ -170,7 +169,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -212,7 +211,7 @@
l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
final TableViewer viewer = new TableViewer(parent);
- viewer.setLabelProvider(new ComponentLabelProvider(editor));
+ viewer.setLabelProvider(new ComponentLabelProvider(editor, Messages));
viewer.setContentProvider(new ObservableListContentProvider());
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
@@ -322,7 +321,7 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index f3056d3..42fa30f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -18,7 +18,6 @@
import org.eclipse.e4.tools.emf.ui.common.EStackLayout;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
@@ -146,7 +145,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -198,7 +197,7 @@
l.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
final TableViewer viewer = new TableViewer(parent);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
viewer.setContentProvider(new ObservableListContentProvider());
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
@@ -315,7 +314,7 @@
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_ToBeRendered, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__TO_BE_RENDERED));
ControlFactory.createCheckBox(parent, Messages.ModelTooling_UIElement_Visible, getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE));
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index 3cd9aa4..31ee67b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -27,7 +27,6 @@
import org.eclipse.e4.tools.emf.ui.common.ImageTooltip;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -174,7 +173,7 @@
IWidgetValueProperty textProp = WidgetProperties.text(SWT.Modify);
if (isImport) {
- ControlFactory.createFindImport(parent, this, context);
+ ControlFactory.createFindImport(parent, Messages, this, context);
return parent;
}
@@ -281,7 +280,7 @@
t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
context.bindValue(textProp.observeDelayed(200, t), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_LABEL__ICON_URI).observeDetail(master));
- new ImageTooltip(t) {
+ new ImageTooltip(t, Messages) {
@Override
protected URI getImageURI() {
@@ -301,7 +300,7 @@
b.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), project, getEditingDomain(), (MWindow) getMaster().getValue());
+ WindowIconDialogEditor dialog = new WindowIconDialogEditor(b.getShell(), project, getEditingDomain(), (MWindow) getMaster().getValue(), Messages);
dialog.open();
}
});
@@ -331,10 +330,10 @@
ControlFactory.createCheckBox(parent, "Visible", getMaster(), context, WidgetProperties.selection(), EMFEditProperties.value(getEditingDomain(), UiPackageImpl.Literals.UI_ELEMENT__VISIBLE)); //$NON-NLS-1$
ControlFactory.createSelectedElement(parent, this, context, Messages.WindowEditor_SelectedElement);
- ControlFactory.createStringListWidget(parent, this, Messages.WindowEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createMapProperties(parent, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
- ControlFactory.createStringListWidget(parent, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.WindowEditor_BindingContexts, CommandsPackageImpl.Literals.BINDINGS__BINDING_CONTEXTS, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createMapProperties(parent, Messages, this, Messages.ModelTooling_Context_Properties, UiPackageImpl.Literals.CONTEXT__PROPERTIES, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_Context_Variables, UiPackageImpl.Literals.CONTEXT__VARIABLES, VERTICAL_LIST_WIDGET_INDENT);
+ ControlFactory.createStringListWidget(parent, Messages, this, Messages.ModelTooling_ApplicationElement_Tags, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__TAGS, VERTICAL_LIST_WIDGET_INDENT);
return parent;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index 9968650..b0034d2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -51,10 +51,12 @@
public abstract class AbstractCommandSelectionDialog extends TitleAreaDialog {
private IModelResource resource;
private TableViewer viewer;
+ protected Messages Messages;
- public AbstractCommandSelectionDialog(Shell parentShell, IModelResource resource) {
+ public AbstractCommandSelectionDialog(Shell parentShell, IModelResource resource, Messages Messages) {
super(parentShell);
this.resource = resource;
+ this.Messages = Messages;
}
protected abstract String getShellTitle();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
index 3dbefb2..dfd0699 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java
@@ -64,12 +64,15 @@
private EditingDomain editingDomain;
private Map<IFile, Image> icons = Collections.synchronizedMap(new HashMap<IFile, Image>());
- public AbstractIconDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement element, EStructuralFeature feature) {
+ protected Messages Messages;
+
+ public AbstractIconDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement element, EStructuralFeature feature, Messages Messages) {
super(parentShell);
this.editingDomain = editingDomain;
this.element = element;
this.feature = feature;
this.project = project;
+ this.Messages = Messages;
}
protected abstract String getShellTitle();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
index e918099..218d564 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AreaIconDialogEditor.java
@@ -19,8 +19,8 @@
public class AreaIconDialogEditor extends AbstractIconDialog {
- public AreaIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPart element) {
- super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+ public AreaIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPart element, Messages Messages) {
+ super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index 559841a..05a63e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -50,10 +50,12 @@
private IModelResource resource;
private TableViewer viewer;
private String selectedId;
+ private Messages Messages;
- public BindingContextSelectionDialog(Shell parentShell, IModelResource resource) {
+ public BindingContextSelectionDialog(Shell parentShell, IModelResource resource, Messages Messages) {
super(parentShell);
this.resource = resource;
+ this.Messages = Messages;
}
public String getSelectedId() {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 4c6d63e..2df3390 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -53,11 +53,13 @@
private IModelResource resource;
private TableViewer viewer;
private MCommand command;
+ private Messages Messages;
- public CommandCategorySelectionDialog(Shell parentShell, IModelResource resource, MCommand command) {
+ public CommandCategorySelectionDialog(Shell parentShell, IModelResource resource, MCommand command, Messages Messages) {
super(parentShell);
this.resource = resource;
this.command = command;
+ this.Messages = Messages;
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
index dc9338f..d7664cf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java
@@ -57,13 +57,15 @@
private EditingDomain editingDomain;
private TableViewer viewer;
private EStructuralFeature feature;
+ private Messages Messages;
- public ContributionClassDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement contribution, EStructuralFeature feature) {
+ public ContributionClassDialog(Shell parentShell, IProject project, EditingDomain editingDomain, MApplicationElement contribution, EStructuralFeature feature, Messages Messages) {
super(parentShell);
this.project = project;
this.contribution = contribution;
this.editingDomain = editingDomain;
this.feature = feature;
+ this.Messages = Messages;
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index abdeb0b..12eaf29 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -52,13 +52,15 @@
private EditingDomain domain;
private MCoreExpression expression;
private boolean liveModel;
+ private Messages Messages;
- public ExpressionIdDialog(Shell parentShell, IExtensionLookup lookup, MCoreExpression expression, EditingDomain domain, boolean liveModel) {
+ public ExpressionIdDialog(Shell parentShell, IExtensionLookup lookup, MCoreExpression expression, EditingDomain domain, boolean liveModel, Messages Messages) {
super(parentShell);
this.lookup = lookup;
this.expression = expression;
this.domain = domain;
this.liveModel = liveModel;
+ this.Messages = Messages;
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
index 2b80289..d0cfce3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java
@@ -58,11 +58,13 @@
private TreeViewer viewer;
private MStringModelFragment fragment;
private EditingDomain editingDomain;
+ private Messages Messages;
- public FeatureSelectionDialog(Shell parentShell, EditingDomain editingDomain, MStringModelFragment fragment) {
+ public FeatureSelectionDialog(Shell parentShell, EditingDomain editingDomain, MStringModelFragment fragment, Messages Messages) {
super(parentShell);
this.fragment = fragment;
this.editingDomain = editingDomain;
+ this.Messages = Messages;
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
index f567391..1a492b6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java
@@ -57,11 +57,13 @@
private EObject element;
private AbstractComponentEditor editor;
private TableViewer viewer;
+ private Messages Messages;
- public FindImportElementDialog(Shell parentShell, AbstractComponentEditor editor, EObject element) {
+ public FindImportElementDialog(Shell parentShell, AbstractComponentEditor editor, EObject element, Messages Messages) {
super(parentShell);
this.element = element;
this.editor = editor;
+ this.Messages = Messages;
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index b6823e6..9c0df83 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -68,11 +68,13 @@
private MStringModelFragment fragment;
private AbstractComponentEditor editor;
private TableViewer viewer;
+ private Messages Messages;
- public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor, MStringModelFragment fragment) {
+ public FindParentReferenceElementDialog(Shell parentShell, AbstractComponentEditor editor, MStringModelFragment fragment, Messages Messages) {
super(parentShell);
this.fragment = fragment;
this.editor = editor;
+ this.Messages = Messages;
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
index 778fb9b..a2ae60f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledMenuItemCommandSelectionDialog.java
@@ -23,8 +23,8 @@
public class HandledMenuItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
private MHandledItem handler;
- public HandledMenuItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource) {
- super(parentShell, resource);
+ public HandledMenuItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource, Messages Messages) {
+ super(parentShell, resource, Messages);
this.handler = handler;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
index 67b3ebc..48c6263 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandledToolItemCommandSelectionDialog.java
@@ -23,8 +23,8 @@
public class HandledToolItemCommandSelectionDialog extends AbstractCommandSelectionDialog {
private MHandledItem handler;
- public HandledToolItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource) {
- super(parentShell, resource);
+ public HandledToolItemCommandSelectionDialog(Shell parentShell, MHandledItem handler, IModelResource resource, Messages Messages) {
+ super(parentShell, resource, Messages);
this.handler = handler;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
index de38caa..afa6fac 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/HandlerCommandSelectionDialog.java
@@ -23,8 +23,8 @@
public class HandlerCommandSelectionDialog extends AbstractCommandSelectionDialog {
private MHandler handler;
- public HandlerCommandSelectionDialog(Shell parentShell, MHandler handler, IModelResource resource) {
- super(parentShell, resource);
+ public HandlerCommandSelectionDialog(Shell parentShell, MHandler handler, IModelResource resource, Messages Messages) {
+ super(parentShell, resource, Messages);
this.handler = handler;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
index a2c1405..18259a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/KeyBindingCommandSelectionDialog.java
@@ -23,8 +23,8 @@
public class KeyBindingCommandSelectionDialog extends AbstractCommandSelectionDialog {
private MKeyBinding binding;
- public KeyBindingCommandSelectionDialog(Shell parentShell, MKeyBinding binding, IModelResource resource) {
- super(parentShell, resource);
+ public KeyBindingCommandSelectionDialog(Shell parentShell, MKeyBinding binding, IModelResource resource, Messages Messages) {
+ super(parentShell, resource, Messages);
this.binding = binding;
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
index e27843d..3358369 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIconDialogEditor.java
@@ -19,8 +19,8 @@
public class MenuIconDialogEditor extends AbstractIconDialog {
- public MenuIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MMenu element) {
- super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+ public MenuIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MMenu element, Messages Messages) {
+ super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
index 9e18128..2d5ad18 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuItemIconDialogEditor.java
@@ -19,8 +19,8 @@
public class MenuItemIconDialogEditor extends AbstractIconDialog {
- public MenuItemIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MMenuItem element) {
- super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+ public MenuItemIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MMenuItem element, Messages Messages) {
+ super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
index 6abf5c6..92814cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartDescriptorIconDialogEditor.java
@@ -19,8 +19,8 @@
public class PartDescriptorIconDialogEditor extends AbstractIconDialog {
- public PartDescriptorIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPartDescriptor element) {
- super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+ public PartDescriptorIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPartDescriptor element, Messages Messages) {
+ super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
index 7b7b48a..8f28334 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PartIconDialogEditor.java
@@ -19,8 +19,8 @@
public class PartIconDialogEditor extends AbstractIconDialog {
- public PartIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPart element) {
- super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+ public PartIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPart element, Messages Messages) {
+ super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
index 3e38036..189632c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/PerspectiveIconDialogEditor.java
@@ -19,8 +19,8 @@
public class PerspectiveIconDialogEditor extends AbstractIconDialog {
- public PerspectiveIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPerspective element) {
- super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+ public PerspectiveIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MPerspective element, Messages Messages) {
+ super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 4ffc8cb..ce28f7f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -61,12 +61,14 @@
private MPlaceholder placeholder;
private IModelResource resource;
private ModelEditor editor;
+ private Messages Messages;
- public SharedElementsDialog(Shell parentShell, ModelEditor editor, MPlaceholder placeholder, IModelResource resource) {
+ public SharedElementsDialog(Shell parentShell, ModelEditor editor, MPlaceholder placeholder, IModelResource resource, Messages Messages) {
super(parentShell);
this.editor = editor;
this.placeholder = placeholder;
this.resource = resource;
+ this.Messages = Messages;
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
index 0966feb..242fba0 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ToolItemIconDialogEditor.java
@@ -19,8 +19,8 @@
public class ToolItemIconDialogEditor extends AbstractIconDialog {
- public ToolItemIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MToolItem element) {
- super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+ public ToolItemIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MToolItem element, Messages Messages) {
+ super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
}
@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
index a112f7a..1a0fbaf 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/WindowIconDialogEditor.java
@@ -19,8 +19,8 @@
public class WindowIconDialogEditor extends AbstractIconDialog {
- public WindowIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MWindow element) {
- super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI);
+ public WindowIconDialogEditor(Shell parentShell, IProject project, EditingDomain editingDomain, MWindow element, Messages Messages) {
+ super(parentShell, project, editingDomain, element, UiPackageImpl.Literals.UI_LABEL__ICON_URI, Messages);
}
@Override
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 f52af3c..a384584 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -117,7 +116,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
Composite buttonComp = new Composite(parent, SWT.NONE);
buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
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 224c829..205c652 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -117,7 +116,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
Composite buttonComp = new Composite(parent, SWT.NONE);
buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
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 5f7744b..a289242 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -116,7 +115,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
bindingViewer.getControl().setLayoutData(gd);
- bindingViewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ bindingViewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
Composite buttonComp = new Composite(parent, SWT.NONE);
buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
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 e3f87b7..31bf81e 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -120,7 +119,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
Composite buttonComp = new Composite(parent, SWT.NONE);
buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
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 0631423..883bc1a 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -116,7 +115,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
Composite buttonComp = new Composite(parent, SWT.NONE);
buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
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 684dfc6..67b2b39 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -120,7 +119,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
Composite buttonComp = new Composite(parent, SWT.NONE);
buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
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 a1f2245..3c39157 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -117,7 +116,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
Composite buttonComp = new Composite(parent, SWT.NONE);
buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
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 8d35c30..4ee60e3 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
@@ -16,7 +16,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -117,7 +116,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
Composite buttonComp = new Composite(parent, SWT.NONE);
buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
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 88bf886..59be50e 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
@@ -15,7 +15,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -99,7 +98,7 @@
viewer = new TableViewer(parent);
ObservableListContentProvider cp = new ObservableListContentProvider();
viewer.setContentProvider(cp);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
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 441b4a1..3e9a08a 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.IEditorFeature.FeatureClass;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -109,7 +108,7 @@
viewer = new TableViewer(parent);
viewer.setContentProvider(new ObservableListContentProvider());
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
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 375449c..69a754b 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -116,7 +115,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
Composite buttonComp = new Composite(parent, SWT.NONE);
buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
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 6c4a2ab..7fdb2bf 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -117,7 +116,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
Composite buttonComp = new Composite(parent, SWT.NONE);
buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
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 20f9fb9..206999f 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -116,7 +115,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
Composite buttonComp = new Composite(parent, SWT.NONE);
buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
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 18ef85a..9978ad2 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -116,7 +115,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
Composite buttonComp = new Composite(parent, SWT.NONE);
buttonComp.setLayoutData(new GridData(GridData.FILL, GridData.END, false, false));
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 7fc4fa8..4b749c5 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
@@ -18,7 +18,6 @@
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -155,7 +154,7 @@
viewer = new TableViewer(parent);
ObservableListContentProvider cp = new ObservableListContentProvider();
viewer.setContentProvider(cp);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
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 b02bc4f..464e066 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
@@ -18,7 +18,6 @@
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.Util;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -124,7 +123,7 @@
viewer = new TableViewer(parent);
ObservableListContentProvider cp = new ObservableListContentProvider();
viewer.setContentProvider(cp);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
viewer.getControl().setLayoutData(gd);
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 0e7ca92..18649ac 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -133,7 +132,7 @@
viewer = new TableViewer(parent);
ObservableListContentProvider cp = new ObservableListContentProvider();
viewer.setContentProvider(cp);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
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 39eeeec..9bc4b8b 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
@@ -17,7 +17,6 @@
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
-import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.ComponentLabelProvider;
import org.eclipse.e4.tools.emf.ui.internal.common.VirtualEntry;
@@ -110,7 +109,7 @@
viewer = new TableViewer(parent);
ObservableListContentProvider cp = new ObservableListContentProvider();
viewer.setContentProvider(cp);
- viewer.setLabelProvider(new ComponentLabelProvider(getEditor()));
+ viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 300;
