diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualValidator.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualValidator.java index 97cacbc9e8..d2bfe9a6f8 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualValidator.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/nonvisual/NonVisualValidator.java @@ -27,8 +27,6 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.requests.ChangeBoundsRequest; -import org.apache.commons.lang3.StringUtils; - import java.util.List; /** @@ -123,7 +121,7 @@ protected static boolean validateJavaInfo(JavaInfo newInfo) throws Exception { } // validate only java bean objects String source = newInfo.getCreationSupport().add_getSource(null); - return !StringUtils.contains(source, "%parent%") && !StringUtils.contains(source, "%child%"); + return !source.contains("%parent%") && !source.contains("%child%"); } protected static boolean acceptDropNonVisualBeans() { diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/parser/JavaInfoParser.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/parser/JavaInfoParser.java index a16a6ff46f..387ad73d26 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/parser/JavaInfoParser.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/parser/JavaInfoParser.java @@ -103,7 +103,6 @@ import org.eclipse.jdt.core.dom.VariableDeclarationFragment; import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -530,7 +529,7 @@ private static boolean isPreferredRoot(JavaInfo root) { { int position = root.getCreationSupport().getNode().getStartPosition(); String endOfLineComment = root.getEditor().getEndOfLineComment(position); - if (StringUtils.contains(endOfLineComment, "@wbp.parser.preferredRoot")) { + if (endOfLineComment != null && endOfLineComment.contains("@wbp.parser.preferredRoot")) { return true; } } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/MatchingEditPartFactory.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/MatchingEditPartFactory.java index 97469c61e1..b9f6c403d6 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/MatchingEditPartFactory.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/MatchingEditPartFactory.java @@ -18,8 +18,6 @@ import org.eclipse.gef.EditPart; -import org.apache.commons.lang3.StringUtils; - import java.lang.reflect.Constructor; import java.util.List; @@ -106,8 +104,8 @@ private EditPart createEditPart(Object model, Class modelClass) { { String modelClassName = modelClass.getName(); if (modelClassName.contains("$")) { - modelClassName = StringUtils.remove(modelClassName, "Info"); - modelClassName = StringUtils.remove(modelClassName, "$"); + modelClassName = modelClassName.replace("Info", ""); + modelClassName = modelClassName.replace("$", ""); EditPart editPart = createEditPart(model, modelClass, modelClassName, ""); if (editPart != null) { return editPart; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/errors/report2/PreferencesFileReportEntry.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/errors/report2/PreferencesFileReportEntry.java index 5354737363..8585b5d2b9 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/errors/report2/PreferencesFileReportEntry.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/errors/report2/PreferencesFileReportEntry.java @@ -23,7 +23,6 @@ import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jface.dialogs.ErrorDialog; -import org.apache.commons.lang3.StringUtils; import org.osgi.service.prefs.BackingStoreException; import java.io.ByteArrayInputStream; @@ -76,7 +75,7 @@ public boolean visit(IEclipsePreferences childNode) throws BackingStoreException return true; } // exclude all which not relative do WindowBuilder - if (!StringUtils.contains(childNode.absolutePath(), PREFERENCES_PREFIX)) { + if (!childNode.absolutePath().contains(PREFERENCES_PREFIX)) { excludesList.add(childNode.name()); } return true; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/category/PropertyCategory.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/category/PropertyCategory.java index b6dfa84a37..6df1b90a1a 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/category/PropertyCategory.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/category/PropertyCategory.java @@ -16,8 +16,6 @@ import org.eclipse.wb.internal.core.utils.StringUtilities; import org.eclipse.wb.internal.core.utils.check.Assert; -import org.apache.commons.lang3.StringUtils; - /** * Describes category of {@link Property}. * @@ -109,7 +107,7 @@ public static PropertyCategory get(String text, PropertyCategory defaultCategory return HIDDEN; } // system - if (StringUtils.startsWith(text, "system(")) { + if (text.startsWith("system(")) { String systemText = text; systemText = StringUtilities.removeStart(systemText, "system("); systemText = StringUtilities.removeEnd(systemText, ")"); diff --git a/org.eclipse.wb.rcp.databinding/src/org/eclipse/wb/internal/rcp/databinding/model/beans/observables/properties/BeanPropertiesCodeSupport.java b/org.eclipse.wb.rcp.databinding/src/org/eclipse/wb/internal/rcp/databinding/model/beans/observables/properties/BeanPropertiesCodeSupport.java index 78e7f0f88c..f38d4c47b0 100644 --- a/org.eclipse.wb.rcp.databinding/src/org/eclipse/wb/internal/rcp/databinding/model/beans/observables/properties/BeanPropertiesCodeSupport.java +++ b/org.eclipse.wb.rcp.databinding/src/org/eclipse/wb/internal/rcp/databinding/model/beans/observables/properties/BeanPropertiesCodeSupport.java @@ -35,8 +35,6 @@ import org.eclipse.jdt.core.dom.Expression; import org.eclipse.jdt.core.dom.MethodInvocation; -import org.apache.commons.lang3.StringUtils; - import java.beans.PropertyDescriptor; import java.text.MessageFormat; import java.util.HashMap; @@ -83,7 +81,7 @@ public final void setBeanType(Class beanType) throws Exception { if (m_parserBeanType != null && m_parserPropertyReference != null && m_parserPropertyType == null) { - String propertyName = StringUtils.remove(m_parserPropertyReference, "\""); + String propertyName = m_parserPropertyReference.replace("\"", ""); for (PropertyDescriptor descriptor : BeanSupport.getPropertyDescriptors(m_parserBeanType)) { if (propertyName.equals(descriptor.getName())) { m_parserPropertyType = descriptor.getPropertyType(); diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/jface/FieldEditorLabelsConstantsPropertyEditor.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/jface/FieldEditorLabelsConstantsPropertyEditor.java index 3f8883d540..c0a897af25 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/jface/FieldEditorLabelsConstantsPropertyEditor.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/jface/FieldEditorLabelsConstantsPropertyEditor.java @@ -179,7 +179,7 @@ private static String prepareLabelsFields(List resultLabels, line); } // prepare "label" and "field" code - int lastSpaceIndex = StringUtils.lastIndexOf(line, " "); + int lastSpaceIndex = line.lastIndexOf(" "); String label = line.substring(0, lastSpaceIndex).trim(); String fieldCode = line.substring(lastSpaceIndex).trim(); // convert "fieldCode" into IField diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/utils/SwingScreenshotMaker.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/utils/SwingScreenshotMaker.java index 7d79b56bb9..4e904f1ed7 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/utils/SwingScreenshotMaker.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/utils/SwingScreenshotMaker.java @@ -22,8 +22,6 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.swt.graphics.Image; -import org.apache.commons.lang3.StringUtils; - import java.awt.BorderLayout; import java.awt.Component; import java.awt.Container; @@ -232,7 +230,7 @@ public void endVisit(ObjectInfo objectInfo) throws Exception { private static void fixJLabelWithHTML(Component component) throws Exception { if (component instanceof JLabel label) { String text = label.getText(); - if (StringUtils.containsIgnoreCase(text, "")) { + if (text.toLowerCase().contains("")) { SwingImageUtils.createComponentShotAWT(component); } } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/tests/DesignerTestCase.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/tests/DesignerTestCase.java index 2df2fde000..7bfa5d3554 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/tests/DesignerTestCase.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/tests/DesignerTestCase.java @@ -578,7 +578,7 @@ private static String getNormalizedActionText(String text) { text = text.substring(0, index); } } - text = StringUtils.remove(text, "&"); + text.replace("&", ""); return text; }