eclipse-windowbuilder · ptziegler · May 22, 2025 · May 17, 2025
diff --git a/...lipse.wb.core.java/src/org/eclipse/wb/internal/core/eval/evaluators/BooleanEvaluator.java b/...lipse.wb.core.java/src/org/eclipse/wb/internal/core/eval/evaluators/BooleanEvaluator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 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
@@ -25,9 +25,8 @@
 import org.eclipse.jdt.core.dom.InfixExpression.Operator;
 import org.eclipse.jdt.core.dom.PrefixExpression;
 
-import org.apache.commons.lang3.ObjectUtils;
-
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Implementation of {@link IExpressionEvaluator} for "boolean" type.
@@ -74,11 +73,11 @@ public Object evaluate(EvaluationContext context,
 					Object rightObject = AstEvaluationEngine.evaluate(context, rightOperand);
 					// ==
 					if (operator == InfixExpression.Operator.EQUALS) {
-						return ObjectUtils.equals(leftObject, rightObject);
+						return Objects.equals(leftObject, rightObject);
 					}
 					// !=
 					if (operator == InfixExpression.Operator.NOT_EQUALS) {
-						return !ObjectUtils.equals(leftObject, rightObject);
+						return !Objects.equals(leftObject, rightObject);
 					}
 				}
 				// prepare operands

diff --git a/...core.java/src/org/eclipse/wb/internal/core/model/description/ComponentDescriptionKey.java b/...core.java/src/org/eclipse/wb/internal/core/model/description/ComponentDescriptionKey.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 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
@@ -15,7 +15,7 @@
 import org.eclipse.wb.core.model.JavaInfo;
 import org.eclipse.wb.internal.core.utils.check.Assert;
 
