Bug 467836: [BIDI] Remove the call to isProcessingNeeded

4 files changed, 16 insertions, 16 deletions

diff --git a/bundles/org.eclipse.equinox.bidi.tests/StructuredTextTestSuite.launch b/bundles/org.eclipse.equinox.bidi.tests/StructuredTextTestSuite.launch
index fa5162d41..ef882b8e6 100644
--- a/bundles/org.eclipse.equinox.bidi.tests/StructuredTextTestSuite.launch
+++ b/bundles/org.eclipse.equinox.bidi.tests/StructuredTextTestSuite.launch
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

 <booleanAttribute key="append.args" value="true"/>

 <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>

 <booleanAttribute key="askclear" value="false"/>

@@ -23,7 +24,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="true"/>

 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.bidi.tests.StructuredTextTestSuite"/>

 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.bidi.tests"/>

@@ -38,4 +39,4 @@
 <booleanAttribute key="useDefaultConfig" value="true"/>

 <booleanAttribute key="useDefaultConfigArea" value="false"/>

 <booleanAttribute key="useProduct" value="false"/>

-</launchConfiguration>
\ No newline at end of file
+</launchConfiguration>

diff --git a/bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextProcessorTest.java b/bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextProcessorTest.java
index 8fdf3cbb1..a93846b12 100644
--- a/bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextProcessorTest.java
+++ b/bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextProcessorTest.java
@@ -47,7 +47,8 @@ public class StructuredTextProcessorTest extends StructuredTextTestBase {
 	private void doTest1(String data, String result) {
 		Locale.setDefault(Locale.ENGLISH);
 		String full = StructuredTextProcessor.process(toUT16(data));
-		assertEquals("Util #1 full EN - ", data, toPseudo(full));
+		// Since https://bugs.eclipse.org/467836 , processing also works in non-bidi locales:
+		assertEquals("Util #1 full EN - ", result, toPseudo(full));
 		Locale.setDefault(new Locale(HEBREW2));
 		full = StructuredTextProcessor.process(toUT16(data));
 		assertEquals("Util #1 full HE - ", result, toPseudo(full));
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextProcessor.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextProcessor.java
index 59190f1c1..fd8b65cc6 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextProcessor.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextProcessor.java
@@ -84,7 +84,7 @@ public final class StructuredTextProcessor {
 
 	/**
 	 * Processes a string that has a particular semantic meaning to render
-	 * it correctly on bidi locales.
+	 * it correctly in bidi environments.
 	 * For more details, see {@link #process(String)}.
 	 * 
 	 * @param str the <i>lean</i> text to process
@@ -103,8 +103,6 @@ public final class StructuredTextProcessor {
 			return str;
 
 		StructuredTextEnvironment env = new StructuredTextEnvironment(null, false, StructuredTextEnvironment.ORIENT_UNKNOWN);
-		if (!env.isProcessingNeeded())
-			return str;
 		// do not process a string if all the following conditions are true:
 		//  a) it has no RTL characters
 		//  b) it starts with a LTR character
@@ -139,7 +137,7 @@ public final class StructuredTextProcessor {
 
 	/**
 	 * Processes a string that has a particular semantic meaning to render
-	 * it correctly on bidi locales.
+	 * it correctly in bidi environments.
 	 * For more details, see {@link #process(String)}.
 	 * 
 	 * @param  str the <i>lean</i> text to process.
@@ -164,8 +162,6 @@ public final class StructuredTextProcessor {
 
 		// make sure that LRE/PDF are added around the string
 		StructuredTextEnvironment env = new StructuredTextEnvironment(null, false, StructuredTextEnvironment.ORIENT_UNKNOWN);
-		if (!env.isProcessingNeeded())
-			return str;
 		IStructuredTextExpert expert = StructuredTextExpertFactory.getExpert(textType, env);
 		return expert.leanToFullText(str);
 	}
@@ -180,9 +176,6 @@ public final class StructuredTextProcessor {
 	public static String deprocess(String str) {
 		if ((str == null) || (str.length() <= 1))
 			return str;
-		StructuredTextEnvironment env = new StructuredTextEnvironment(null, false, StructuredTextEnvironment.ORIENT_UNKNOWN);
-		if (!env.isProcessingNeeded())
-			return str;
 
 		StringBuffer buf = new StringBuffer();
 		int strLen = str.length();
@@ -220,10 +213,8 @@ public final class StructuredTextProcessor {
 		if ((str == null) || (str.length() <= 1))
 			return str;
 
-		// make sure that LRE/PDF are added around the string
+		// make sure that LRE/PDF are removed from the string
 		StructuredTextEnvironment env = new StructuredTextEnvironment(null, false, StructuredTextEnvironment.ORIENT_UNKNOWN);
-		if (!env.isProcessingNeeded())
-			return str;
 		IStructuredTextExpert expert = StructuredTextExpertFactory.getExpert(textType, env);
 		return expert.fullToLeanText(str);
 	}
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java
index 88b8cdcff..e0e46f459 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java
@@ -169,8 +169,15 @@ public class StructuredTextEnvironment {
 	 * depends on the operating system (must be supported by this package)
 	 * and on the language supplied when constructing the instance (it
 	 * must be a language using a bidirectional script).
+	 * <p>
+	 * Note: This API is rarely used any more. E.g. in Eclipse/JFace,
+	 * bidi support is typically controlled by the application via
+	 * {@code org.eclipse.jface.util.BidiUtils#setBidiSupport(boolean)}.
+	 * </p>
 	 * 
 	 * @return <code>true</code> if bidi processing is needed in this environment.
+	 * 
+	 * @deprecated let users control bidi processing independent of the locale
 	 */
 	public boolean isProcessingNeeded() {
 		if (processingNeeded == null) {