Skip to content
Commits on Source (6)
Show whitespace changes
Inline Side-by-side
.mvn/extensions.xml
View file @ 07f03419
......@@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pomless</artifactId>
<version>1.3.0</version>
<version>1.4.0</version>
</extension>
</extensions>
\ No newline at end of file
bundles/org.eclipse.core.commands/.settings/org.eclipse.pde.api.tools.prefs 0 → 100644
View file @ 07f03419
ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
API_USE_SCAN_FIELD_SEVERITY=Error
API_USE_SCAN_METHOD_SEVERITY=Error
API_USE_SCAN_TYPE_SEVERITY=Error
CLASS_ELEMENT_TYPE_ADDED_FIELD=Error
CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
ILLEGAL_EXTEND=Warning
ILLEGAL_IMPLEMENT=Warning
ILLEGAL_INSTANTIATE=Warning
ILLEGAL_OVERRIDE=Warning
ILLEGAL_REFERENCE=Warning
INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error
INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
INVALID_ANNOTATION=Ignore
INVALID_JAVADOC_TAG=Ignore
INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
LEAK_EXTEND=Warning
LEAK_FIELD_DECL=Warning
LEAK_IMPLEMENT=Warning
LEAK_METHOD_PARAM=Warning
LEAK_METHOD_RETURN_TYPE=Warning
METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
MISSING_EE_DESCRIPTIONS=Warning
TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
UNUSED_PROBLEM_FILTERS=Warning
automatically_removed_unused_problem_filters=false
changed_execution_env=Error
eclipse.preferences.version=1
incompatible_api_component_version=Error
incompatible_api_component_version_report_major_without_breaking_change=Error
incompatible_api_component_version_report_minor_without_api_change=Error
invalid_since_tag_version=Error
malformed_since_tag=Error
missing_since_tag=Error
report_api_breakage_when_major_version_incremented=Disabled
report_resolution_errors_api_component=Warning
bundles/org.eclipse.core.commands/META-INF/MANIFEST.MF
View file @ 07f03419
......@@ -2,13 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.core.commands
Bundle-Version: 3.9.300.qualifier
Bundle-Version: 3.9.400.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.core.commands,
org.eclipse.core.commands.common,
org.eclipse.core.commands.contexts,
org.eclipse.core.commands.internal.util;x-internal:=true,
org.eclipse.core.commands.operations,
org.eclipse.core.commands.util,
org.eclipse.core.internal.commands.operations;x-internal:=true,
......
bundles/org.eclipse.core.commands/forceQualifierUpdate.txt
View file @ 07f03419
# To force a version qualifier update add the bug here
Bug 403352 - Update all parent versions to match our build stream
Bug 546976 - Gerrit Jenkins jobs report comparator warnings which are not reported by official builds
\ No newline at end of file
bundles/org.eclipse.core.commands/pom.xml
View file @ 07f03419
......@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.platform.ui</artifactId>
<groupId>eclipse.platform.ui</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.commands</artifactId>
<version>3.9.300-SNAPSHOT</version>
<version>3.9.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Category.java
View file @ 07f03419
......@@ -16,9 +16,9 @@ package org.eclipse.core.commands;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.Objects;
import org.eclipse.core.commands.common.NamedHandleObject;
import org.eclipse.core.internal.commands.util.Util;
/**
* <p>
......@@ -94,10 +94,10 @@ public final class Category extends NamedHandleObject {
final boolean definedChanged = !this.defined;
this.defined = true;
final boolean nameChanged = !Util.equals(this.name, name);
final boolean nameChanged = !Objects.equals(this.name, name);
this.name = name;
final boolean descriptionChanged = !Util.equals(this.description, description);
final boolean descriptionChanged = !Objects.equals(this.description, description);
this.description = description;
fireCategoryChanged(new CategoryEvent(this, definedChanged, descriptionChanged, nameChanged));
......
bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Command.java
View file @ 07f03419
......@@ -17,6 +17,7 @@ import java.io.BufferedWriter;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Arrays;
import java.util.Objects;
import org.eclipse.core.commands.common.NotDefinedException;
import org.eclipse.core.commands.internal.util.Tracing;
......@@ -356,25 +357,25 @@ public final class Command extends NamedHandleObjectWithState implements Compara
final boolean definedChanged = !this.defined;
this.defined = true;
final boolean nameChanged = !Util.equals(this.name, name);
final boolean nameChanged = !Objects.equals(this.name, name);
this.name = name;
final boolean descriptionChanged = !Util.equals(this.description,
final boolean descriptionChanged = !Objects.equals(this.description,
description);
this.description = description;
final boolean categoryChanged = !Util.equals(this.category, category);
final boolean categoryChanged = !Objects.equals(this.category, category);
this.category = category;
final boolean parametersChanged = !Util.equals(this.parameters,
final boolean parametersChanged = !Arrays.equals(this.parameters,
parameters);
this.parameters = parameters;
final boolean returnTypeChanged = !Util.equals(this.returnType,
final boolean returnTypeChanged = !Objects.equals(this.returnType,
returnType);
this.returnType = returnType;
final boolean helpContextIdChanged = !Util.equals(this.helpContextId,
final boolean helpContextIdChanged = !Objects.equals(this.helpContextId,
helpContextId);
this.helpContextId = helpContextId;
......@@ -948,7 +949,7 @@ public final class Command extends NamedHandleObjectWithState implements Compara
* otherwise.
*/
public boolean setHandler(final IHandler handler) {
if (Util.equals(handler, this.handler)) {
if (Objects.equals(handler, this.handler)) {
return false;
}
......@@ -1005,15 +1006,12 @@ public final class Command extends NamedHandleObjectWithState implements Compara
*/
private IHandlerListener getHandlerListener() {
if (handlerListener == null) {
handlerListener = new IHandlerListener() {
@Override
public void handlerChanged(HandlerEvent handlerEvent) {
handlerListener = (HandlerEvent handlerEvent) -> {
boolean enabledChanged = handlerEvent.isEnabledChanged();
boolean handledChanged = handlerEvent.isHandledChanged();
fireCommandChanged(new CommandEvent(Command.this, false,
false, false, handledChanged, false, false, false,
false, enabledChanged));
}
};
}
return handlerListener;
......
bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Parameterization.java
View file @ 07f03419
......@@ -17,6 +17,7 @@ package org.eclipse.core.commands;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import org.eclipse.core.internal.commands.util.Util;
......@@ -94,11 +95,11 @@ public final class Parameterization {
}
final Parameterization parameterization = (Parameterization) object;
if (!(Util.equals(this.parameter.getId(), parameterization.parameter.getId()))) {
if (!(Objects.equals(this.parameter.getId(), parameterization.parameter.getId()))) {
return false;
}
return Util.equals(this.value, parameterization.value);
return Objects.equals(this.value, parameterization.value);
}
/**
......@@ -135,7 +136,7 @@ public final class Parameterization {
while (parameterValueItr.hasNext()) {
final Entry<?, ?> entry = (Entry<?, ?>) parameterValueItr.next();
final String currentValue = (String) entry.getValue();
if (Util.equals(value, currentValue)) {
if (Objects.equals(value, currentValue)) {
returnValue = (String) entry.getKey();
break;
}
......@@ -151,8 +152,8 @@ public final class Parameterization {
@Override
public final int hashCode() {
if (hashCode == HASH_CODE_NOT_COMPUTED) {
hashCode = HASH_INITIAL * HASH_FACTOR + Util.hashCode(parameter);
hashCode = hashCode * HASH_FACTOR + Util.hashCode(value);
hashCode = HASH_INITIAL * HASH_FACTOR + Objects.hashCode(parameter);
hashCode = hashCode * HASH_FACTOR + Objects.hashCode(value);
if (hashCode == HASH_CODE_NOT_COMPUTED) {
hashCode++;
}
......
bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterizedCommand.java
View file @ 07f03419
......@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import org.eclipse.core.commands.common.NotDefinedException;
import org.eclipse.core.internal.commands.util.Util;
......@@ -430,11 +431,8 @@ public final class ParameterizedCommand implements Comparable {
}
final ParameterizedCommand command = (ParameterizedCommand) object;
if (!Util.equals(this.command, command.command)) {
return false;
}
return Util.equals(this.parameterizations, command.parameterizations);
return Objects.equals(this.command, command.command)
&& Arrays.equals(this.parameterizations, command.parameterizations);
}
/**
......@@ -607,11 +605,11 @@ public final class ParameterizedCommand implements Comparable {
@Override
public int hashCode() {
if (hashCode == HASH_CODE_NOT_COMPUTED) {
hashCode = HASH_INITIAL * HASH_FACTOR + Util.hashCode(command);
hashCode = HASH_INITIAL * HASH_FACTOR + Objects.hashCode(command);
hashCode = hashCode * HASH_FACTOR;
if (parameterizations != null) {
for (Parameterization parameterization : parameterizations) {
hashCode += Util.hashCode(parameterization);
hashCode += Objects.hashCode(parameterization);
}
}
if (hashCode == HASH_CODE_NOT_COMPUTED) {
......
bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/State.java
View file @ 07f03419
......@@ -14,8 +14,9 @@
package org.eclipse.core.commands;
import java.util.Objects;
import org.eclipse.core.commands.common.EventManager;
import org.eclipse.core.internal.commands.util.Util;
/**
* <p>
......@@ -129,7 +130,7 @@ public class State extends EventManager {
* The value to set; may be anything.
*/
public void setValue(final Object value) {
if (!Util.equals(this.value, value)) {
if (!Objects.equals(this.value, value)) {
final Object oldValue = this.value;
this.value = value;
fireStateChanged(oldValue);
......
bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/HandleObject.java
View file @ 07f03419
......@@ -13,7 +13,7 @@
*******************************************************************************/
package org.eclipse.core.commands.common;
import org.eclipse.core.internal.commands.util.Util;
import java.util.Objects;
/**
* <p>
......@@ -124,7 +124,7 @@ public abstract class HandleObject extends EventManager implements
// Check each property in turn.
final HandleObject handle= (HandleObject) object;
return Util.equals(id, handle.id)
return Objects.equals(id, handle.id)
&& (this.getClass() == handle.getClass());
}
......@@ -141,7 +141,7 @@ public abstract class HandleObject extends EventManager implements
@Override
public final int hashCode() {
if (hashCode == HASH_CODE_NOT_COMPUTED) {
hashCode = HASH_INITIAL * HASH_FACTOR + Util.hashCode(id);
hashCode = HASH_INITIAL * HASH_FACTOR + Objects.hashCode(id);
if (hashCode == HASH_CODE_NOT_COMPUTED) {
hashCode++;
}
......