Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael ADAM2016-08-26 15:12:42 +0000
committerMickael ADAM2016-11-09 13:28:03 +0000
commit6f6e644ce698d45b3c9d3d8f552ec3ba506365fe (patch)
tree6947ff19ace5f694f3aba4051add0ab5c1ca1edb /plugins/infra/emf
parente3fa6a2940ac4212c4cc317408f45cb8fe2e9ec6 (diff)
downloadorg.eclipse.papyrus-6f6e644ce698d45b3c9d3d8f552ec3ba506365fe.tar.gz
org.eclipse.papyrus-6f6e644ce698d45b3c9d3d8f552ec3ba506365fe.tar.xz
org.eclipse.papyrus-6f6e644ce698d45b3c9d3d8f552ec3ba506365fe.zip
Bug 500869 - [Widget] Select Element Dialog should be improved
https://bugs.eclipse.org/bugs/show_bug.cgi?id=500869 Change-Id: I29e26992c5bf99aaf145d9046254f93964206309 Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
Diffstat (limited to 'plugins/infra/emf')
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFGraphicalContentProvider.java256
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/Activator.java29
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/Messages.java15
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/messages.properties9
4 files changed, 272 insertions, 37 deletions
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFGraphicalContentProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFGraphicalContentProvider.java
index ef0e33012b8..21042a87556 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFGraphicalContentProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFGraphicalContentProvider.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2010, 2016 CEA LIST.
+ * Copyright (c) 2016 CEA LIST, ALL4TEC and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -13,6 +13,7 @@
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial History implementation
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - History integration
* Philip Langer (EclipseSource) planger@eclipsesource.com - Revealing first match of filter
+ * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 500869
*
*****************************************************************************/
package org.eclipse.papyrus.infra.ui.emf.providers;
@@ -23,7 +24,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -32,11 +32,16 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TreeViewer;
@@ -44,20 +49,30 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;
import org.eclipse.papyrus.infra.services.labelprovider.service.IDetailLabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;
import org.eclipse.papyrus.infra.ui.internal.emf.Activator;
+import org.eclipse.papyrus.infra.ui.internal.emf.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.IFireDoubleClick;
import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
-import org.eclipse.papyrus.infra.widgets.editors.StringEditor;
+import org.eclipse.papyrus.infra.widgets.editors.StringWithClearEditor;
import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
import org.eclipse.papyrus.infra.widgets.providers.PatternViewerFilter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
@@ -75,6 +90,18 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
private static final int HISTORY_MAX_SIZE = 15;
+ /** The default profile icon path. */
+ private static final String ICONS_EXPAND_ALL = "/icons/expandAll.png";//$NON-NLS-1$
+
+ /** The default profile icon path. */
+ private static final String ICONS_COLLAPSE_ALL = "/icons/collapseAll.png";//$NON-NLS-1$
+
+ /** the expand button */
+ private ToolItem buttonExpand;
+
+ /** the collapse button */
+ private ToolItem buttonCollapse;
+
/**
* The maximum depth for {@link #findAndRevealFirstMatchingItem() finding and revealing}
* items in the filtered tree {@link #viewer}.
@@ -107,9 +134,8 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
private TableViewer historyViewer;
- /**
- * the wanted root of the contentprovider
- */
+ /** Set to true if expand and collapse buttons must be enable. */
+ private boolean buttonExpandCollapseEnable = true;
/**
* the constructor
@@ -122,29 +148,153 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
/**
* {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider#createBefore(org.eclipse.swt.widgets.Composite)
+ */
+ @Override
+ public void createBefore(final Composite parent) {
+ Composite composite = new Composite(parent, SWT.NONE);
+
+ GridLayoutFactory.fillDefaults().numColumns(2).applyTo(composite);
+
+ // Create filter composite
+ createPatternFilter(composite);
+
+ createCaseSensitiveButton(composite);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.infra.widgets.providers.IGraphicalContentProvider#createViewerToolbar(org.eclipse.swt.widgets.Composite)
*/
@Override
- public void createBefore(Composite parent) {
- createPatternFilter(parent);
+ public void createViewerToolbar(Composite parent) {
+ createExpandCollapseButtons(parent);
+ }
+
+ /**
+ * Create buttons to collapse and expand treeViewer.
+ */
+ protected void createExpandCollapseButtons(final Composite parent) {
+
+ ToolBar Toolbar = new ToolBar(parent, SWT.NONE);
+ buttonExpand = new ToolItem(Toolbar, SWT.NONE);
+ buttonExpand.setImage(Activator.getPluginIconImage(org.eclipse.papyrus.infra.widgets.Activator.PLUGIN_ID, ICONS_EXPAND_ALL));
+ buttonExpand.setToolTipText(Messages.EMFGraphicalContentProvider_ExpandAllTooltip);
+ buttonExpand.setEnabled(buttonExpandCollapseEnable);
+ buttonExpand.addSelectionListener(new SelectionAdapter() {
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ ISelection selection = viewer.getSelection();
+ // If there are selected element
+ if (selection instanceof StructuredSelection && !selection.isEmpty()) {
+ // For each element
+ for (Object object : ((StructuredSelection) selection).toArray()) {
+ ((AbstractTreeViewer) viewer).expandToLevel(object, org.eclipse.papyrus.infra.widgets.Activator.getMaxLevelToExpandValue());
+ }
+ } else {
+ // or expand all
+ ((AbstractTreeViewer) viewer).expandToLevel(org.eclipse.papyrus.infra.widgets.Activator.getMaxLevelToExpandValue());
+ }
+ viewer.refresh();
+ }
+ });
+
+ buttonCollapse = new ToolItem(Toolbar, SWT.NONE);
+ buttonCollapse.setImage(Activator.getPluginIconImage(org.eclipse.papyrus.infra.widgets.Activator.PLUGIN_ID, ICONS_COLLAPSE_ALL));
+ buttonCollapse.setToolTipText(Messages.EMFGraphicalContentProvider_CollapseAllTooltip);
+ buttonCollapse.setEnabled(buttonExpandCollapseEnable);
+ buttonCollapse.addSelectionListener(new SelectionAdapter() {
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ ISelection selection = ((AbstractTreeViewer) viewer).getSelection();
+ // If there are selected element
+ if (selection instanceof StructuredSelection && !selection.isEmpty()) {
+ // expand each selected element
+ for (Object object : ((StructuredSelection) selection).toArray()) {
+ ((AbstractTreeViewer) viewer).collapseToLevel(object, AbstractTreeViewer.ALL_LEVELS);
+ }
+
+ } else {
+ // or collapse all
+ ((AbstractTreeViewer) viewer).collapseAll();
+ }
+ }
+ });
}
- protected void createPatternFilter(Composite parent) {
- StringEditor editor = new StringEditor(parent, SWT.NONE);
- editor.setLabel("Filter:");
- editor.setToolTipText("Enter the name of the element you're looking for. You can use * as a wildcard");
- editor.setValidateOnDelay(true);
+ /**
+ * create the Case sensitive checkBox.
+ *
+ * @param parent
+ * The parent {@link Composite}.
+ */
+ protected void createCaseSensitiveButton(final Composite parent) {
+ // Create the checkbox button
+ Button checkBoxCaseSensitive = new Button(parent, SWT.CHECK);
+
+ checkBoxCaseSensitive.setText(Messages.EMFGraphicalContentProvider_CaseSensitiveCheckBoxLabel);
+ checkBoxCaseSensitive.setToolTipText(Messages.EMFGraphicalContentProvider_CaseSensitiveCheckBoxTooltip);
+ checkBoxCaseSensitive.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent event) {
+ if (patternFilter instanceof PatternViewerFilter) {
+ ((PatternViewerFilter) patternFilter).setIgnoreCase(!checkBoxCaseSensitive.getSelection());
+ }
+ viewer.refresh();
+ }
+ });
+ }
+
+ /**
+ * Create the pattern filter.
+ *
+ * @param parent
+ */
+ protected void createPatternFilter(final Composite parent) {
+ StringWithClearEditor editor = new StringWithClearEditor(parent, SWT.BORDER);
+ editor.setToolTipText(Messages.EMFGraphicalContentProvider_FilterFieldTooltip);
+ editor.setValidateOnDelay(org.eclipse.papyrus.infra.widgets.Activator.getValidationDelay());
+ editor.setValidateOnDelay(org.eclipse.papyrus.infra.widgets.Activator.isFilterValidateOnDelay());
+
+ // Set replacement of stereotype delimiters
+ if (org.eclipse.papyrus.infra.widgets.Activator.isStereotypeDelimitersReplaced()) {
+ editor.addStringToReplace(org.eclipse.papyrus.infra.widgets.Activator.ST_LEFT_BEFORE, org.eclipse.papyrus.infra.widgets.Activator.ST_LEFT);
+ editor.addStringToReplace(org.eclipse.papyrus.infra.widgets.Activator.ST_RIGHT_BEFORE, org.eclipse.papyrus.infra.widgets.Activator.ST_RIGHT);
+ } else {
+ editor.clearStringToReplace();
+ }
+
+ GridLayoutFactory.fillDefaults().applyTo(editor);
+
+ editor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+
patternFilter = new PatternViewerFilter();
- currentFilterPattern = ""; //$NON-NLS-1$
+ currentFilterPattern = "*"; //$NON-NLS-1$
((PatternViewerFilter) patternFilter).setPattern(currentFilterPattern);
editor.addCommitListener(new ICommitListener() {
@Override
public void commit(AbstractEditor editor) {
- String filterPattern = (String) ((StringEditor) editor).getValue();
+ String filterPattern = (String) ((StringWithClearEditor) editor).getValue();
((PatternViewerFilter) patternFilter).setPattern(filterPattern);
+
+ List<ViewerFilter> filtersAsList = Arrays.asList(viewer.getFilters());
+ if (!filtersAsList.contains(patternFilter)) {
+ viewer.addFilter(patternFilter);
+ }
viewer.refresh();
- if (!("".equals(filterPattern) || currentFilterPattern.equals(filterPattern))) {
+
+ if (!("".equals(filterPattern) || currentFilterPattern.equals(filterPattern))) { //$NON-NLS-1$
findAndRevealFirstMatchingItem();
currentFilterPattern = filterPattern;
}
@@ -152,11 +302,22 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
});
- List<ViewerFilter> filters = new LinkedList<ViewerFilter>(Arrays.asList(viewer.getFilters()));
- filters.add(patternFilter);
- viewer.setFilters(filters.toArray(new ViewerFilter[filters.size()]));
+ // Focus on viewer when press the down arrow
+ editor.getText().addKeyListener(new KeyAdapter() {
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void keyPressed(final KeyEvent e) {
+ if (e.keyCode == SWT.ARROW_DOWN) {
+ viewer.getControl().setFocus();
+ }
+ }
+ });
+
}
+
/**
* Traverses to the first leaf item in the viewer tree and reveals it.
* <p>
@@ -168,16 +329,13 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
* @return the semantic element of the revealed item, or <code>null</code> if it could not be found.
*/
protected EObject findAndRevealFirstMatchingItem() {
- if (!(viewer instanceof TreeViewer)) {
- return null;
- }
-
- // start to search from first root element
- final Tree tree = ((TreeViewer) viewer).getTree();
- if (tree.getItems().length > 0) {
- return revealFirstLeaf(tree.getItem(0), MAX_SEARCH_DEPTH);
+ if (viewer instanceof TreeViewer) {
+ // start to search from first root element
+ final Tree tree = ((TreeViewer) viewer).getTree();
+ if (tree.getItems().length > 0) {
+ return revealFirstLeaf(tree.getItem(0), MAX_SEARCH_DEPTH);
+ }
}
-
return null;
}
@@ -253,9 +411,10 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
* {@inheritDoc}
*/
@Override
- public void createAfter(Composite parent) {
+ public void createAfter(final Composite parent) {
parent.setLayout(new GridLayout(1, false));
// createMetaclassFilter(parent); //Disabled
+
createHistory(parent);
createDetailArea(parent);
}
@@ -270,7 +429,7 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
initSelectionHistory();
Group historyGroup = new Group(parent, SWT.NONE);
- historyGroup.setText("Recent selections");
+ historyGroup.setText(Messages.EMFGraphicalContentProvider_historyGroupLabel);
historyGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
historyGroup.setLayout(new GridLayout(1, true));
@@ -281,7 +440,7 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
historyTable.setLayoutData(data);
historyViewer = new TableViewer(historyTable);
historyViewer.setContentProvider(CollectionContentProvider.instance);
- historyViewer.setLabelProvider(viewer.getLabelProvider());
+ historyViewer.setLabelProvider(new LabelProviderServiceImpl().getLabelProvider());
historyViewer.setInput(selectionHistory);
historyViewer.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -298,6 +457,14 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
}
}
});
+
+ historyViewer.addDoubleClickListener(event -> {
+ if (viewer instanceof IFireDoubleClick) {
+ ((IFireDoubleClick) viewer).fireDoubleClick(new DoubleClickEvent(viewer, event.getSelection()));
+ }
+
+ });
+
}
/**
@@ -438,7 +605,7 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
}
private String getDialogSettingsIdentifier() {
- return DIALOG_SETTINGS + "_" + historyId;
+ return DIALOG_SETTINGS + "_" + historyId; //$NON-NLS-1$
}
/**
@@ -475,7 +642,7 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
}
@Override
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput) {
encapsulated.inputChanged(viewer, oldInput, newInput);
if (viewer instanceof StructuredViewer) {
@@ -499,7 +666,7 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
return;
}
if (selectedObject == null) {
- detailLabel.setText("");
+ detailLabel.setText(""); //$NON-NLS-1$
detailLabel.setImage(null);
} else {
ILabelProvider labelProvider = (ILabelProvider) viewer.getLabelProvider();
@@ -541,4 +708,25 @@ public class EMFGraphicalContentProvider extends EncapsulatedContentProvider imp
viewer.removeSelectionChangedListener(this);
}
}
+
+ /**
+ * @see org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider#setFlat(boolean)
+ *
+ * @param isFlat
+ */
+ @Override
+ public void setFlat(final boolean isFlat) {
+ super.setFlat(isFlat);
+ if (patternFilter instanceof PatternViewerFilter) {
+ ((PatternViewerFilter) patternFilter).clearCache();
+ }
+ if (viewer != null) {
+ viewer.refresh();
+ }
+ if (null != buttonCollapse && null != buttonExpand) {
+ buttonExpandCollapseEnable = !isFlat;
+ buttonExpand.setEnabled(buttonExpandCollapseEnable);
+ buttonCollapse.setEnabled(buttonExpandCollapseEnable);
+ }
+ }
}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/Activator.java
index ea8b59f2f9e..8f725ffb90f 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/Activator.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, ALL4TEC, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,6 +9,7 @@
* Contributors:
* Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation
* Christian W. Damus - bug 485220
+ * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
*
*****************************************************************************/
package org.eclipse.papyrus.infra.ui.internal.emf;
@@ -21,6 +22,8 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.DialogSettings;
import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationCatalogManager;
import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationCatalogManagerFactory;
import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
@@ -31,6 +34,7 @@ import org.eclipse.papyrus.infra.emf.CustomizationComparator;
import org.eclipse.papyrus.infra.emf.readonly.spi.IReadOnlyManagerProcessor;
import org.eclipse.papyrus.infra.emf.spi.resolver.IEObjectResolver;
import org.eclipse.papyrus.infra.ui.internal.emf.readonly.EditorReloadProcessor;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -201,4 +205,27 @@ public class Activator extends AbstractUIPlugin {
}
return customizationManager;
}
+
+ /**
+ * Get Icon image from the specified path on the specified plugin id.
+ *
+ * @param pluginId
+ * The plugin id.
+ * @param iconPath
+ * The icon local path.
+ * @return the {@link Image}
+ */
+ public static Image getPluginIconImage(final String pluginId, final String iconPath) {
+ String key = pluginId + iconPath;
+ ImageRegistry registry = getDefault().getImageRegistry();
+ Image image = registry.get(key);
+
+ if (null == image) {
+ ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, iconPath);
+ registry.put(key, desc);
+ image = registry.get(key);
+ }
+ return image;
+ }
+
}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/Messages.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/Messages.java
index 15e09760eb5..264780eb351 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/Messages.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/Messages.java
@@ -1,5 +1,5 @@
/*************************************************************
- * Copyright (c) 2012, 2016 CEA, Christian W. Damus, and others.
+ * Copyright (c) 2012, 2016 CEA, Christian W. Damus, ALL4TEC, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,6 +10,7 @@
* Vincent Lorenzo (CEA LIST) - Initial API and implementation
* Christian W. Damus (CEA) - bug 323802
* Christian W. Damus - bug 485220
+ * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 500869
*
*/
@@ -21,6 +22,18 @@ public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.ui.internal.emf.messages.messages"; //$NON-NLS-1$
+ public static String EMFGraphicalContentProvider_CaseSensitiveCheckBoxLabel;
+
+ public static String EMFGraphicalContentProvider_CaseSensitiveCheckBoxTooltip;
+
+ public static String EMFGraphicalContentProvider_CollapseAllTooltip;
+
+ public static String EMFGraphicalContentProvider_ExpandAllTooltip;
+
+ public static String EMFGraphicalContentProvider_FilterFieldTooltip;
+
+ public static String EMFGraphicalContentProvider_historyGroupLabel;
+
public static String ResourceFilteredLabelProvider_local;
public static String ResourceFilteredLabelProvider_localExt;
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/messages.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/messages.properties
index 82ee5c28163..f6091fe2957 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/messages.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/messages.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, 2016 CEA, Christian W. Damus, and others.
+# Copyright (c) 2012, 2016 CEA, Christian W. Damus, ALL4TEC, and others.
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
@@ -10,8 +10,10 @@
# Vincent Lorenzo (CEA LIST) - Initial API and implementation
# Christian W. Damus (CEA) - bug 323802
# Christian W. Damus - bug 485220
+# Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 500869
#
+EMFGraphicalContentProvider_CaseSensitiveCheckBoxLabel=Aa
ResourceFilteredLabelProvider_local=Local model file "{0}"
ResourceFilteredLabelProvider_localExt=Local model file "{0}" ({1} component)
ResourceFilteredLabelProvider_system=System resource "{0}"
@@ -20,3 +22,8 @@ ResourceFilteredLabelProvider_workspace=Workspace model file "{0}"
ResourceFilteredLabelProvider_workspaceExt=Workspace model file "{0}" ({1} component)
ReferencedModelReadOnlyHandler_promptMsg=Do you want to make these referenced library model files writable?\n\n
ReferencedModelReadOnlyHandler_promptTitle=Enable Write
+EMFGraphicalContentProvider_CaseSensitiveCheckBoxTooltip=The search is case sensitive if selected
+EMFGraphicalContentProvider_CollapseAllTooltip=Collapse All or Selected Element
+EMFGraphicalContentProvider_ExpandAllTooltip=Expand All or Selected Element
+EMFGraphicalContentProvider_FilterFieldTooltip=Enter the name of the element you're looking for. You can use * as a wildcard
+EMFGraphicalContentProvider_historyGroupLabel=Recent selections \ No newline at end of file

Back to the top