Bug 546994 - Fix usage of Objects.equals -> Arrays.equals
Change-Id: I24df193b8c3ce086d552e2ce61b5d16131b1d184
Signed-off-by: Mickael Istria <mistria@redhat.com>
diff --git a/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Command.java b/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Command.java
index 2e30c20..071517e 100644
--- a/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Command.java
+++ b/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Command.java
@@ -367,7 +367,7 @@
final boolean categoryChanged = !Objects.equals(this.category, category);
this.category = category;
- final boolean parametersChanged = !Objects.equals(this.parameters,
+ final boolean parametersChanged = !Arrays.equals(this.parameters,
parameters);
this.parameters = parameters;
diff --git a/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterizedCommand.java b/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterizedCommand.java
index 4430ba3..31aa1c9 100644
--- a/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterizedCommand.java
+++ b/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterizedCommand.java
@@ -431,11 +431,8 @@
}
final ParameterizedCommand command = (ParameterizedCommand) object;
- if (!Objects.equals(this.command, command.command)) {
- return false;
- }
-
- return Objects.equals(this.parameterizations, command.parameterizations);
+ return Objects.equals(this.command, command.command)
+ && Arrays.equals(this.parameterizations, command.parameterizations);
}
/**
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AggregateWorkingSet.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AggregateWorkingSet.java
index 8aa7c19..4497ccf 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AggregateWorkingSet.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AggregateWorkingSet.java
@@ -270,7 +270,7 @@
AggregateWorkingSet workingSet = (AggregateWorkingSet) object;
return Objects.equals(workingSet.getName(), getName())
- && Objects.equals(workingSet.getComponentsInternal(), getComponentsInternal());
+ && Arrays.equals(workingSet.getComponentsInternal(), getComponentsInternal());
}
return false;
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java
index 709dff8..51a4446 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java
@@ -39,7 +39,6 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Objects;
import java.util.StringTokenizer;
import org.eclipse.core.commands.common.EventManager;
import org.eclipse.core.runtime.IConfigurationElement;
@@ -112,7 +111,7 @@
/**
* Return the objects related to the filename
- *
+ *
* @param fileName
* @return the objects related to the filename
*/
@@ -176,7 +175,7 @@
/**
* Return an instance of the receiver. Adds listeners into the extension
* registry for dynamic UI purposes.
- *
+ *
* @param contentTypeManager
*/
public EditorRegistry(IContentTypeManager contentTypeManager) {
@@ -456,7 +455,7 @@
* if they access any of the images held by these editors that they also dispose
* them
* </p>
- *
+ *
* @return the editor descriptors
*/
public IEditorDescriptor[] getSortedEditorsFromOS() {
@@ -1695,17 +1694,8 @@
}
MockMapping mapping = (MockMapping) obj;
- if (!this.filename.equals(mapping.filename)) {
- return false;
- }
-
- if (!this.extension.equals(mapping.extension)) {
- return false;
- }
-
- if (!Objects.equals(this.getEditors(), mapping.getEditors())) {
- return false;
- }
- return Objects.equals(this.getDeletedEditors(), mapping.getDeletedEditors());
+ return this.filename.equals(mapping.filename) && this.extension.equals(mapping.extension)
+ && Arrays.equals(this.getEditors(), mapping.getEditors())
+ && Arrays.equals(this.getDeletedEditors(), mapping.getDeletedEditors());
}
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ActionSetSourceProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ActionSetSourceProvider.java
index 9bad956..b32310c 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ActionSetSourceProvider.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ActionSetSourceProvider.java
@@ -14,9 +14,9 @@
package org.eclipse.ui.internal.services;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import java.util.Objects;
import org.eclipse.ui.AbstractSourceProvider;
import org.eclipse.ui.ISources;
import org.eclipse.ui.internal.ActionSetsEvent;
@@ -54,7 +54,7 @@
@Override
public void actionSetsChanged(final ActionSetsEvent event) {
final IActionSetDescriptor[] newActionSets = event.getNewActionSets();
- if (!Objects.equals(newActionSets, activeActionSets)) {
+ if (!Arrays.equals(newActionSets, activeActionSets)) {
if (DEBUG) {
final StringBuilder message = new StringBuilder();
message.append("Action sets changed to ["); //$NON-NLS-1$