-import org.apache.commons.lang3.ObjectUtils;
+import java.util.Objects;
 
 /**
  * The key for caching {@link ComponentDescription}.
@@ -71,8 +71,8 @@ public int hashCode() {
 	public boolean equals(Object obj) {
 		if (obj instanceof ComponentDescriptionKey key) {
 			return m_componentClass == key.m_componentClass
-					&& ObjectUtils.equals(m_host, key.m_host)
-					&& ObjectUtils.equals(m_suffix, key.m_suffix);
+					&& Objects.equals(m_host, key.m_host)
+					&& Objects.equals(m_suffix, key.m_suffix);
 		}
 		return false;
 	}

diff --git a/...b.core.java/src/org/eclipse/wb/internal/core/model/property/GenericPropertyComposite.java b/...b.core.java/src/org/eclipse/wb/internal/core/model/property/GenericPropertyComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc. and others.
+ * Copyright (c) 2011, 2025 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
@@ -18,7 +18,8 @@
 import org.eclipse.jdt.core.dom.Expression;
 
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.ObjectUtils;
+
+import java.util.Objects;
 
 /**
  * Implementation of {@link GenericProperty} for composite property.
@@ -110,7 +111,7 @@ public Object getValue() throws Exception {
 			Object propertyValue = property.getValue();
 			if (value == NO_VALUE) {
 				value = propertyValue;
-			} else if (!ObjectUtils.equals(value, propertyValue)) {
+			} else if (!Objects.equals(value, propertyValue)) {
 				return UNKNOWN_VALUE;
 			}
 		}
@@ -125,7 +126,7 @@ public Object getDefaultValue() {
 			Object propertyValue = property.getDefaultValue();
 			if (value == NO_VALUE) {
 				value = propertyValue;
-			} else if (!ObjectUtils.equals(value, propertyValue)) {
+			} else if (!Objects.equals(value, propertyValue)) {
 				return UNKNOWN_VALUE;
 			}
 		}

diff --git a/...pse.wb.core.java/src/org/eclipse/wb/internal/core/model/property/GenericPropertyImpl.java b/...pse.wb.core.java/src/org/eclipse/wb/internal/core/model/property/GenericPropertyImpl.java
@@ -38,13 +38,13 @@
 
 import org.eclipse.jdt.core.dom.Expression;
 
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Concrete implementation of {@link GenericProperty}.
@@ -338,7 +338,7 @@ private boolean setExpressionUsingAccessor(ExpressionAccessor accessor,
 			Object value) throws Exception {
 		// check for default value
 		if (value != UNKNOWN_VALUE) {
-			if (ObjectUtils.equals(getDefaultValue(accessor), value)) {
+			if (Objects.equals(getDefaultValue(accessor), value)) {
 				source = null;
 			}
 		}

diff --git a/...c/org/eclipse/wb/internal/core/model/property/editor/EnumerationValuesPropertyEditor.java b/...c/org/eclipse/wb/internal/core/model/property/editor/EnumerationValuesPropertyEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 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
@@ -17,9 +17,8 @@
 import org.eclipse.wb.internal.core.model.property.GenericProperty;
 import org.eclipse.wb.internal.core.model.property.Property;
 
-import org.apache.commons.lang3.ObjectUtils;
-
 import java.beans.PropertyDescriptor;
+import java.util.Objects;
 
 /**
  * {@link PropertyEditor} for "enumerationValues" attribute of {@link PropertyDescriptor}.
@@ -66,7 +65,7 @@ public String getText(Property property) throws Exception {
 		// return name for value
 		if (value != Property.UNKNOWN_VALUE) {
 			for (int i = 0; i < m_values.length; i++) {
-				if (ObjectUtils.equals(m_values[i], value)) {
+				if (Objects.equals(m_values[i], value)) {
 					return m_names[i];
 				}
 			}
@@ -84,7 +83,7 @@ public String getText(Property property) throws Exception {
 	public String getValueSource(Object value) throws Exception {
 		if (value != Property.UNKNOWN_VALUE) {
 			for (int i = 0; i < m_values.length; i++) {
-				if (ObjectUtils.equals(m_values[i], value)) {
+				if (Objects.equals(m_values[i], value)) {
 					return m_sources[i];
 				}
 			}

diff --git a/...ava/src/org/eclipse/wb/internal/core/model/property/editor/StaticFieldPropertyEditor.java b/...ava/src/org/eclipse/wb/internal/core/model/property/editor/StaticFieldPropertyEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 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
@@ -23,7 +23,6 @@
 import org.eclipse.wb.internal.core.utils.state.EditorState;
 import org.eclipse.wb.internal.core.utils.state.EditorWarning;
 
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Field;
@@ -32,6 +31,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * The {@link PropertyEditor} for selecting single field of class from given set.
@@ -79,7 +79,7 @@ public String getText(Property property) throws Exception {
 		if (value != Property.UNKNOWN_VALUE) {
 			for (int i = 0; i < m_values.length; i++) {
 				Object fieldValue = m_values[i];
-				if (ObjectUtils.equals(fieldValue, value)) {
+				if (Objects.equals(fieldValue, value)) {
 					return m_titles[i];
 				}
 			}
@@ -98,7 +98,7 @@ public String getValueSource(Object value) throws Exception {
 		if (value != Property.UNKNOWN_VALUE) {
 			for (int i = 0; i < m_values.length; i++) {
 				Object fieldValue = m_values[i];
-				if (ObjectUtils.equals(fieldValue, value)) {
+				if (Objects.equals(fieldValue, value)) {
 					String fieldName = m_names[i];
 					if (fieldName == null) {
 						return null;

diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/GraphicalViewer.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/GraphicalViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc.
+ * Copyright (c) 2011, 2025 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
@@ -30,9 +30,8 @@
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.widgets.Composite;
 
-import org.apache.commons.lang3.ObjectUtils;
-
 import java.util.Collection;
+import java.util.Objects;
 
 /**
  * @author lobas_av
@@ -186,7 +185,7 @@ public EditPart findTargetEditPart(int x,
 			protected boolean acceptVisit(Figure figure) {
 				for (org.eclipse.gef.EditPart editPart : exclude) {
 					GraphicalEditPart graphicalPart = (GraphicalEditPart) editPart;
-					if (ObjectUtils.equals(figure, graphicalPart.getFigure())) {
+					if (Objects.equals(figure, graphicalPart.getFigure())) {
 						return false;
 					}
 				}

diff --git a/...lipse.wb.core/src/org/eclipse/wb/core/editor/actions/assistant/AbstractAssistantPage.java b/...lipse.wb.core/src/org/eclipse/wb/core/editor/actions/assistant/AbstractAssistantPage.java
@@ -37,13 +37,13 @@
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
 
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Abstract implementation of {@link ILayoutAssistantPage} with convenient function to create
@@ -186,7 +186,7 @@ protected final Object getValue() {
 					Object value = property.getValue();
 					if (commonValue == NO_VALUE) {
 						commonValue = value;
-					} else if (!ObjectUtils.equals(commonValue, value)) {
+					} else if (!Objects.equals(commonValue, value)) {
 						return Property.UNKNOWN_VALUE;
 					}
 				}
@@ -200,7 +200,7 @@ protected final Object getValue() {
 		 */
 		protected final void setValue(final Object value) {
 			prepareProperties();
-			if (m_currentValue != Property.UNKNOWN_VALUE && ObjectUtils.equals(m_currentValue, value)) {
+			if (m_currentValue != Property.UNKNOWN_VALUE && Objects.equals(m_currentValue, value)) {
 				return;
 			}
 			m_currentValue = value;
@@ -630,7 +630,7 @@ public void showValue() {
 			Object value = getValue();
 			for (Button button : m_buttons) {
 				Object buttonValue = button.getData();
-				button.setSelection(ObjectUtils.equals(value, buttonValue));
+				button.setSelection(Objects.equals(value, buttonValue));
 			}
 		}
 

diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/PolicyUtils.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/PolicyUtils.java
@@ -35,9 +35,8 @@
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.draw2d.geometry.Translatable;
 
-import org.apache.commons.lang3.ObjectUtils;
-
 import java.lang.reflect.Method;
+import java.util.Objects;
 
 /**
  * Helper for {@link EditPolicy}'s.
@@ -223,7 +222,7 @@ public static void translateModelToFeedback(GraphicalEditPolicy policy, Translat
 		} else if (policy instanceof SelectionEditPolicy) {
 			translateAbsoluteToModel((SelectionEditPolicy) policy, t);
 		} else {
-			throw new IllegalArgumentException(ObjectUtils.toString(policy));
+			throw new IllegalArgumentException(Objects.toString(policy));
 		}
 	}
 

diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/Pair.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/Pair.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 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
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.core.utils;
 
-import org.apache.commons.lang3.ObjectUtils;
+import java.util.Objects;
 
 /**
  * Pair of two objects.
@@ -47,8 +47,8 @@ public boolean equals(Object o) {
 		if (!(o instanceof Pair<?, ?> other)) {
 			return false;
 		}
-		return ObjectUtils.equals(getLeft(), other.getLeft())
-				&& ObjectUtils.equals(getRight(), other.getRight());
+		return Objects.equals(getLeft(), other.getLeft())
+				&& Objects.equals(getRight(), other.getRight());
 	}
 
 	@Override

diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/binding/ValueUtils.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/binding/ValueUtils.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 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
@@ -13,9 +13,9 @@
 package org.eclipse.wb.internal.core.utils.binding;
 
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.ObjectUtils;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author lobas_av
@@ -43,7 +43,7 @@ public static boolean objectToBoolean(Object value) {
 			return booleanObject.booleanValue();
 		}
 		// extract from Object
-		String stringObject = ObjectUtils.toString(value);
+		String stringObject = Objects.toString(value);
 		return BooleanUtils.toBoolean(stringObject);
 	}
 

diff --git a/...pse.wb.core/src/org/eclipse/wb/internal/core/utils/binding/editors/StringComboEditor.java b/...pse.wb.core/src/org/eclipse/wb/internal/core/utils/binding/editors/StringComboEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 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
@@ -15,7 +15,7 @@
 import org.eclipse.wb.internal.core.utils.binding.IDataEditor;
 import org.eclipse.wb.internal.core.utils.dialogfields.ComboDialogField;
 
-import org.apache.commons.lang3.ObjectUtils;
+import java.util.Objects;
 
 /**
  * @author lobas_av
@@ -45,6 +45,6 @@ public Object getValue() {
 
 	@Override
 	public void setValue(Object value) {
-		m_field.setText(ObjectUtils.toString(value));
+		m_field.setText(Objects.toString(value));
 	}
 }
diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/binding/editors/StringEditor.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/binding/editors/StringEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 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
@@ -15,7 +15,7 @@
 import org.eclipse.wb.internal.core.utils.binding.IDataEditor;
 import org.eclipse.wb.internal.core.utils.dialogfields.StringDialogField;
 
-import org.apache.commons.lang3.ObjectUtils;
+import java.util.Objects;
 
 /**
  * @author lobas_av
@@ -45,6 +45,6 @@ public Object getValue() {
 
 	@Override
 	public void setValue(Object value) {
-		m_field.setText(ObjectUtils.toString(value));
+		m_field.setText(Objects.toString(value));
 	}
 }