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 b6dfa84a3..05d394d95 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 != null && text.startsWith("system(")) { String systemText = text; systemText = StringUtilities.removeStart(systemText, "system("); systemText = StringUtilities.removeEnd(systemText, ")"); 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 3f8883d54..ef574b739 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -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 7d79b56bb..cfc323f8f 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -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 != null && text.toLowerCase().contains("")) { SwingImageUtils.createComponentShotAWT(component); } }