[565405] Copy deleted message from Eclipse for our own FilteredTree

classes

Several changes have been done in Eclipse FilteredTree class. With the
canary target platform, there are some compilation failures, caused by
one of the commit for "bug 564975 - Unused keys in message classes" [1].
The changes in FilteredTree are here since long time but not detected
before.

To be compatible from Eclipse Photon to Eclipse 202009 (canary) we can
not simply duplicate classes from current Eclipse 202009 (as it was done
before for Eclipse Juno to benefit in QuickOutlineControl, of new
features not available in Juno (bugzilla 460712 [2] and commit 302d195d
[3]). Indeed, the delete button of the search field depends on specific
OS implementation, especially Text class for Windows that has been
adapted for that recently ("Bug 293230 [4] - Support SWT.ICON_SEARCH and
SWT.ICON_CANCEL for native find/filter/search box for Windows 7 /
Windows 10").

So this commit simply copies the deleted message and uses it in our own
copies of FilteredTree.

We can switch to the new "implementation" as soon as the bottom
supported version will be 201909.

[1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=564975
[2] https://bugs.eclipse.org/bugs/show_bug.cgi?id=460712
[3] https://git.eclipse.org/c/sirius/org.eclipse.sirius.git/commit/?id=302d195dac44967e5875fc174d43a331ad1f16fe
[4] https://bugs.eclipse.org/bugs/show_bug.cgi?id=293230

Bug: 565405
Change-Id: I3a865c245bce918bc1471896d8a5e654675fe55e
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

6 files changed, 50 insertions, 6 deletions

diff --git a/plugins/org.eclipse.sirius.ext.e3.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ext.e3.ui/META-INF/MANIFEST.MF
index d1aee2a57b..8ff9b8b84d 100644
--- a/plugins/org.eclipse.sirius.ext.e3.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ext.e3.ui/META-INF/MANIFEST.MF
@@ -6,8 +6,9 @@ Bundle-Version: 6.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Import-Package: com.ibm.icu.text;version="4.4.2.2"
-Export-Package: org.eclipse.sirius.ext.e3.ui;version="3.1.0",
+Import-Package: com.ibm.icu.text;version="4.4.2.2",
+ org.eclipse.sirius.ext.base;version="2.1.0"
+Export-Package: org.eclipse.sirius.ext.e3.ui;version="6.4.0",
  org.eclipse.sirius.ext.e3.ui.dialogs;version="3.0.0"
 Require-Bundle: org.eclipse.swt;bundle-version="3.8.1",
  org.eclipse.core.runtime;bundle-version="3.8.0",
diff --git a/plugins/org.eclipse.sirius.ext.e3.ui/plugin.properties b/plugins/org.eclipse.sirius.ext.e3.ui/plugin.properties
index 52234616c3..3c3e35bd6c 100644
--- a/plugins/org.eclipse.sirius.ext.e3.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.e3.ui/plugin.properties
@@ -12,3 +12,5 @@
 # ====================================================================
 pluginName = Sirius Library Extension - Eclipse 3.x UI
 providerName = Eclipse Modeling Project
+
+FilteredTree_AccessibleListenerClearButton=Clear filter field
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.ext.e3.ui/src/org/eclipse/sirius/ext/e3/ui/Messages.java b/plugins/org.eclipse.sirius.ext.e3.ui/src/org/eclipse/sirius/ext/e3/ui/Messages.java
new file mode 100644
index 0000000000..b19036ebf0
--- /dev/null
+++ b/plugins/org.eclipse.sirius.ext.e3.ui/src/org/eclipse/sirius/ext/e3/ui/Messages.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Obeo.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.ext.e3.ui;
+
+import org.eclipse.sirius.ext.base.I18N;
+import org.eclipse.sirius.ext.base.I18N.TranslatableMessage;
+
+/**
+ * Helper class to obtains translated strings.
+ * 
+ * @author lredor
+ */
+public final class Messages {
+
+    static {
+        I18N.initializeMessages(Messages.class, Eclipse3UIExtPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+    @TranslatableMessage
+    public static String FilteredTree_AccessibleListenerClearButton;
+
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.ext.e3.ui/src/org/eclipse/sirius/ext/e3/ui/dialogs/FilteredTree.java b/plugins/org.eclipse.sirius.ext.e3.ui/src/org/eclipse/sirius/ext/e3/ui/dialogs/FilteredTree.java
index 6f95ec7b82..9ec637004a 100644
--- a/plugins/org.eclipse.sirius.ext.e3.ui/src/org/eclipse/sirius/ext/e3/ui/dialogs/FilteredTree.java
+++ b/plugins/org.eclipse.sirius.ext.e3.ui/src/org/eclipse/sirius/ext/e3/ui/dialogs/FilteredTree.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2015 IBM Corporation and others.
+ * Copyright (c) 2004, 2020 IBM Corporation and others.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -29,6 +29,7 @@ import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.sirius.ext.e3.ui.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.ACC;
 import org.eclipse.swt.accessibility.AccessibleAdapter;
@@ -999,7 +1000,7 @@ public class FilteredTree extends Composite {
                 new AccessibleAdapter() {
                     @Override
                     public void getName(AccessibleEvent e) {
-                        e.result= WorkbenchMessages.FilteredTree_AccessibleListenerClearButton;
+                        e.result= Messages.FilteredTree_AccessibleListenerClearButton;
                     }
             });
             clearButton.getAccessible().addAccessibleControlListener(
diff --git a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
index d0757ec62d..8bb9e4a629 100644
--- a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
@@ -121,6 +121,7 @@ Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.sirius.ext.base;version="2.1.0",
  org.eclipse.sirius.ext.base.cache;version="2.0.4",
  org.eclipse.sirius.ext.base.relations;version="2.0.0",
+ org.eclipse.sirius.ext.e3.ui;version="6.4.0",
  org.eclipse.sirius.ext.emf.ui;version="3.0.0",
  org.eclipse.sirius.ext.emf.ui.properties;version="3.0.0",
  org.eclipse.sirius.ext.jface.viewers;version="3.1.0",
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/FilteredCommonTree.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/FilteredCommonTree.java
index e9c55b28c3..e3e2102af6 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/FilteredCommonTree.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/FilteredCommonTree.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2019 IBM Corporation and others.
+ * Copyright (c) 2004, 2020 IBM Corporation and others.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -939,7 +939,7 @@ public class FilteredCommonTree extends Composite {
             clearButton.getAccessible().addAccessibleListener(new AccessibleAdapter() {
                 @Override
                 public void getName(AccessibleEvent e) {
-                    e.result = WorkbenchMessages.FilteredTree_AccessibleListenerClearButton;
+                    e.result = org.eclipse.sirius.ext.e3.ui.Messages.FilteredTree_AccessibleListenerClearButton;
                 }
             });
             clearButton.getAccessible().addAccessibleControlListener(new AccessibleControlAdapter() {