diff --git a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormTextModel.java b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormTextModel.java index 9a2b7ac8c81..5cafdc77e10 100644 --- a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormTextModel.java +++ b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormTextModel.java @@ -122,11 +122,11 @@ public void parseTaggedText(String taggedText, boolean expandURLs) { private String processAmpersandEscapes(String pTaggedText) { try { - String taggedText = pTaggedText.replaceAll(""", """); //$NON-NLS-1$//$NON-NLS-2$ - taggedText = taggedText.replaceAll("'", "'"); //$NON-NLS-1$//$NON-NLS-2$ - taggedText = taggedText.replaceAll("<", "<"); //$NON-NLS-1$//$NON-NLS-2$ - taggedText = taggedText.replaceAll(">", ">"); //$NON-NLS-1$//$NON-NLS-2$ - taggedText = taggedText.replaceAll("&", "&"); //$NON-NLS-1$//$NON-NLS-2$ + String taggedText = pTaggedText.replace(""", """); //$NON-NLS-1$//$NON-NLS-2$ + taggedText = taggedText.replace("'", "'"); //$NON-NLS-1$//$NON-NLS-2$ + taggedText = taggedText.replace("<", "<"); //$NON-NLS-1$//$NON-NLS-2$ + taggedText = taggedText.replace(">", ">"); //$NON-NLS-1$//$NON-NLS-2$ + taggedText = taggedText.replace("&", "&"); //$NON-NLS-1$//$NON-NLS-2$ return taggedText.replaceAll("&([^#])", "&$1"); //$NON-NLS-1$//$NON-NLS-2$ } catch (Exception e) { return pTaggedText; diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java index 03555b7b346..18a68477951 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java @@ -960,7 +960,7 @@ public void run() { try { String pattern= ((String)clipboard.getContents(TextTransfer.getInstance())); if (pattern != null) { - final Template template= new Template(createTemplateName(), TemplatesMessages.TemplatesPage_paste_description, getContextTypeId(), pattern.replaceAll("\\$", "\\$\\$"), true); //$NON-NLS-1$//$NON-NLS-2$ + final Template template= new Template(createTemplateName(), TemplatesMessages.TemplatesPage_paste_description, getContextTypeId(), pattern.replace("$", "$$"), true); //$NON-NLS-1$//$NON-NLS-2$ getShell().getDisplay().asyncExec(() -> addTemplate(template)); return; } @@ -1556,7 +1556,7 @@ public void drop(DropTargetEvent event) { contextId= ((TemplatePersistenceData) object).getTemplate().getContextTypeId(); } if (textTransfer.isSupportedType(event.currentDataType)) { - String text= ((String) event.data).replaceAll("\\$", "\\$\\$"); //$NON-NLS-1$ //$NON-NLS-2$ + String text= ((String) event.data).replace("$", "$$"); //$NON-NLS-1$ //$NON-NLS-2$ final Template template= new Template(createTemplateName(), TemplatesMessages.TemplatesPage_paste_description, contextId, text, true); diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java index 1bab4680e52..f353fcd2f8a 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/AbstractPairMatcherTest.java @@ -416,7 +416,7 @@ public TestCase createTestCase(String str) { pos2= pos1; } - final String stripped= str.replaceAll("%", "").replaceAll("#", ""); + final String stripped= str.replace("%", "").replace("#", ""); if (enclosingTest) { return new TestCase(stripped, pos1, pos2, match1, match2); diff --git a/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/internal/registration/ProcessSpy.java b/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/internal/registration/ProcessSpy.java index aa8457cb874..f98701b650c 100644 --- a/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/internal/registration/ProcessSpy.java +++ b/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/internal/registration/ProcessSpy.java @@ -22,7 +22,7 @@ public class ProcessSpy implements IProcessExecutor { @Override public String execute(String process, String... args) throws IOException { records.add(new Record(process, args)); - return result == null ? null : result.replaceAll("\r\n", "\n"); + return result == null ? null : result.replace("\r\n", "\n"); } static class Record { diff --git a/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/internal/registration/TestUnitPlistFileWriter.java b/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/internal/registration/TestUnitPlistFileWriter.java index 83f5e7aa049..e3f76477d1b 100644 --- a/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/internal/registration/TestUnitPlistFileWriter.java +++ b/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/internal/registration/TestUnitPlistFileWriter.java @@ -234,7 +234,7 @@ private void assertSchemesInOrder(PlistFileWriter writer, String... schemes) { private void assertXml(String xml, PlistFileWriter writer) { StringWriter stringWriters[] = new StringWriter[1]; writer.writeTo(() -> (stringWriters[0] = new StringWriter())); - assertEquals(xml, stringWriters[0].toString().replaceAll("\r\n", "\n")); + assertEquals(xml, stringWriters[0].toString().replace("\r\n", "\n")); } private PlistFileWriter getWriter() { diff --git a/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ReconcilerStrategyFirst.java b/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ReconcilerStrategyFirst.java index d5f6ac58bd1..c6168ce7865 100644 --- a/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ReconcilerStrategyFirst.java +++ b/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ReconcilerStrategyFirst.java @@ -54,7 +54,7 @@ public void initialReconcile() { String doc = document.get(); if(doc.contains(SEARCH_TERM)) { Display.getDefault().asyncExec(() -> { - document.set(document.get().replaceAll(SEARCH_TERM, REPLACEMENT)); + document.set(document.get().replace(SEARCH_TERM, REPLACEMENT)); }); } } diff --git a/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ReconcilerStrategySecond.java b/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ReconcilerStrategySecond.java index afa3b938781..7639967057b 100644 --- a/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ReconcilerStrategySecond.java +++ b/tests/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ReconcilerStrategySecond.java @@ -54,7 +54,7 @@ public void initialReconcile() { String doc = document.get(); if(doc.contains(SEARCH_TERM)) { Display.getDefault().asyncExec(() -> { - document.set(document.get().replaceAll(SEARCH_TERM, REPLACEMENT)); + document.set(document.get().replace(SEARCH_TERM, REPLACEMENT)); }); } }