Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2015-11-09 11:50:36 +0000
committerEd Merks2015-11-09 11:50:36 +0000
commitcc58e8052b4aebd17459ccbde2667f537b96cd3e (patch)
treea0e9bd772f6c7e7d76d3b3165b88aac31e7c54d0
parentb8b2dcfcc085dc7f387a334df5009082b3863461 (diff)
downloadeclipse.platform.ui-cc58e8052b4aebd17459ccbde2667f537b96cd3e.tar.gz
eclipse.platform.ui-cc58e8052b4aebd17459ccbde2667f537b96cd3e.tar.xz
eclipse.platform.ui-cc58e8052b4aebd17459ccbde2667f537b96cd3e.zip
Bug 481705 - Avoid Pattern.compile for constant patterns
Change-Id: I658b7b0493c916224e4783d16841141adf72f506 Signed-off-by: Ed Merks <ed.merks@gmail.com>
-rw-r--r--bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.java5
-rw-r--r--bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/ThemeElementDefinitionHelper.java4
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java2
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java4
4 files changed, 9 insertions, 6 deletions
diff --git a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.java b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.java
index 69881302aff..e54ed829f23 100644
--- a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.java
+++ b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.java
@@ -20,6 +20,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
+import java.util.regex.Pattern;
import org.eclipse.e4.ui.css.core.css2.CSS2ColorHelper;
import org.eclipse.e4.ui.css.core.css2.CSS2RGBColorImpl;
import org.eclipse.e4.ui.css.core.dom.properties.Gradient;
@@ -41,7 +42,7 @@ import org.w3c.dom.css.RGBColor;
public class CSSSWTColorHelper {
public static final String COLOR_DEFINITION_MARKER = "#";
- private static final String HEX_COLOR_VALUE_PATTERN = "#[a-fA-F0-9]{6}";
+ private static final Pattern HEX_COLOR_VALUE_PATTERN = Pattern.compile("#[a-fA-F0-9]{6}");
private static Field[] cachedFields;
@@ -91,7 +92,7 @@ public class CSSSWTColorHelper {
public static boolean hasColorDefinitionAsValue(String name) {
if (name.startsWith(COLOR_DEFINITION_MARKER)) {
- return !name.matches(HEX_COLOR_VALUE_PATTERN);
+ return !HEX_COLOR_VALUE_PATTERN.matcher(name).matches();
}
return false;
}
diff --git a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/ThemeElementDefinitionHelper.java b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/ThemeElementDefinitionHelper.java
index bbd6e1e4173..8cb5270e32d 100644
--- a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/ThemeElementDefinitionHelper.java
+++ b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/ThemeElementDefinitionHelper.java
@@ -12,10 +12,10 @@ package org.eclipse.e4.ui.css.swt.helpers;
public class ThemeElementDefinitionHelper {
public static String escapeId(String id) {
- return id.replaceAll("\\.", "-");
+ return id.replace('.', '-');
}
public static String normalizeId(String id) {
- return id.replaceAll("-", ".");
+ return id.replace('-', '.');
}
}
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java
index 61feb08daa5..7d192fc3270 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java
@@ -109,7 +109,7 @@ public abstract class SWTPartRenderer extends AbstractPartRenderer {
// this will trigger style()
String id = me.getElementId();
if (id != null) {
- id = id.replace(".", "-"); //$NON-NLS-1$ //$NON-NLS-2$
+ id = id.replace('.', '-');
}
engine.setClassnameAndId(widget, cssClassStr, id);
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java
index 06517043419..b7464e083b2 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java
@@ -19,6 +19,7 @@ import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.regex.Pattern;
import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.expressions.EvaluationResult;
@@ -103,6 +104,7 @@ public class MenuHelper {
WorkbenchSWTActivator.trace(Policy.MENUS, msg, error);
}
+ private static final Pattern SCHEME_PATTERN = Pattern.compile("\\p{Alpha}[\\p{Alnum}+.-]*:.*"); //$NON-NLS-1$
public static final String MAIN_MENU_ID = ActionSet.MAIN_MENU;
private static Field urlField;
@@ -362,7 +364,7 @@ public class MenuHelper {
// If iconPath doesn't specify a scheme, then try to transform to a URL
// RFC 3986: scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
// This allows using data:, http:, or other custom URL schemes
- if (!iconPath.matches("\\p{Alpha}[\\p{Alnum}+.-]*:.*")) { //$NON-NLS-1$
+ if (!SCHEME_PATTERN.matcher(iconPath).matches()) {
// First attempt to resolve in ISharedImages (e.g. "IMG_OBJ_FOLDER")
// as per bug 391232 & AbstractUIPlugin.imageDescriptorFromPlugin().
ImageDescriptor d = WorkbenchPlugin.getDefault().getSharedImages()

Back to the top