You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by mb...@apache.org on 2023/02/07 02:19:14 UTC
[netbeans] branch master updated: Replaced all [equals() -> "==", HashSet -> EnumSet, HashMap -> EnumMap] calls for enum types
This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 890d423f05 Replaced all [equals() -> "==", HashSet -> EnumSet, HashMap -> EnumMap] calls for enum types
new 14b7e4b530 Merge pull request #5309 from tbw777/enums3
890d423f05 is described below
commit 890d423f0590640052d475650ab32fce385a569f
Author: Andrei Briukhov <an...@gmail.com>
AuthorDate: Tue Jan 17 18:12:13 2023 -0300
Replaced all [equals() -> "==", HashSet -> EnumSet, HashMap -> EnumMap] calls for enum types
These changes are more readable, faster and safer at compile and run-time. Also == is null-safe than equals.
---
.../java/hints/errors/SearchModuleDependency.java | 2 +-
.../groovy/grailsproject/ui/TreeRootNode.java | 2 +-
.../websvc/wsitconf/util/GenerationUtils.java | 2 +-
.../glassfish/tooling/server/ServerTasks.java | 4 +--
.../j2ee/ejbcore/action/CmFieldGenerator.java | 5 ++--
.../j2ee/ejbcore/action/SelectMethodGenerator.java | 5 ++--
.../methodcontroller/EntityMethodController.java | 3 +-
.../ejb/action/AddSelectMethodStrategy.java | 5 ++--
.../logicalview/ejb/session/SessionChildren.java | 6 ++--
.../modules/j2ee/ejbcore/util/_RetoucheUtil.java | 4 +--
.../ejbverification/fixes/MakeClassPublic.java | 5 ++--
.../j2ee/ejbverification/fixes/RemoveModifier.java | 4 ++-
.../jellytools/modules/j2ee/J2eeTestCase.java | 10 +++----
.../MissingJavaEEForUnitTestExecutionHint.java | 2 +-
.../maven/jaxws/actions/JaxWsCodeGenerator.java | 4 +--
.../modules/payara/tooling/server/ServerTasks.java | 4 +--
.../web/beans/impl/model/EnableBeansFilter.java | 2 +-
.../netbeans/modules/web/el/ELTypeUtilities.java | 3 +-
.../jsf/navigation/PageFlowToolbarUtilities.java | 3 +-
.../modules/web/jsf/editor/JspJsfELPlugin.java | 4 +--
.../web/jsf/impl/metamodel/ObjectProviders.java | 4 +--
.../web/jsf/wizards/JSFClientGenerator.java | 8 +++--
.../modules/websvc/core/AddWsOperationHelper.java | 1 +
.../actions/DispatchClientMethodGenerator.java | 6 ++--
.../websvc/core/jaxws/actions/InsertTask.java | 12 ++++----
.../jaxws/actions/JaxWsClientMethodGenerator.java | 4 +--
.../design/multiview/SourceMultiViewElement.java | 2 +-
.../websvc/manager/model/WebServiceData.java | 3 +-
.../rest/client/JaxRsGenerationStrategy.java | 5 +---
.../rest/client/JerseyGenerationStrategy.java | 5 +---
.../modules/websvc/rest/client/OAuthHelper.java | 17 ++++-------
.../websvc/rest/client/Wadl2JavaHelper.java | 3 +-
.../websvc/rest/support/JavaSourceHelper.java | 9 +++---
.../websvc/rest/ApplicationSubclassGenerator.java | 2 +-
.../websvc/api/support/java/GenerationUtils.java | 2 +-
.../modules/groovy/editor/java/Utilities.java | 5 ++--
.../debugger/registry/DebuggerProcessor.java | 8 ++---
.../modules/db/explorer/node/TableListNode.java | 2 +-
.../org/netbeans/modules/git/FileInformation.java | 4 +--
.../modules/gsf/testrunner/api/Status.java | 6 ++--
.../org/netbeans/modules/hudson/api/Utilities.java | 2 +-
.../org/netbeans/modules/jumpto/SearchHistory.java | 2 +-
.../modules/parsing/impl/indexing/LogContext.java | 2 +-
.../modules/project/ui/groups/NewGroupPanel.java | 6 ++--
.../selenium2/server/Selenium2ServerSupport.java | 2 +-
.../debugger/ui/registry/DebuggerProcessor.java | 4 +--
.../tasklist/todo/settings/FileIdentifier.java | 2 +-
.../jpda/apiregistry/DebuggerProcessor.java | 6 ++--
.../src/org/netbeans/modules/beans/Pattern.java | 2 +-
.../debugger/jpda/projects/AST2Bytecode.java | 5 ++--
.../jpda/projects/CodeSnippetCompiler.java | 2 +-
.../jpda/projects/EditorContextSupport.java | 8 ++---
.../debugger/jpda/projects/IntroduceClass.java | 6 ++--
.../debugger/jpda/projects/ScanLocalVars.java | 2 +-
.../jpda/projectsui/ToolTipAnnotation.java | 2 +-
.../debugger/jpda/visual/RemoteServices.java | 3 +-
.../jpda/visual/VisualDebuggerListener.java | 4 +--
.../debugger/jpda/expr/EvaluatorVisitor.java | 2 +-
.../core/api/support/java/GenerationUtils.java | 2 +-
.../jpa/refactoring/EntityAssociationResolver.java | 4 +--
.../jpa/verification/fixes/MakeClassPublic.java | 6 ++--
.../verification/fixes/RemoveFinalModifier.java | 4 ++-
.../api/support/annotation/AnnotationHelper.java | 8 ++---
.../annotation/parser/AnnotationParser.java | 4 +--
.../j2ee/persistence/action/GenerationOptions.java | 4 ++-
.../completion/db/DBCompletionContextResolver.java | 2 +-
...nagedResourceTransactionNonInjectableInEJB.java | 5 ----
.../ContainerManagedJTANonInjectableInWeb.java | 2 +-
.../EntityManagerGenerationStrategySupport.java | 2 +-
.../j2ee/persistence/wizard/EntityClosure.java | 4 +--
.../persistence/wizard/entity/EntityWizard.java | 7 ++---
.../wizard/fromdb/JavaPersistenceGenerator.java | 13 ++++----
.../persistence/wizard/fromdb/TableUISupport.java | 4 +--
.../metadata/orm/annotation/AttributesHelper.java | 6 ++--
.../orm/annotation/EntityMappingsUtilities.java | 2 +-
.../java/completion/JavaCompletionTask.java | 4 +--
.../base/semantic/SemanticHighlighterBase.java | 4 +--
.../modules/editor/java/JavaCompletionItem.java | 2 +-
.../java/editor/codegen/ConstructorGenerator.java | 2 +-
.../java/editor/overridden/ElementDescription.java | 2 +-
.../modules/java/hints/EmptyStatements.java | 2 +-
.../java/hints/ExportNonAccessibleElement.java | 9 ++++--
.../modules/java/hints/LoggerNotStaticFinal.java | 5 +---
.../org/netbeans/modules/java/hints/NoLoggers.java | 6 ++--
.../modules/java/hints/SerialVersionUID.java | 2 +-
.../netbeans/modules/java/hints/StaticImport.java | 2 +-
.../java/hints/errors/ChangeMethodParameters.java | 2 +-
.../hints/errors/ImplementAllAbstractMethods.java | 6 ++--
.../java/hints/errors/RemoveInvalidModifier.java | 6 +++-
.../modules/java/hints/errors/Utilities.java | 3 +-
.../java/hints/jdk/AnnotationProcessors.java | 2 +-
.../hints/jdk/ConvertToNestedRecordPattern.java | 2 +-
.../java/hints/jdk/ConvertToRecordPattern.java | 2 +-
.../hints/jdk/mapreduce/ProspectiveOperation.java | 11 +++----
.../org/netbeans/modules/java/hints/perf/Tiny.java | 3 +-
.../java/hints/suggestions/FlipOperands.java | 9 +++---
.../lsp/server/protocol/ConstructorGenerator.java | 2 +-
.../ChangeMethodParametersRefactoring.java | 3 +-
.../java/project/ui/ProjectProblemsProviders.java | 3 +-
.../modules/java/source/matching/CopyFinder.java | 2 +-
.../netbeans/api/java/source/gen/ForLoopTest.java | 6 ++--
.../netbeans/api/java/source/gen/Method1Test.java | 4 +--
.../api/java/source/gen/ModifiersTest.java | 11 +++----
.../netbeans/api/java/source/gen/TutorialTest.java | 1 -
.../modules/junit/ant/JUnitOutputReader.java | 2 +-
.../modules/junit/JUnit4TestGenerator.java | 7 ++++-
.../hints/errors/SearchClassDependencyInRepo.java | 2 +-
.../modules/refactoring/java/RefactoringUtils.java | 6 ++--
.../java/api/EncapsulateFieldRefactoring.java | 11 ++++---
.../java/plugins/ChangeParametersPlugin.java | 10 +++----
.../java/plugins/ChangeParamsTransformer.java | 9 +++---
.../plugins/EncapsulateFieldRefactoringPlugin.java | 14 ++++++---
.../java/plugins/InlineRefactoringPlugin.java | 35 +++++++++++-----------
.../java/plugins/InnerToOuterTransformer.java | 3 +-
.../IntroduceLocalExtensionTransformer.java | 7 +++--
.../java/plugins/JavaWhereUsedQueryPlugin.java | 2 +-
.../java/plugins/MoveMembersRefactoringPlugin.java | 10 +++----
.../java/plugins/MoveMembersTransformer.java | 4 +--
.../java/plugins/OperatorPrecedence.java | 12 ++++----
.../java/plugins/PushDownTransformer.java | 9 +++---
.../java/plugins/RenameTransformer.java | 4 +--
.../java/plugins/SafeDeleteRefactoringPlugin.java | 2 +-
.../plugins/UseSuperTypeRefactoringPlugin.java | 4 +--
.../refactoring/java/plugins/VarUsageVisitor.java | 8 ++---
.../refactoring/java/ui/ChangeParametersPanel.java | 4 +--
.../modules/refactoring/java/ui/RenamePanel.java | 2 +-
.../refactoring/java/ui/WhereUsedPanel.java | 2 +-
.../jpda/ui/apiregistry/DebuggerProcessor.java | 4 +--
.../codegen/java/support/JavaSourceHelper.java | 9 +++---
.../editor/actions/ControllerGenerator.java | 6 ++--
.../editor/actions/ControllerGeneratorTest.java | 4 +--
.../installer/downloader/connector/MyProxy.java | 2 +-
.../utils/system/launchers/LauncherResource.java | 6 ++--
.../phpunit/coverage/PhpUnitCoverageLogParser.java | 8 ++---
.../modules/intent/OpenUriHandlerProcessor.java | 2 +-
.../netbeans/modules/search/PatternSandbox.java | 2 +-
.../autoupdate/ui/UnitCategoryTableModel.java | 5 ++--
.../core/output2/options/OutputOptions.java | 2 +-
.../options/general/WebBrowsersOptionsModel.java | 2 +-
.../filebasedfs/fileobjects/FileObjectFactory.java | 4 +--
.../masterfs/filebasedfs/naming/NamingFactory.java | 2 +-
.../src/org/openide/text/PrintPreferences.java | 4 +--
.../modules/options/export/OptionsExportModel.java | 2 +-
.../modules/sampler/SamplesOutputStream.java | 2 +-
.../org/netbeans/modules/uihandler/Installer.java | 6 ++--
.../lib/profiler/ui/swing/ProfilerTable.java | 4 +--
.../lib/profiler/ui/swing/ProfilerTreeTable.java | 4 +--
.../lib/profiler/ui/threads/ThreadsPanel.java | 2 +-
.../lib/profiler/ui/threads/ViewManager.java | 12 ++++----
.../netbeans/lib/profiler/classfile/ClassInfo.java | 6 ++--
.../results/cpu/StackTraceSnapshotBuilder.java | 2 +-
.../heapwalk/details/basic/ArrayValueView.java | 2 +-
.../actions/ProfileElementNavigatorAction.java | 8 ++---
.../modules/profiler/SampledCPUSnapshot.java | 2 +-
.../modules/profiler/v2/impl/FilterSelector.java | 9 +++---
.../cordova/platforms/android/AndroidBrowser.java | 6 ++--
.../javascript2/editor/JsCompletionItem.java | 10 ++++++-
.../javascript2/editor/JsStructureScanner.java | 10 ++++++-
.../javascript2/html/CssIdCompletionItem.java | 10 ++++++-
.../knockout/model/KnockoutExportInterceptor.java | 5 +++-
.../modules/javascript2/lexer/JsColoringLexer.java | 2 +-
.../debugger/breakpoints/DOMBreakpoint.java | 12 ++++----
162 files changed, 415 insertions(+), 378 deletions(-)
diff --git a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java
index 5062878b86..d3515c18df 100644
--- a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java
+++ b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java
@@ -225,7 +225,7 @@ public class SearchModuleDependency implements org.netbeans.modules.java.hints.s
NewArrayTree arrayTree = (NewArrayTree) initializer;
Tree type = arrayTree.getType();
if (type != null) {
- if (type.getKind().equals(Kind.IDENTIFIER)) {
+ if (type.getKind() == Kind.IDENTIFIER) {
itName = ((IdentifierTree) type).getName();
}
}
diff --git a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/TreeRootNode.java b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/TreeRootNode.java
index dd17909845..5d03f0a639 100644
--- a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/TreeRootNode.java
+++ b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/TreeRootNode.java
@@ -102,7 +102,7 @@ public final class TreeRootNode extends FilterNode implements PropertyChangeList
if (icon == null) {
Image image = opened ? super.getOpenedIcon(type) : super.getIcon(type);
- if (Type.LIBRARY.equals(visualType)) {
+ if (Type.LIBRARY == visualType) {
return ImageUtilities.mergeImages(image, LIBRARIES_BADGE, 7, 7);
} else {
return image;
diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/util/GenerationUtils.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/util/GenerationUtils.java
index fe8ea7f9c3..d0562b823e 100644
--- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/util/GenerationUtils.java
+++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/util/GenerationUtils.java
@@ -371,7 +371,7 @@ public final class GenerationUtils extends SourceUtils {
ModifiersTree oldModifiersTree = constructorTree.getModifiers();
Set<Modifier> newModifiers = EnumSet.of(Modifier.PUBLIC);
for (Modifier modifier : oldModifiersTree.getFlags()) {
- if (!Modifier.PROTECTED.equals(modifier) && !Modifier.PRIVATE.equals(modifier)) {
+ if (Modifier.PROTECTED != modifier && Modifier.PRIVATE != modifier) {
newModifiers.add(modifier);
}
}
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerTasks.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerTasks.java
index e6c23a7ad5..8405e441d3 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerTasks.java
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerTasks.java
@@ -181,13 +181,13 @@ public class ServerTasks {
// Add debug parameters read from domain.xml.
// It's important to add them before java options specified by user
// in case user specified it by himslef.
- if (mode.equals(StartMode.DEBUG)) {
+ if (mode == StartMode.DEBUG) {
String debugOpts = propMap.get("debug-options");
String[] debugOptsSplited = debugOpts.split("\\s+(?=-)");
optList.addAll(Arrays.asList(debugOptsSplited));
}
// add profile parameters
- if (mode.equals(StartMode.PROFILE)) {
+ if (mode == StartMode.PROFILE) {
}
// appending IDE specified options after the ones got from domain.xml
// IDE specified are takind precedence this way
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java
index a373c31907..9c45e9de3f 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java
@@ -27,6 +27,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.EnumSet;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
@@ -53,10 +54,10 @@ import org.openide.filesystems.FileObject;
public final class CmFieldGenerator extends AbstractMethodGenerator {
// available for tests
- static final Set<Modifier> PUBLIC_ABSTRACT = new HashSet<Modifier>(Arrays.asList(new Modifier[] {
+ static final Set<Modifier> PUBLIC_ABSTRACT = EnumSet.of(
Modifier.PUBLIC,
Modifier.ABSTRACT
- }));
+ );
private CmFieldGenerator(String ejbClass, FileObject ejbClassFileObject) {
super(ejbClass, ejbClassFileObject);
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java
index d67b73e07b..6da228b68b 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.EnumSet;
import javax.lang.model.element.Modifier;
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
@@ -64,9 +65,7 @@ public class SelectMethodGenerator extends AbstractMethodGenerator {
if (!methodModel.getExceptions().contains("javax.ejb.FinderException")) {
exceptions.add("javax.ejb.FinderException");
}
- Set<Modifier> modifiers = new HashSet<Modifier>(2);
- modifiers.add(Modifier.PUBLIC);
- modifiers.add(Modifier.ABSTRACT);
+ Set<Modifier> modifiers = EnumSet.of(Modifier.PUBLIC, Modifier.ABSTRACT);
MethodModel methodModelCopy = MethodModel.create(
methodModel.getName(),
methodModel.getReturnType(),
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java
index b134722a2d..703aed6514 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java
@@ -27,6 +27,7 @@ import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
+import java.util.EnumSet;
import javax.lang.model.element.Modifier;
import org.netbeans.modules.j2ee.dd.api.ejb.CmpField;
import org.netbeans.modules.j2ee.dd.api.ejb.CmrField;
@@ -59,7 +60,7 @@ public final class EntityMethodController extends AbstractMethodController {
private final MetadataModel<EjbJarMetadata> metadataModel;
private final String ejbClass;
- private final Set<Modifier> modifiersPublicAbstract = new HashSet<Modifier>(2);
+ private final Set<Modifier> modifiersPublicAbstract = EnumSet.noneOf(Modifier.class);
private final String abstractSchemaName;
private final String persistenceType;
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java
index 1462bdbc03..26bfd414a3 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java
@@ -22,6 +22,7 @@ package org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action;
import org.netbeans.modules.j2ee.ejbcore.util._RetoucheUtil;
import java.io.IOException;
import java.util.Collections;
+import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -65,9 +66,7 @@ public class AddSelectMethodStrategy extends AbstractAddMethodStrategy {
@Override
public MethodModel getPrototypeMethod() {
- Set<Modifier> modifiers = new HashSet<Modifier>();
- modifiers.add(Modifier.PUBLIC);
- modifiers.add(Modifier.ABSTRACT);
+ Set<Modifier> modifiers = EnumSet.of(Modifier.PUBLIC, Modifier.ABSTRACT);
return MethodModel.create(
"ejbSelectBy",
"int",
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionChildren.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionChildren.java
index 863e159e66..508a105df3 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionChildren.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionChildren.java
@@ -126,21 +126,21 @@ public final class SessionChildren extends Children.Keys<SessionChildren.Key> im
@Override
protected Node[] createNodes(Key key) {
- if (Key.LOCAL.equals(key)) {
+ if (Key.LOCAL == key) {
MethodChildren children = new MethodChildren(this, cpInfo, ejbModule, controller, MethodsNode.ViewType.LOCAL);
MethodsNode n = new MethodsNode(ejbClass, ejbModule, children, MethodsNode.ViewType.LOCAL);
n.setIconBaseWithExtension("org/netbeans/modules/j2ee/ejbcore/resources/LocalMethodContainerIcon.gif");
n.setDisplayName(NbBundle.getMessage(EjbViewController.class, "LBL_LocalMethods"));
return new Node[] { n };
}
- if (Key.REMOTE.equals(key)) {
+ if (Key.REMOTE == key) {
MethodChildren children = new MethodChildren(this, cpInfo, ejbModule, controller, MethodsNode.ViewType.REMOTE);
MethodsNode n = new MethodsNode(ejbClass, ejbModule, children, MethodsNode.ViewType.REMOTE);
n.setIconBaseWithExtension("org/netbeans/modules/j2ee/ejbcore/resources/RemoteMethodContainerIcon.gif");
n.setDisplayName(NbBundle.getMessage(EjbViewController.class, "LBL_RemoteMethods"));
return new Node[] { n };
}
- if (Key.BEAN.equals(key)) {
+ if (Key.BEAN == key) {
MethodChildren children = new MethodChildren(this, cpInfo, ejbModule, controller, MethodsNode.ViewType.NO_INTERFACE);
MethodsNode n = new MethodsNode(ejbClass, ejbModule, children, MethodsNode.ViewType.NO_INTERFACE);
n.setIconBaseWithExtension("org/netbeans/modules/j2ee/ejbcore/resources/MethodContainerIcon.gif");
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java
index 366d544391..844c4f8eae 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java
@@ -158,8 +158,8 @@ public final class _RetoucheUtil {
}
// modifiers
- Set<Modifier> modifiers = new HashSet<>();
- modifiers.add(Modifier.PRIVATE);
+ Set<Modifier> modifiers = EnumSet.of(Modifier.PRIVATE);
+
if (isStatic) {
modifiers.add(Modifier.STATIC);
}
diff --git a/enterprise/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/fixes/MakeClassPublic.java b/enterprise/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/fixes/MakeClassPublic.java
index 25ba2cb146..43e34273c8 100644
--- a/enterprise/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/fixes/MakeClassPublic.java
+++ b/enterprise/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/fixes/MakeClassPublic.java
@@ -21,6 +21,7 @@ package org.netbeans.modules.j2ee.ejbverification.fixes;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.ModifiersTree;
import java.io.IOException;
+import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
@@ -71,8 +72,8 @@ public class MakeClassPublic implements Fix {
ClassTree clazzTree = workingCopy.getTrees().getTree(clazz);
TreeMaker make = workingCopy.getTreeMaker();
- Set<Modifier> flags = new HashSet<>(clazzTree.getModifiers().getFlags());
- flags.add(Modifier.PUBLIC);
+ Set<Modifier> flags = EnumSet.of(Modifier.PUBLIC);
+ flags.addAll(clazzTree.getModifiers().getFlags());
ModifiersTree newModifiers = make.Modifiers(flags, clazzTree.getModifiers().getAnnotations());
workingCopy.rewrite(clazzTree.getModifiers(), newModifiers);
}
diff --git a/enterprise/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/fixes/RemoveModifier.java b/enterprise/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/fixes/RemoveModifier.java
index c1a15c4670..71cd54c896 100644
--- a/enterprise/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/fixes/RemoveModifier.java
+++ b/enterprise/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/fixes/RemoveModifier.java
@@ -21,6 +21,7 @@ package org.netbeans.modules.j2ee.ejbverification.fixes;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.ModifiersTree;
import java.io.IOException;
+import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
@@ -70,7 +71,8 @@ public class RemoveModifier implements Fix {
ClassTree clazzTree = workingCopy.getTrees().getTree(clazz);
TreeMaker make = workingCopy.getTreeMaker();
- Set<Modifier> flags = new HashSet<>(clazzTree.getModifiers().getFlags());
+ Set<Modifier> flags = EnumSet.noneOf(Modifier.class);
+ flags.addAll(clazzTree.getModifiers().getFlags());
flags.remove(modifier);
ModifiersTree newModifiers = make.Modifiers(flags, clazzTree.getModifiers().getAnnotations());
workingCopy.rewrite(clazzTree.getModifiers(), newModifiers);
diff --git a/enterprise/jellytools.enterprise/src/org/netbeans/jellytools/modules/j2ee/J2eeTestCase.java b/enterprise/jellytools.enterprise/src/org/netbeans/jellytools/modules/j2ee/J2eeTestCase.java
index a318dbc7b5..2ae83a8145 100644
--- a/enterprise/jellytools.enterprise/src/org/netbeans/jellytools/modules/j2ee/J2eeTestCase.java
+++ b/enterprise/jellytools.enterprise/src/org/netbeans/jellytools/modules/j2ee/J2eeTestCase.java
@@ -209,19 +209,19 @@ public class J2eeTestCase extends JellyTestCase {
LOG.info("adding server tests");
return addTest(conf, clazz, testNames);
} else {
- if (server.equals(GLASSFISH) || server.equals(ANY)) {
+ if (server == GLASSFISH || server == ANY) {
registerGlassFish();
if (isRegistered(GLASSFISH)) {
return addTest(conf, clazz, testNames);
}
}
- if (server.equals(TOMCAT) || server.equals(ANY)) {
+ if (server == TOMCAT || server == ANY) {
registerTomcat();
if (isRegistered(TOMCAT)) {
return addTest(conf, clazz, testNames);
}
}
- if (server.equals(JBOSS) || server.equals(ANY)) {
+ if (server == JBOSS || server == ANY) {
registerJBoss();
if (isRegistered(JBOSS)) {
return addTest(conf, clazz, testNames);
@@ -254,7 +254,7 @@ public class J2eeTestCase extends JellyTestCase {
if (!addServerTestsCalled) {
throw new IllegalStateException("Cannot call isRegistered here. It is allowed only in suite method after addServerTests is called.");
}
- if (server.equals(ANY)) {
+ if (server == ANY) {
return !alreadyRegistered.isEmpty();
} else {
return alreadyRegistered.contains(server);
@@ -277,7 +277,7 @@ public class J2eeTestCase extends JellyTestCase {
return J2eeServerNode.invoke("Tomcat");
case ANY:
for (Server serv : Server.values()) {
- if (serv.equals(ANY)) {
+ if (serv == ANY) {
continue;
}
try {
diff --git a/enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/MissingJavaEEForUnitTestExecutionHint.java b/enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/MissingJavaEEForUnitTestExecutionHint.java
index 5d35554d27..a413f38baa 100644
--- a/enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/MissingJavaEEForUnitTestExecutionHint.java
+++ b/enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/MissingJavaEEForUnitTestExecutionHint.java
@@ -75,7 +75,7 @@ public class MissingJavaEEForUnitTestExecutionHint extends AbstractHint {
return null;
}
//Logger.getAnonymousLogger().log(Level.SEVERE, "---"+el+" "+(treePath.getLeaf() != null ? treePath.getLeaf().getKind() : "no kind"));
- if (el.asType() == null || !el.asType().getKind().equals(TypeKind.DECLARED)) {
+ if (el.asType() == null || el.asType().getKind() != TypeKind.DECLARED) {
return null;
}
if (!isEEType(info, el.asType())) {
diff --git a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/JaxWsCodeGenerator.java b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/JaxWsCodeGenerator.java
index 1a333de78b..3f7205cc1b 100644
--- a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/JaxWsCodeGenerator.java
+++ b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/JaxWsCodeGenerator.java
@@ -35,6 +35,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.EnumSet;
import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -961,11 +962,10 @@ public class JaxWsCodeGenerator {
make.Literal(wsdlUrl)))); //NOI18N
// create field modifier: private(static) with @WebServiceRef annotation
// FileObject targetFo = workingCopy.getFileObject();
- Set<Modifier> modifiers = new HashSet<Modifier>();
+ Set<Modifier> modifiers = EnumSet.of(Modifier.PRIVATE);
// if (Car.getCar(targetFo) != null) {
// modifiers.add(Modifier.STATIC);
// }
- modifiers.add(Modifier.PRIVATE);
ModifiersTree methodModifiers = make.Modifiers(
modifiers,
Collections.<AnnotationTree>singletonList(wsRefAnnotation));
diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/ServerTasks.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/ServerTasks.java
index 6ceaefe87d..823aa134bd 100644
--- a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/ServerTasks.java
+++ b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/ServerTasks.java
@@ -192,13 +192,13 @@ public class ServerTasks {
// Add debug parameters read from domain.xml.
// It's important to add them before java options specified by user
// in case user specified it by himslef.
- if (mode.equals(StartMode.DEBUG)) {
+ if (mode == StartMode.DEBUG) {
String debugOpts = propMap.get("debug-options");
String[] debugOptsSplited = debugOpts.split("\\s+(?=-)");
optList.addAll(Arrays.asList(debugOptsSplited));
}
// add profile parameters
- if (mode.equals(StartMode.PROFILE)) {
+ if (mode == StartMode.PROFILE) {
}
// appending IDE specified options after the ones got from domain.xml
// IDE specified are takind precedence this way
diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/EnableBeansFilter.java b/enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/EnableBeansFilter.java
index cb08d72956..a8eb167642 100644
--- a/enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/EnableBeansFilter.java
+++ b/enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/EnableBeansFilter.java
@@ -471,7 +471,7 @@ class EnableBeansFilter {
private boolean hasModifier ( Element element , Modifier mod){
Set<Modifier> modifiers = element.getModifiers();
for (Modifier modifier : modifiers) {
- if ( modifier.equals( mod )){
+ if (modifier == mod) {
return true;
}
}
diff --git a/enterprise/web.el/src/org/netbeans/modules/web/el/ELTypeUtilities.java b/enterprise/web.el/src/org/netbeans/modules/web/el/ELTypeUtilities.java
index 5dd356c5aa..a56be9ce90 100644
--- a/enterprise/web.el/src/org/netbeans/modules/web/el/ELTypeUtilities.java
+++ b/enterprise/web.el/src/org/netbeans/modules/web/el/ELTypeUtilities.java
@@ -31,6 +31,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.EnumSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.el.ELException;
@@ -90,7 +91,7 @@ public final class ELTypeUtilities {
}
private static void put(Class<? extends Node> node, TypeKind... kinds) {
- Set<TypeKind> kindSet = new HashSet<>();
+ Set<TypeKind> kindSet = EnumSet.noneOf(TypeKind.class);
kindSet.addAll(Arrays.asList(kinds));
TYPES.put(node, kindSet);
}
diff --git a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowToolbarUtilities.java b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowToolbarUtilities.java
index 58c32d30fc..4e16e4e513 100644
--- a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowToolbarUtilities.java
+++ b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowToolbarUtilities.java
@@ -39,6 +39,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import java.util.EnumMap;
import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.logging.LogRecord;
@@ -63,7 +64,7 @@ public class PageFlowToolbarUtilities {
SCOPE_FACESCONFIG, SCOPE_PROJECT, SCOPE_ALL_FACESCONFIG
}
- private static Map<Scope, String> scope2String = new HashMap<Scope, String>();
+ private static Map<Scope, String> scope2String = new EnumMap<>(Scope.class);
private static Map<String, Scope> string2Scope = new HashMap<String, Scope>();
private static final String TT_SCOPE = NbBundle.getMessage(PageFlowToolbarUtilities.class, "TT_Scope_DropDown");
private static final String LBL_SCOPE_FACESCONFIG = NbBundle.getMessage(PageFlowToolbarUtilities.class, "LBL_Scope_FacesConfig");
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/editor/JspJsfELPlugin.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/editor/JspJsfELPlugin.java
index 149e640934..58a8d24d72 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/editor/JspJsfELPlugin.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/editor/JspJsfELPlugin.java
@@ -133,7 +133,7 @@ public class JspJsfELPlugin extends ELPlugin {
// method has not parameters and return types are assignable.
if ( executableElement.getParameters().isEmpty() &&
- ( (TypeKind.VOID.equals(elementReturnType.getKind()) && VOID_RETURN_TYPE.equals(attributeReturnType)) ||
+ ( (TypeKind.VOID == elementReturnType.getKind() && VOID_RETURN_TYPE.equals(attributeReturnType)) ||
(types.isAssignable(elementReturnType, attributeReturnTypeElement.asType())) ) ) {
return true;
}
@@ -197,7 +197,7 @@ public class JspJsfELPlugin extends ELPlugin {
}
// Return types of the element and attribute are void
- if (TypeKind.VOID.equals(elementReturnType.getKind()) && VOID_RETURN_TYPE.equals(attributeReturnType)) {
+ if (TypeKind.VOID == elementReturnType.getKind() && VOID_RETURN_TYPE.equals(attributeReturnType)) {
return true;
}
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ObjectProviders.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ObjectProviders.java
index fd51cf788d..397a84fe20 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ObjectProviders.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ObjectProviders.java
@@ -339,9 +339,9 @@ class ObjectProviders {
List<TypeElement> result = new ArrayList<TypeElement>(interfaces
.size());
for (TypeMirror typeMirror : interfaces) {
- if (TypeKind.DECLARED.equals(typeMirror.getKind())) {
+ if (TypeKind.DECLARED == typeMirror.getKind()) {
Element element = ((DeclaredType) typeMirror).asElement();
- if (ElementKind.INTERFACE.equals(element.getKind())) {
+ if (ElementKind.INTERFACE == element.getKind()) {
result.add( (TypeElement) element );
List<TypeElement> superInterfaces =
getImplementedInterfaces((TypeElement) element, helper);
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFClientGenerator.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFClientGenerator.java
index 5aa2f7340d..e13314d2c0 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFClientGenerator.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFClientGenerator.java
@@ -39,6 +39,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.EnumSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
@@ -1067,7 +1068,7 @@ public class JSFClientGenerator {
MethodModel.Variable.create("java.lang.String", "string")
),
Collections.<String>emptyList(),
- Collections.<Modifier>emptySet() //no modifiers
+ Collections.<Modifier>emptySet() //no modifiers
) : null;
String entityReferenceName = entityClass;
@@ -1697,13 +1698,16 @@ public class JSFClientGenerator {
i++;
}
+ Set<Modifier> modifiersSet = EnumSet.noneOf(Modifier.class);
+ modifiersSet.addAll(Arrays.asList(modifiers));
+
MethodModel methodModel = MethodModel.create(
name,
returnType,
body,
paramsList,
Arrays.asList(exceptions),
- new HashSet<Modifier>(Arrays.asList(modifiers))
+ modifiersSet
);
return MethodModelSupport.createMethodTree(workingCopy, methodModel);
}
diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java
index b95e0b5f27..30f7a02434 100644
--- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java
+++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java
@@ -39,6 +39,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.EnumSet;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.AnnotationValue;
import javax.lang.model.element.Element;
diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/DispatchClientMethodGenerator.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/DispatchClientMethodGenerator.java
index 28b400f7aa..bf6fb57ba9 100644
--- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/DispatchClientMethodGenerator.java
+++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/DispatchClientMethodGenerator.java
@@ -19,6 +19,7 @@
package org.netbeans.modules.websvc.core.jaxws.actions;
import java.util.Collections;
+import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
@@ -69,9 +70,8 @@ class DispatchClientMethodGenerator implements Task<WorkingCopy> {
}
TreeMaker maker = copy.getTreeMaker();
- Set<Modifier> methodModifs = new HashSet<Modifier>();
- methodModifs.add(Modifier.PRIVATE);
- Tree returnTypeTree = maker.PrimitiveType(TypeKind.VOID);
+ Set<Modifier> methodModifs = EnumSet.of(Modifier.PRIVATE);
+ Tree returnTypeTree = maker.PrimitiveType(TypeKind.VOID);
MethodTree methodTree = maker.Method (
maker.Modifiers(methodModifs),
suggestMethodName(javaClass),
diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/InsertTask.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/InsertTask.java
index 11784fe276..c446fbf762 100644
--- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/InsertTask.java
+++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/InsertTask.java
@@ -26,6 +26,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.EnumSet;
import javax.lang.model.element.Element;
import javax.lang.model.element.Modifier;
@@ -114,11 +115,10 @@ class InsertTask implements CancellableTask<WorkingCopy> {
Identifier("wsdlLocation"), make.Literal(wsdlUrl)))); //NOI18N
// create field modifier: private(static) with @WebServiceRef annotation
FileObject targetFo = workingCopy.getFileObject();
- Set<Modifier> modifiers = new HashSet<Modifier>();
+ Set<Modifier> modifiers = EnumSet.of(Modifier.PRIVATE);
if (Car.getCar(targetFo) != null) {
modifiers.add(Modifier.STATIC);
}
- modifiers.add(Modifier.PRIVATE);
ModifiersTree methodModifiers = make.Modifiers(
modifiers,
Collections.<AnnotationTree>singletonList(wsRefAnnotation));
@@ -159,7 +159,7 @@ class InsertTask implements CancellableTask<WorkingCopy> {
ElementFilter.fieldsIn( classElement.getEnclosedElements()))
{
TypeMirror varType = var.asType();
- if (!varType.getKind().equals(TypeKind.ARRAY)) {
+ if (varType.getKind() != TypeKind.ARRAY) {
continue;
}
if ( var.getSimpleName().contentEquals(PolicyManager.SECURITY_FEATURE)) {
@@ -170,10 +170,8 @@ class InsertTask implements CancellableTask<WorkingCopy> {
return javaClass;
}
}
- Set<Modifier> modifiers = new HashSet<Modifier>();
- modifiers.add( Modifier.PRIVATE);
- modifiers.add( Modifier.STATIC);
- modifiers.add( Modifier.FINAL);
+
+ Set<Modifier> modifiers = EnumSet.of(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL);
ModifiersTree modifiersTree = make.Modifiers(
modifiers);
diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsClientMethodGenerator.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsClientMethodGenerator.java
index 98709d5303..26a3a9457f 100644
--- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsClientMethodGenerator.java
+++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsClientMethodGenerator.java
@@ -31,6 +31,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.EnumSet;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import org.netbeans.api.java.source.CancellableTask;
@@ -69,8 +70,7 @@ public class JaxWsClientMethodGenerator implements CancellableTask<WorkingCopy>
if (javaClass != null) {
TreeMaker maker = copy.getTreeMaker();
- Set<Modifier> methodModifs = new HashSet<Modifier>();
- methodModifs.add(Modifier.PRIVATE);
+ Set<Modifier> methodModifs = EnumSet.of(Modifier.PRIVATE);
if (isStatic) {
methodModifs.add(Modifier.STATIC);
}
diff --git a/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/multiview/SourceMultiViewElement.java b/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/multiview/SourceMultiViewElement.java
index c817eec8d1..c43b610e04 100644
--- a/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/multiview/SourceMultiViewElement.java
+++ b/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/multiview/SourceMultiViewElement.java
@@ -120,7 +120,7 @@ public class SourceMultiViewElement extends CloneableEditor
SourcePositions srcPos = workingCopy.getTrees().getSourcePositions();
int position = -1;
// use visitor approach later
- if(ElementKind.METHOD.equals(element.getKind())) {
+ if(ElementKind.METHOD == element.getKind()) {
Element webServiceMethod = workingCopy.
getElementUtilities().getImplementationOf(
(ExecutableElement)element, webSvc);
diff --git a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/model/WebServiceData.java b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/model/WebServiceData.java
index 71841c4212..b6d65e213c 100644
--- a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/model/WebServiceData.java
+++ b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/model/WebServiceData.java
@@ -343,8 +343,7 @@ public class WebServiceData implements WsdlData {
}
public void setState(State state) {
- boolean fireEvent = (!wsdlState.equals(State.WSDL_SERVICE_COMPILED) &&
- state.equals(State.WSDL_SERVICE_COMPILED));
+ boolean fireEvent = wsdlState != State.WSDL_SERVICE_COMPILED && state == State.WSDL_SERVICE_COMPILED;
State old = wsdlState;
Status oldStatus = getStatus();
diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/JaxRsGenerationStrategy.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/JaxRsGenerationStrategy.java
index 397708a8d4..0b9b716078 100644
--- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/JaxRsGenerationStrategy.java
+++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/JaxRsGenerationStrategy.java
@@ -103,10 +103,7 @@ class JaxRsGenerationStrategy extends ClientGenerationStrategy {
fieldTree = maker.Variable(fieldModif, "client", typeTree, null); //NOI18N
modifiedClass = maker.addClassMember(modifiedClass, fieldTree);
- Set<Modifier> modifiersSet = new HashSet<Modifier>();
- modifiersSet.add(Modifier.PRIVATE);
- modifiersSet.add(Modifier.STATIC);
- modifiersSet.add(Modifier.FINAL);
+ Set<Modifier> modifiersSet = EnumSet.of(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL);
fieldModif = maker.Modifiers(modifiersSet);
typeTree = maker.Identifier("String"); //NOI18N
diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/JerseyGenerationStrategy.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/JerseyGenerationStrategy.java
index d54143cde6..e9933384d3 100644
--- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/JerseyGenerationStrategy.java
+++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/JerseyGenerationStrategy.java
@@ -74,10 +74,7 @@ class JerseyGenerationStrategy extends ClientGenerationStrategy {
fieldTree = maker.Variable(fieldModif, "client", typeTree, null); //NOI18N
modifiedClass = maker.addClassMember(modifiedClass, fieldTree);
- Set<Modifier> modifiersSet = new HashSet<Modifier>();
- modifiersSet.add(Modifier.PRIVATE);
- modifiersSet.add(Modifier.STATIC);
- modifiersSet.add(Modifier.FINAL);
+ Set<Modifier> modifiersSet = EnumSet.of(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL);
fieldModif = maker.Modifiers(modifiersSet);
typeTree = maker.Identifier("String"); //NOI18N
diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/OAuthHelper.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/OAuthHelper.java
index 1417b31197..f60714ffff 100644
--- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/OAuthHelper.java
+++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/OAuthHelper.java
@@ -32,6 +32,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.EnumSet;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import org.netbeans.api.java.source.Comment;
@@ -81,9 +82,7 @@ public class OAuthHelper {
// create fields
ModifiersTree privateModif = maker.Modifiers(Collections.<Modifier>singleton(Modifier.PRIVATE));
ModifiersTree publicModif = maker.Modifiers(Collections.<Modifier>singleton(Modifier.PUBLIC));
- Set<Modifier> modifiersSet = new HashSet<Modifier>();
- modifiersSet.add(Modifier.PRIVATE);
- modifiersSet.add(Modifier.STATIC);
+ Set<Modifier> modifiersSet = EnumSet.of(Modifier.PRIVATE, Modifier.STATIC);
ModifiersTree privateStaticModif = maker.Modifiers(modifiersSet);
modifiersSet.add(Modifier.FINAL);
ModifiersTree privateStaticFinalModif = maker.Modifiers(modifiersSet);
@@ -240,9 +239,7 @@ public class OAuthHelper {
modifiedClass = maker.addClassMember(modifiedClass, methodTree);
} else if (Wadl2JavaHelper.PROJEC_TYPE_WEB.equals(projectType)) {
-
- modifiersSet = new HashSet<Modifier>();
- modifiersSet.add(Modifier.PUBLIC); modifiersSet.add(Modifier.STATIC);
+ modifiersSet = EnumSet.of(Modifier.PUBLIC, Modifier.STATIC);
ModifiersTree publicStaticModif = maker.Modifiers(modifiersSet);
// getRequestToken method
@@ -335,9 +332,7 @@ public class OAuthHelper {
modifiedClass = maker.addClassMember(modifiedClass, methodTree);
} else if (Wadl2JavaHelper.PROJEC_TYPE_NB_MODULE.equals(projectType)) {
-
- modifiersSet = new HashSet<Modifier>();
- modifiersSet.add(Modifier.PUBLIC); modifiersSet.add(Modifier.STATIC);
+ modifiersSet = EnumSet.of(Modifier.PUBLIC, Modifier.STATIC);
ModifiersTree publicStaticModif = maker.Modifiers(modifiersSet);
// login method
@@ -956,9 +951,7 @@ public class OAuthHelper {
ClassTree modifiedClass = originalClass;
TreeMaker maker = copy.getTreeMaker();
TypeElement servletAn = copy.getElements().getTypeElement("javax.servlet.annotation.WebServlet"); //NOI18N
- Set<Modifier> classModifs = new HashSet<Modifier>();
- classModifs.add(Modifier.PUBLIC);
- classModifs.add(Modifier.STATIC);
+ Set<Modifier> classModifs = EnumSet.of(Modifier.PUBLIC, Modifier.STATIC);
// OAuthLoginServlet
ModifiersTree classModifiers = maker.Modifiers(classModifs);
diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/Wadl2JavaHelper.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/Wadl2JavaHelper.java
index 003e45ba35..f739dfc688 100644
--- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/Wadl2JavaHelper.java
+++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/Wadl2JavaHelper.java
@@ -37,6 +37,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.EnumSet;
import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -465,7 +466,7 @@ class Wadl2JavaHelper {
}
private static Set<Modifier> getModifiers(String modif) {
- Set<Modifier> modifs = new HashSet<Modifier>();
+ Set<Modifier> modifs = EnumSet.noneOf(Modifier.class);
if (modif != null) {
if (modif.contains("public")) { //NOI18N
modifs.add(Modifier.PUBLIC);
diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/JavaSourceHelper.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/JavaSourceHelper.java
index 368855e5b3..8ed81b9718 100644
--- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/JavaSourceHelper.java
+++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/JavaSourceHelper.java
@@ -32,7 +32,9 @@ import com.sun.source.tree.TypeParameterTree;
import com.sun.source.tree.VariableTree;
import com.sun.source.util.TreePath;
import com.sun.source.util.Trees;
+import java.util.Arrays;
import java.util.List;
+import java.util.EnumSet;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -645,11 +647,8 @@ public class JavaSourceHelper {
public static ModifiersTree createModifiersTree(WorkingCopy copy, Modifier[] modifiers, String[] annotations, Object[] annotationAttrs) {
TreeMaker maker = copy.getTreeMaker();
- Set<Modifier> modifierSet = new HashSet<Modifier>();
-
- for (Modifier modifier : modifiers) {
- modifierSet.add(modifier);
- }
+ Set<Modifier> modifierSet = EnumSet.noneOf(Modifier.class);
+ modifierSet.addAll(Arrays.asList(modifiers));
List<AnnotationTree> annotationTrees = createAnnotationTrees(copy, annotations, annotationAttrs);
diff --git a/enterprise/websvc.restapi/src/org/netbeans/modules/websvc/rest/ApplicationSubclassGenerator.java b/enterprise/websvc.restapi/src/org/netbeans/modules/websvc/rest/ApplicationSubclassGenerator.java
index a99358940e..da6d1fb2de 100644
--- a/enterprise/websvc.restapi/src/org/netbeans/modules/websvc/rest/ApplicationSubclassGenerator.java
+++ b/enterprise/websvc.restapi/src/org/netbeans/modules/websvc/rest/ApplicationSubclassGenerator.java
@@ -182,7 +182,7 @@ public class ApplicationSubclassGenerator {
ClassTree classTree = (ClassTree) typeDeclaration;
List<? extends Tree> members = classTree.getMembers();
for (Tree member : members) {
- if ( member.getKind().equals(Tree.Kind.METHOD)){
+ if ( member.getKind() == Tree.Kind.METHOD) {
MethodTree method = (MethodTree)member;
String name = method.getName().toString();
if ( name.equals(RestConstants.GET_CLASSES)){
diff --git a/enterprise/websvc.utilities/src/org/netbeans/modules/websvc/api/support/java/GenerationUtils.java b/enterprise/websvc.utilities/src/org/netbeans/modules/websvc/api/support/java/GenerationUtils.java
index f4298dcec4..d23cbdfd0e 100644
--- a/enterprise/websvc.utilities/src/org/netbeans/modules/websvc/api/support/java/GenerationUtils.java
+++ b/enterprise/websvc.utilities/src/org/netbeans/modules/websvc/api/support/java/GenerationUtils.java
@@ -339,7 +339,7 @@ public final class GenerationUtils {
ModifiersTree oldModifiersTree = constructorTree.getModifiers();
Set<Modifier> newModifiers = EnumSet.of(Modifier.PUBLIC);
for (Modifier modifier : oldModifiersTree.getFlags()) {
- if (!Modifier.PROTECTED.equals(modifier) && !Modifier.PRIVATE.equals(modifier)) {
+ if (Modifier.PROTECTED != modifier && Modifier.PRIVATE != modifier) {
newModifiers.add(modifier);
}
}
diff --git a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/java/Utilities.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/java/Utilities.java
index 7463d044f1..30b2ef3169 100644
--- a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/java/Utilities.java
+++ b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/java/Utilities.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
+import java.util.EnumSet;
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.ArrayType;
@@ -89,7 +90,7 @@ public final class Utilities {
}
public static Set<javax.lang.model.element.Modifier> reflectionModifiersToModel(int modifiers) {
- Set<javax.lang.model.element.Modifier> ret = new HashSet<javax.lang.model.element.Modifier>();
+ Set<javax.lang.model.element.Modifier> ret = EnumSet.noneOf(javax.lang.model.element.Modifier.class);
if (java.lang.reflect.Modifier.isAbstract(modifiers)) {
ret.add(javax.lang.model.element.Modifier.ABSTRACT);
@@ -129,7 +130,7 @@ public final class Utilities {
public static Set<javax.lang.model.element.Modifier> gsfModifiersToModel(Set<Modifier> modifiers,
javax.lang.model.element.Modifier defaultModifier) {
- Set<javax.lang.model.element.Modifier> ret = new HashSet<javax.lang.model.element.Modifier>();
+ Set<javax.lang.model.element.Modifier> ret = EnumSet.noneOf(javax.lang.model.element.Modifier.class);
if (modifiers.contains(Modifier.STATIC)) {
ret.add(javax.lang.model.element.Modifier.STATIC);
diff --git a/ide/api.debugger/src/org/netbeans/debugger/registry/DebuggerProcessor.java b/ide/api.debugger/src/org/netbeans/debugger/registry/DebuggerProcessor.java
index 849f40701a..a15cf3435b 100644
--- a/ide/api.debugger/src/org/netbeans/debugger/registry/DebuggerProcessor.java
+++ b/ide/api.debugger/src/org/netbeans/debugger/registry/DebuggerProcessor.java
@@ -316,7 +316,7 @@ public class DebuggerProcessor extends LayerGeneratingProcessor {
case CLASS: {
TypeElement te = (TypeElement) e;
TypeMirror superType = te.getSuperclass();
- if (superType.getKind().equals(TypeKind.NONE)) {
+ if (superType.getKind() == TypeKind.NONE) {
return false;
} else {
e = ((DeclaredType) superType).asElement();
@@ -330,7 +330,7 @@ public class DebuggerProcessor extends LayerGeneratingProcessor {
}
case METHOD: {
TypeMirror retType = ((ExecutableElement) e).getReturnType();
- if (retType.getKind().equals(TypeKind.NONE)) {
+ if (retType.getKind() == TypeKind.NONE) {
return false;
} else {
e = ((DeclaredType) retType).asElement();
@@ -373,7 +373,7 @@ public class DebuggerProcessor extends LayerGeneratingProcessor {
}
case METHOD: {
TypeMirror retType = ((ExecutableElement) e).getReturnType();
- if (retType.getKind().equals(TypeKind.NONE)) {
+ if (retType.getKind() == TypeKind.NONE) {
return false;
} else {
TypeElement te = (TypeElement) ((DeclaredType) retType).asElement();
@@ -444,7 +444,7 @@ public class DebuggerProcessor extends LayerGeneratingProcessor {
}
case METHOD: {
TypeMirror retType = ((ExecutableElement) e).getReturnType();
- if (retType.getKind().equals(TypeKind.NONE)) {
+ if (retType.getKind() == TypeKind.NONE) {
return typeMirrors;
} else {
TypeElement te = (TypeElement) ((DeclaredType) retType).asElement();
diff --git a/ide/db/src/org/netbeans/modules/db/explorer/node/TableListNode.java b/ide/db/src/org/netbeans/modules/db/explorer/node/TableListNode.java
index 27ee76d9d9..260d5eabf7 100644
--- a/ide/db/src/org/netbeans/modules/db/explorer/node/TableListNode.java
+++ b/ide/db/src/org/netbeans/modules/db/explorer/node/TableListNode.java
@@ -66,7 +66,7 @@ public class TableListNode extends BaseNode implements SchemaNameProvider {
}
private TableListNode(NodeDataLookup lookup, NodeProvider provider, Type type) {
- super(new ChildNodeFactory(lookup), lookup, Type.SYSTEM.equals(type) ? SYSTEM_FOLDER : FOLDER, provider);
+ super(new ChildNodeFactory(lookup), lookup, Type.SYSTEM == type ? SYSTEM_FOLDER : FOLDER, provider);
this.connection = getLookup().lookup(DatabaseConnection.class);
this.type = type;
}
diff --git a/ide/git/src/org/netbeans/modules/git/FileInformation.java b/ide/git/src/org/netbeans/modules/git/FileInformation.java
index 833cf9c203..bc9b428790 100644
--- a/ide/git/src/org/netbeans/modules/git/FileInformation.java
+++ b/ide/git/src/org/netbeans/modules/git/FileInformation.java
@@ -306,9 +306,9 @@ public class FileInformation extends FileNodeInformation {
default:
throw new IllegalStateException("Unknown conflict type: " + conflictType.toString()); //NOI18N
}
- } else if (Mode.HEAD_VS_INDEX.equals(mode)) {
+ } else if (Mode.HEAD_VS_INDEX == mode) {
return new MessageFormat("{0}").format(new Object[] { sIndex }); //NOI18N
- } else if (Mode.INDEX_VS_WORKING_TREE.equals(mode)) {
+ } else if (Mode.INDEX_VS_WORKING_TREE == mode) {
return new MessageFormat("{0}").format(new Object[] { sWorkingTree }); //NOI18N
} else {
return new MessageFormat("{0}/{1}").format(new Object[] { sIndex, sWorkingTree }, new StringBuffer(), null).toString(); //NOI18N
diff --git a/ide/gsf.testrunner/src/org/netbeans/modules/gsf/testrunner/api/Status.java b/ide/gsf.testrunner/src/org/netbeans/modules/gsf/testrunner/api/Status.java
index 9f9a1ed7cb..7d433bb55c 100644
--- a/ide/gsf.testrunner/src/org/netbeans/modules/gsf/testrunner/api/Status.java
+++ b/ide/gsf.testrunner/src/org/netbeans/modules/gsf/testrunner/api/Status.java
@@ -53,21 +53,21 @@ public enum Status {
* @return true if the given status represents a failure or an error.
*/
public static boolean isFailureOrError(Status status) {
- return FAILED.equals(status) || ERROR.equals(status);
+ return FAILED == status || ERROR == status;
}
/**
* @return true if the given status represents a skipped test.
*/
public static boolean isSkipped(Status status) {
- return SKIPPED.equals(status);
+ return SKIPPED == status;
}
/**
* @return true if the given status represents an aborted test.
*/
public static boolean isAborted(Status status) {
- return ABORTED.equals(status);
+ return ABORTED == status;
}
/**
diff --git a/ide/hudson/src/org/netbeans/modules/hudson/api/Utilities.java b/ide/hudson/src/org/netbeans/modules/hudson/api/Utilities.java
index b057c0ee8c..2847a59f7f 100644
--- a/ide/hudson/src/org/netbeans/modules/hudson/api/Utilities.java
+++ b/ide/hudson/src/org/netbeans/modules/hudson/api/Utilities.java
@@ -253,7 +253,7 @@ public class Utilities {
OK, WRONG_VERSION, INCORRECT_REDIRECTS, OTHER_ERROR;
public boolean isOK() {
- return this.equals(OK);
+ return this == OK;
}
}
}
diff --git a/ide/jumpto/src/org/netbeans/modules/jumpto/SearchHistory.java b/ide/jumpto/src/org/netbeans/modules/jumpto/SearchHistory.java
index 598300378c..d698c20578 100644
--- a/ide/jumpto/src/org/netbeans/modules/jumpto/SearchHistory.java
+++ b/ide/jumpto/src/org/netbeans/modules/jumpto/SearchHistory.java
@@ -212,7 +212,7 @@ public final class SearchHistory {
LOGGER.fine("New text is: " + newText);
} else {
LOGGER.fine("Text changed => remember the current one & set the last (or first) one to the text field.");
- int index = moveOffset.equals(MoveOffset.PREVIOUS) ? getLastIndex() : getFirstIndex();
+ int index = moveOffset == MoveOffset.PREVIOUS ? getLastIndex() : getFirstIndex();
newText = getCachedText(index);
LOGGER.fine("New text is: " + newText);
addHistoryItem(userText, moveOffset);
diff --git a/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/LogContext.java b/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/LogContext.java
index 0edbe0ad2c..84c12995db 100644
--- a/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/LogContext.java
+++ b/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/LogContext.java
@@ -1322,7 +1322,7 @@ import org.openide.util.BaseUtilities;
/**
* For each possible event, one ring-buffer of LogContexts.
*/
- private Map<EventType, RingTimeBuffer> history = new HashMap<EventType, RingTimeBuffer>(7);
+ private Map<EventType, RingTimeBuffer> history = new EnumMap<>(EventType.class);
/**
* For each root, one ring-buffer per event type. Items are removed using least recently accessed strategy. Once an
diff --git a/ide/projectui/src/org/netbeans/modules/project/ui/groups/NewGroupPanel.java b/ide/projectui/src/org/netbeans/modules/project/ui/groups/NewGroupPanel.java
index 8881059779..b0163538d6 100644
--- a/ide/projectui/src/org/netbeans/modules/project/ui/groups/NewGroupPanel.java
+++ b/ide/projectui/src/org/netbeans/modules/project/ui/groups/NewGroupPanel.java
@@ -201,14 +201,14 @@ public class NewGroupPanel extends JPanel {
public static Group create(Type type, String name, boolean autoSync, boolean useOpen, String masterProject, String directory) {
- if (Type.ADHOC.equals(type)) {
+ if (Type.ADHOC == type) {
AdHocGroup g = AdHocGroup.create(name, autoSync);
if (useOpen) {
g.setProjects(new HashSet<Project>(Arrays.asList(OpenProjects.getDefault().getOpenProjects())));
g.setMainProject(OpenProjects.getDefault().getMainProject());
}
return g;
- } else if (Type.SUB.equals(type)) {
+ } else if (Type.SUB == type) {
FileObject fo = FileUtil.toFileObject(new File(masterProject));
try {
return SubprojectsGroup.create(name, ProjectManager.getDefault().findProject(fo));
@@ -216,7 +216,7 @@ public class NewGroupPanel extends JPanel {
throw new AssertionError(x);
}
} else {
- assert Type.DIR.equals(type);
+ assert Type.DIR == type;
FileObject f = FileUtil.toFileObject(FileUtil.normalizeFile(new File(directory)));
return DirectoryGroup.create(name, f);
}
diff --git a/ide/selenium2.server/src/org/netbeans/modules/selenium2/server/Selenium2ServerSupport.java b/ide/selenium2.server/src/org/netbeans/modules/selenium2/server/Selenium2ServerSupport.java
index 03e4629264..a5db7eb14c 100644
--- a/ide/selenium2.server/src/org/netbeans/modules/selenium2/server/Selenium2ServerSupport.java
+++ b/ide/selenium2.server/src/org/netbeans/modules/selenium2/server/Selenium2ServerSupport.java
@@ -188,7 +188,7 @@ public class Selenium2ServerSupport implements Runnable {
if (action == null) {
return;
}
- isRunning = (!action.equals(Action.STOP));
+ isRunning = action != Action.STOP;
action = null;
} catch (BindException bi) {
LOGGER.log(Level.INFO, "Port already in use - the server is probably already running.", bi); //NOI18N
diff --git a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/registry/DebuggerProcessor.java b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/registry/DebuggerProcessor.java
index 3070f67d29..a12d8f4539 100644
--- a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/registry/DebuggerProcessor.java
+++ b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/registry/DebuggerProcessor.java
@@ -180,7 +180,7 @@ public class DebuggerProcessor extends LayerGeneratingProcessor {
case CLASS: {
TypeElement te = (TypeElement) e;
TypeMirror superType = te.getSuperclass();
- if (superType.getKind().equals(TypeKind.NONE)) {
+ if (superType.getKind() == TypeKind.NONE) {
return false;
} else {
e = ((DeclaredType) superType).asElement();
@@ -194,7 +194,7 @@ public class DebuggerProcessor extends LayerGeneratingProcessor {
}
case METHOD: {
TypeMirror retType = ((ExecutableElement) e).getReturnType();
- if (retType.getKind().equals(TypeKind.NONE)) {
+ if (retType.getKind() == TypeKind.NONE) {
return false;
} else {
e = ((DeclaredType) retType).asElement();
diff --git a/ide/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/FileIdentifier.java b/ide/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/FileIdentifier.java
index d6361894b9..70635cffbd 100644
--- a/ide/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/FileIdentifier.java
+++ b/ide/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/FileIdentifier.java
@@ -75,7 +75,7 @@ public abstract class FileIdentifier implements Comparable<FileIdentifier>{
return false;
}
FileIdentifier other = (FileIdentifier) obj;
- if (!this.getType().equals(other.getType())) {
+ if (this.getType() != other.getType()) {
return false;
}
return this.getId().equalsIgnoreCase(other.getId());
diff --git a/java/api.debugger.jpda/src/org/netbeans/modules/debugger/jpda/apiregistry/DebuggerProcessor.java b/java/api.debugger.jpda/src/org/netbeans/modules/debugger/jpda/apiregistry/DebuggerProcessor.java
index 535d114ed3..8901a77f60 100644
--- a/java/api.debugger.jpda/src/org/netbeans/modules/debugger/jpda/apiregistry/DebuggerProcessor.java
+++ b/java/api.debugger.jpda/src/org/netbeans/modules/debugger/jpda/apiregistry/DebuggerProcessor.java
@@ -164,7 +164,7 @@ public class DebuggerProcessor extends LayerGeneratingProcessor {
case CLASS: {
TypeElement te = (TypeElement) e;
TypeMirror superType = te.getSuperclass();
- if (superType.getKind().equals(TypeKind.NONE)) {
+ if (superType.getKind() == TypeKind.NONE) {
return false;
} else {
e = ((DeclaredType) superType).asElement();
@@ -178,7 +178,7 @@ public class DebuggerProcessor extends LayerGeneratingProcessor {
}
case METHOD: {
TypeMirror retType = ((ExecutableElement) e).getReturnType();
- if (retType.getKind().equals(TypeKind.NONE)) {
+ if (retType.getKind() == TypeKind.NONE) {
return false;
} else {
e = ((DeclaredType) retType).asElement();
@@ -211,7 +211,7 @@ public class DebuggerProcessor extends LayerGeneratingProcessor {
}
case METHOD: {
TypeMirror retType = ((ExecutableElement) e).getReturnType();
- if (retType.getKind().equals(TypeKind.NONE)) {
+ if (retType.getKind() == TypeKind.NONE) {
return false;
} else {
TypeElement te = (TypeElement) ((DeclaredType) retType).asElement();
diff --git a/java/beans/src/org/netbeans/modules/beans/Pattern.java b/java/beans/src/org/netbeans/modules/beans/Pattern.java
index 7a775db511..d1fc164260 100644
--- a/java/beans/src/org/netbeans/modules/beans/Pattern.java
+++ b/java/beans/src/org/netbeans/modules/beans/Pattern.java
@@ -146,7 +146,7 @@ public abstract class Pattern {
if (this.name != other.name && (this.name == null || !this.name.equals(other.name))) {
return false;
}
- if (this.kind != other.kind && (this.kind == null || !this.kind.equals(other.kind))) {
+ if (this.kind != other.kind && (this.kind == null || this.kind != other.kind)) {
return false;
}
return true;
diff --git a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/AST2Bytecode.java b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/AST2Bytecode.java
index 0ecf77dfa5..34fd4ade80 100644
--- a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/AST2Bytecode.java
+++ b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/AST2Bytecode.java
@@ -96,8 +96,7 @@ class AST2Bytecode {
Tree node = treeNodes.get(treeIndex);
Tree.Kind kind = node.getKind();
EditorContext.Operation op = null;
- if (kind.equals(Tree.Kind.METHOD_INVOCATION) ||
- kind.equals(Tree.Kind.NEW_CLASS)) {
+ if (kind == Tree.Kind.METHOD_INVOCATION || kind == Tree.Kind.NEW_CLASS) {
int opcode;
do {
@@ -168,7 +167,7 @@ class AST2Bytecode {
String methodName;
String methodClassType;
boolean getStartPosFromMethodLength = false;
- if (kind.equals(Tree.Kind.NEW_CLASS)) {
+ if (kind == Tree.Kind.NEW_CLASS) {
identifier = ((NewClassTree) node).getIdentifier();
methodName = "<init>";
TreePath iPath = TreePath.getPath(cu, identifier);
diff --git a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/CodeSnippetCompiler.java b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/CodeSnippetCompiler.java
index c4980e6cb9..0491319825 100644
--- a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/CodeSnippetCompiler.java
+++ b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/CodeSnippetCompiler.java
@@ -65,7 +65,7 @@ class CodeSnippetCompiler {
return null;
}
for (Diagnostic<? extends JavaFileObject> diag : diagnostics.getDiagnostics()) {
- if (Diagnostic.Kind.ERROR.equals(diag.getKind()) &&
+ if (Diagnostic.Kind.ERROR == diag.getKind() &&
diag.getSource() != null &&
diag.getSource().isNameCompatible(className, JavaFileObject.Kind.CLASS)) {
diff --git a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/EditorContextSupport.java b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/EditorContextSupport.java
index 2ffc60f917..a021023b16 100644
--- a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/EditorContextSupport.java
+++ b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/EditorContextSupport.java
@@ -1247,7 +1247,7 @@ public final class EditorContextSupport {
el = ci.getTrees().getElement(ci.getTrees().getPath(ci.getCompilationUnit(), mst.getExpression()));
if (el != null) {
TypeMirror tm = el.asType();
- if (tm.getKind().equals(TypeKind.DECLARED)) {
+ if (tm.getKind() == TypeKind.DECLARED) {
currentElementPtr[0] = tm.toString();
isMemberClass = true;
}
@@ -1335,7 +1335,7 @@ public final class EditorContextSupport {
if (te != null) {
List<? extends Element> enclosedElms = te.getEnclosedElements();
for (Element elm : enclosedElms) {
- if (elm.getKind().equals(ElementKind.FIELD) && elm.getSimpleName().contentEquals(fieldName)) {
+ if (elm.getKind() == ElementKind.FIELD && elm.getSimpleName().contentEquals(fieldName)) {
currentElementPtr[0] = fieldName;
break;
}
@@ -1345,10 +1345,10 @@ public final class EditorContextSupport {
MemberSelectTree mst = (MemberSelectTree) tree;
String fieldName = mst.getIdentifier().toString();
el = ci.getTrees().getElement(ci.getTrees().getPath(ci.getCompilationUnit(), mst.getExpression()));
- if (el != null && el.asType().getKind().equals(TypeKind.DECLARED)) {
+ if (el != null && el.asType().getKind() == TypeKind.DECLARED) {
List<? extends Element> enclosedElms = ((DeclaredType) el.asType()).asElement().getEnclosedElements();
for (Element elm : enclosedElms) {
- if (elm.getKind().equals(ElementKind.FIELD) && elm.getSimpleName().contentEquals(fieldName)) {
+ if (elm.getKind() == ElementKind.FIELD && elm.getSimpleName().contentEquals(fieldName)) {
currentElementPtr[0] = fieldName;
break;
}
diff --git a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/IntroduceClass.java b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/IntroduceClass.java
index 6628eddd94..7b205d0699 100644
--- a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/IntroduceClass.java
+++ b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/IntroduceClass.java
@@ -98,7 +98,7 @@ class IntroduceClass {
Element lastStatementElement;
if (lastStatement != null && (lastStatementElement = getElement(info, new TreePath(treePath, lastStatement))) != null) {
type = lastStatementElement.asType();
- if (TypeKind.EXECUTABLE.equals(type.getKind())) {
+ if (TypeKind.EXECUTABLE == type.getKind()) {
ExecutableType eType = (ExecutableType) type;
type = eType.getReturnType();
// Check that it ends with a semicolon:
@@ -116,7 +116,7 @@ class IntroduceClass {
}
}
}
- if (type != null && !TypeKind.VOID.equals(type.getKind())) {
+ if (type != null && TypeKind.VOID != type.getKind()) {
returnType = type.toString();
// Prepend a return statement:
long lsBegin = sourcePositions.getStartPosition(compilationUnit, lastStatement);
@@ -235,7 +235,7 @@ class IntroduceClass {
break;
default:
Tree first = firstLeaf.getLeaf();
- if (Tree.Kind.EXPRESSION_STATEMENT.equals(first.getKind())) {
+ if (Tree.Kind.EXPRESSION_STATEMENT == first.getKind()) {
statements = Collections.singletonList((StatementTree) firstLeaf.getLeaf());
} else {
statements = Collections.emptyList();
diff --git a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/ScanLocalVars.java b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/ScanLocalVars.java
index 21515639f1..f958f5a7cb 100644
--- a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/ScanLocalVars.java
+++ b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/ScanLocalVars.java
@@ -153,7 +153,7 @@ final class ScanLocalVars extends ErrorAwareTreePathScanner<Void, Void> {
if (!hasReturns) {
ExpressionTree expression = node.getExpression();
TypeMirror type = info.getTrees().getTypeMirror(new TreePath(getCurrentPath(), expression));
- if (type != null && !TypeKind.ERROR.equals(type.getKind())) {
+ if (type != null && TypeKind.ERROR != type.getKind()) {
returnTypes.add(type);
}
}
diff --git a/java/debugger.jpda.projectsui/src/org/netbeans/modules/debugger/jpda/projectsui/ToolTipAnnotation.java b/java/debugger.jpda.projectsui/src/org/netbeans/modules/debugger/jpda/projectsui/ToolTipAnnotation.java
index b25e92d847..e02a2f606a 100644
--- a/java/debugger.jpda.projectsui/src/org/netbeans/modules/debugger/jpda/projectsui/ToolTipAnnotation.java
+++ b/java/debugger.jpda.projectsui/src/org/netbeans/modules/debugger/jpda/projectsui/ToolTipAnnotation.java
@@ -539,7 +539,7 @@ public class ToolTipAnnotation extends Annotation implements Runnable {
javax.lang.model.element.Element element = controller.getTrees().getElement(mainPath);
if (element != null) {
ElementKind ek = element.getKind();
- if (ElementKind.FIELD.equals(ek)) {
+ if (ElementKind.FIELD == ek) {
String name = element.getSimpleName().toString();
if (name.equals(expr)) {
javax.lang.model.element.Element typeElement = element.getEnclosingElement();
diff --git a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/RemoteServices.java b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/RemoteServices.java
index c2c7c28e7d..1d6cab94b1 100644
--- a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/RemoteServices.java
+++ b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/RemoteServices.java
@@ -54,6 +54,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.EnumMap;
import java.util.WeakHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.locks.Lock;
@@ -283,7 +284,7 @@ public class RemoteServices {
synchronized (remoteServiceClasses) {
Map<ServiceType, ClassObjectReference> basicClassesByType = remoteServiceClasses.get(t.getDebugger());
if (basicClassesByType == null) {
- basicClassesByType = new HashMap<>();
+ basicClassesByType = new EnumMap<>(ServiceType.class);
remoteServiceClasses.put(t.getDebugger(), basicClassesByType);
}
basicClassesByType.put(sType, basicClass);
diff --git a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/VisualDebuggerListener.java b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/VisualDebuggerListener.java
index ed3360115b..54de2fe37e 100644
--- a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/VisualDebuggerListener.java
+++ b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/VisualDebuggerListener.java
@@ -162,7 +162,7 @@ public class VisualDebuggerListener extends DebuggerManagerAdapter {
RemoteServiceInit initRet =
initDebuggerRemoteService(event.getThread(),
RemoteServices.ServiceType.AWT);
- if (initRet.equals(RemoteServiceInit.FAIL_RETRY)) {
+ if (initRet == RemoteServiceInit.FAIL_RETRY) {
DebuggerManager.getDebuggerManager().addBreakpoint(mb[0]);
inited[0].set(false);
}
@@ -183,7 +183,7 @@ public class VisualDebuggerListener extends DebuggerManagerAdapter {
RemoteServiceInit initRet =
initDebuggerRemoteService(event.getThread(),
RemoteServices.ServiceType.FX);
- if (initRet.equals(RemoteServiceInit.FAIL_RETRY)) {
+ if (initRet == RemoteServiceInit.FAIL_RETRY) {
DebuggerManager.getDebuggerManager().addBreakpoint(mb[1]);
inited[1].set(false);
}
diff --git a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluatorVisitor.java b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluatorVisitor.java
index d82ef93bb1..4017c93b7a 100644
--- a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluatorVisitor.java
+++ b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluatorVisitor.java
@@ -3602,7 +3602,7 @@ public class EvaluatorVisitor extends ErrorAwareTreePathScanner<Mirror, Evaluati
ScriptVariable var = evaluationContext.createScriptLocalVariable(name, type);
ExpressionTree initializer = arg0.getInitializer();
if (initializer != null) {
- if (Tree.Kind.NEW_ARRAY.equals(initializer.getKind())) {
+ if (Tree.Kind.NEW_ARRAY == initializer.getKind()) {
try {
newArrayType = ArrayTypeWrapper.componentType((ArrayType) type);
} catch (ClassNotLoadedException cnlex) {
diff --git a/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/java/GenerationUtils.java b/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/java/GenerationUtils.java
index e4e7ae93bc..ceba946311 100644
--- a/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/java/GenerationUtils.java
+++ b/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/java/GenerationUtils.java
@@ -344,7 +344,7 @@ public final class GenerationUtils {
ModifiersTree oldModifiersTree = constructorTree.getModifiers();
Set<Modifier> newModifiers = EnumSet.of(Modifier.PUBLIC);
for (Modifier modifier : oldModifiersTree.getFlags()) {
- if (!Modifier.PROTECTED.equals(modifier) && !Modifier.PRIVATE.equals(modifier)) {
+ if (Modifier.PROTECTED != modifier && Modifier.PRIVATE != modifier) {
newModifiers.add(modifier);
}
}
diff --git a/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/EntityAssociationResolver.java b/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/EntityAssociationResolver.java
index c3022cec64..d38410c629 100644
--- a/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/EntityAssociationResolver.java
+++ b/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/EntityAssociationResolver.java
@@ -226,13 +226,13 @@ public class EntityAssociationResolver {
}
List<IdentifierTree> identifiers = new ArrayList<IdentifierTree>();
boolean field = false;
- if (element.getKind().equals(ElementKind.FIELD)){
+ if (element.getKind() == ElementKind.FIELD) {
field = true;
if (Tree.Kind.VARIABLE == propertyTree.getKind()){
VariableTree vt = (VariableTree) propertyTree;
identifiers = getIdentifier(vt.getType());
}
- } else if (element.getKind().equals(ElementKind.METHOD)){
+ } else if (element.getKind() == ElementKind.METHOD){
MethodTree mt = (MethodTree) propertyTree;
identifiers = getIdentifier(mt.getReturnType());
}
diff --git a/java/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/fixes/MakeClassPublic.java b/java/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/fixes/MakeClassPublic.java
index 36ab8c2a28..ca54db29e8 100644
--- a/java/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/fixes/MakeClassPublic.java
+++ b/java/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/fixes/MakeClassPublic.java
@@ -22,7 +22,7 @@ package org.netbeans.modules.j2ee.jpa.verification.fixes;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.ModifiersTree;
import java.io.IOException;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.Set;
import java.util.logging.Level;
import javax.lang.model.element.Modifier;
@@ -64,8 +64,8 @@ public class MakeClassPublic implements Fix {
ClassTree clazzTree = workingCopy.getTrees().getTree(clazz);
TreeMaker make = workingCopy.getTreeMaker();
- Set<Modifier> flags = new HashSet<Modifier>(clazzTree.getModifiers().getFlags());
- flags.add(Modifier.PUBLIC);
+ Set<Modifier> flags = EnumSet.of(Modifier.PUBLIC);
+ flags.addAll(clazzTree.getModifiers().getFlags());
ModifiersTree newModifiers = make.Modifiers(flags, clazzTree.getModifiers().getAnnotations());
workingCopy.rewrite(clazzTree.getModifiers(), newModifiers);
}
diff --git a/java/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/fixes/RemoveFinalModifier.java b/java/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/fixes/RemoveFinalModifier.java
index 85ed68b60c..7847f4b840 100644
--- a/java/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/fixes/RemoveFinalModifier.java
+++ b/java/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/fixes/RemoveFinalModifier.java
@@ -22,6 +22,7 @@ package org.netbeans.modules.j2ee.jpa.verification.fixes;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.ModifiersTree;
import java.io.IOException;
+import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
@@ -64,7 +65,8 @@ public class RemoveFinalModifier implements Fix {
ClassTree clazzTree = workingCopy.getTrees().getTree(clazz);
TreeMaker make = workingCopy.getTreeMaker();
- Set<Modifier> flags = new HashSet<Modifier>(clazzTree.getModifiers().getFlags());
+ Set<Modifier> flags = EnumSet.noneOf(Modifier.class);
+ flags.addAll(clazzTree.getModifiers().getFlags());
flags.remove(Modifier.FINAL);
ModifiersTree newModifiers = make.Modifiers(flags, clazzTree.getModifiers().getAnnotations());
workingCopy.rewrite(clazzTree.getModifiers(), newModifiers);
diff --git a/java/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/AnnotationHelper.java b/java/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/AnnotationHelper.java
index dfa8586428..9a0758efde 100644
--- a/java/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/AnnotationHelper.java
+++ b/java/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/AnnotationHelper.java
@@ -90,9 +90,9 @@ public class AnnotationHelper {
public TypeElement getSuperclass(TypeElement type) {
TypeMirror supertype = type.getSuperclass();
- if (TypeKind.DECLARED.equals(supertype.getKind())) {
+ if (TypeKind.DECLARED == supertype.getKind()) {
Element element = ((DeclaredType)supertype).asElement();
- if (ElementKind.CLASS.equals(element.getKind())) {
+ if (ElementKind.CLASS == element.getKind()) {
TypeElement superclass = (TypeElement)element;
if (!superclass.getQualifiedName().contentEquals(
Object.class.getCanonicalName())) {
@@ -148,11 +148,11 @@ public class AnnotationHelper {
* was not an annotation type.
*/
public String getAnnotationTypeName(DeclaredType typeMirror) {
- if (!TypeKind.DECLARED.equals(typeMirror.getKind())) {
+ if (TypeKind.DECLARED != typeMirror.getKind()) {
return null;
}
Element element = typeMirror.asElement();
- if (!ElementKind.ANNOTATION_TYPE.equals(element.getKind())) {
+ if (ElementKind.ANNOTATION_TYPE != element.getKind()) {
return null;
}
return ((TypeElement)element).getQualifiedName().toString();
diff --git a/java/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/parser/AnnotationParser.java b/java/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/parser/AnnotationParser.java
index 2f12ff4aaa..14a22c61b5 100644
--- a/java/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/parser/AnnotationParser.java
+++ b/java/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/parser/AnnotationParser.java
@@ -487,7 +487,7 @@ public final class AnnotationParser {
Object value = elementValue.getValue();
if (value instanceof TypeMirror) {
TypeMirror type = (TypeMirror)value;
- if (TypeKind.DECLARED.equals(type.getKind())) {
+ if (TypeKind.DECLARED == type.getKind()) {
return ((TypeElement)(((DeclaredType)value).asElement())).getQualifiedName().toString();
}
}
@@ -583,7 +583,7 @@ public final class AnnotationParser {
return false;
}
TypeMirror type = (TypeMirror)value;
- if (!TypeKind.DECLARED.equals(type.getKind())) {
+ if (TypeKind.DECLARED != type.getKind()) {
return false;
}
}
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/action/GenerationOptions.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/action/GenerationOptions.java
index 46e1db42ed..41945bf4d8 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/action/GenerationOptions.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/action/GenerationOptions.java
@@ -142,7 +142,9 @@ public final class GenerationOptions {
}
public void setModifiers(Set<Modifier> modifiers) {
- this.modifiers = new HashSet<Modifier>(modifiers);
+ EnumSet<Modifier> mod = EnumSet.noneOf(Modifier.class);
+ mod.addAll(modifiers);
+ this.modifiers = mod;
}
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBCompletionContextResolver.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBCompletionContextResolver.java
index b088a193a9..b05e8f0b48 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBCompletionContextResolver.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBCompletionContextResolver.java
@@ -661,7 +661,7 @@ public class DBCompletionContextResolver implements CompletionContextResolver {
element:
for(VariableElement f : resultFields) {
for(javax.lang.model.element.Modifier mod:f.getModifiers()){
- if(javax.lang.model.element.Modifier.TRANSIENT.equals(mod))continue element;
+ if(javax.lang.model.element.Modifier.TRANSIENT == mod) continue element;
}
if(JpaControllerUtil.isAnnotatedWith(f,"javax.persistence.Transient"))continue;//NOI18N
String name = f.getSimpleName().toString();
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/ApplicationManagedResourceTransactionNonInjectableInEJB.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/ApplicationManagedResourceTransactionNonInjectableInEJB.java
index d810d9b4bf..980c86db0a 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/ApplicationManagedResourceTransactionNonInjectableInEJB.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/ApplicationManagedResourceTransactionNonInjectableInEJB.java
@@ -61,11 +61,6 @@ public final class ApplicationManagedResourceTransactionNonInjectableInEJB exten
Collections.<AnnotationTree>emptyList()
);
- Set<Modifier> modifiers = new HashSet<Modifier>();
- modifiers.add(Modifier.PRIVATE);
- modifiers.add(Modifier.STATIC);
-
-
MethodTree newMethod = getTreeMaker().Method(
methodModifiers,
computeMethodName(),
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/ContainerManagedJTANonInjectableInWeb.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/ContainerManagedJTANonInjectableInWeb.java
index fd817bc044..7d63e2785e 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/ContainerManagedJTANonInjectableInWeb.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/ContainerManagedJTANonInjectableInWeb.java
@@ -46,7 +46,7 @@ public final class ContainerManagedJTANonInjectableInWeb extends EntityManagerGe
public ClassTree generate() {
- if(!ElementKind.CLASS.equals(getClassElement().getKind()))
+ if(ElementKind.CLASS != getClassElement().getKind())
{
NotifyDescriptor nd = new NotifyDescriptor.Message(NbBundle.getMessage(ContainerManagedJTANonInjectableInWeb.class, "LBL_ClassOnly"), NotifyDescriptor.INFORMATION_MESSAGE);
DialogDisplayer.getDefault().notify(nd);
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/EntityManagerGenerationStrategySupport.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/EntityManagerGenerationStrategySupport.java
index 0fa77bbf4a..a48378efcf 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/EntityManagerGenerationStrategySupport.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/EntityManagerGenerationStrategySupport.java
@@ -120,7 +120,7 @@ public abstract class EntityManagerGenerationStrategySupport implements EntityMa
{
found=false;
for(Tree membr:members) {
- if(Tree.Kind.METHOD.equals(membr.getKind())){
+ if(Tree.Kind.METHOD == membr.getKind()) {
MethodTree mt = membr instanceof MethodTree ? (MethodTree) membr : null;
if(mt!=null && name.equals(mt.getName().toString())) {
found = true;
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/EntityClosure.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/EntityClosure.java
index 5a36d43109..306e296d35 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/EntityClosure.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/EntityClosure.java
@@ -334,7 +334,7 @@ public class EntityClosure {
TypeElement entity = parameter.getElements().getTypeElement(entityClass);
for (Element element : parameter.getElements().getAllMembers(entity)){
- if (ElementKind.METHOD.equals(element.getKind())){
+ if (ElementKind.METHOD == element.getKind()) {
ExecutableType methodType = (ExecutableType)parameter.getTypes().
asMemberOf((DeclaredType)entity.asType(), element);
TypeMirror returnType = methodType.getReturnType();
@@ -345,7 +345,7 @@ public class EntityClosure {
addTypeMirror(result, parameter, paramType, entitiesFqn);
}
}
- else if (ElementKind.FIELD.equals(element.getKind())){
+ else if (ElementKind.FIELD == element.getKind()) {
TypeMirror typeMirror = parameter.getTypes().
asMemberOf((DeclaredType)entity.asType(), element);
addTypeMirror(result, parameter, typeMirror, entitiesFqn );
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/entity/EntityWizard.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/entity/EntityWizard.java
index 35308eef58..9ca536a082 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/entity/EntityWizard.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/entity/EntityWizard.java
@@ -37,6 +37,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
+import java.util.EnumSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.lang.model.element.Modifier;
@@ -292,11 +293,7 @@ public final class EntityWizard implements WizardDescriptor.InstantiatingIterato
TypeMirror type = workingCopy.getTreeUtilities().parseType(primaryKeyClassName, typeElement);
Tree typeTree = make.Type(type);
- Set<Modifier> serialVersionUIDModifiers = new HashSet<Modifier>();
- serialVersionUIDModifiers.add(Modifier.PRIVATE);
- serialVersionUIDModifiers.add(Modifier.STATIC);
- serialVersionUIDModifiers.add(Modifier.FINAL);
-
+ Set<Modifier> serialVersionUIDModifiers = EnumSet.of(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL);
VariableTree serialVersionUID = make.Variable(make.Modifiers(serialVersionUIDModifiers), "serialVersionUID", genUtils.createType("long", typeElement), make.Literal(Long.valueOf("1"))); //NOI18N
VariableTree idField = make.Variable(genUtils.createModifiers(Modifier.PRIVATE), idFieldName, typeTree, null);
ModifiersTree idMethodModifiers = genUtils.createModifiers(Modifier.PUBLIC);
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/JavaPersistenceGenerator.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/JavaPersistenceGenerator.java
index 2c005fffc3..5d3acd727f 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/JavaPersistenceGenerator.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/JavaPersistenceGenerator.java
@@ -1171,12 +1171,12 @@ public class JavaPersistenceGenerator implements PersistenceGenerator {
for (Tree member : originalClassTree.getMembers()) {
List<? extends AnnotationTree> annotations = null;
Tree memberType = null;
- if (Kind.VARIABLE.equals(member.getKind())) {
+ if (Kind.VARIABLE == member.getKind()) {
VariableTree variable = (VariableTree) member;
annotations = variable.getModifiers().getAnnotations();
memberType = variable.getType();
variables.put(variable.getName().toString(), variable);
- } else if (Kind.METHOD.equals(member.getKind())) {
+ } else if (Kind.METHOD == member.getKind()) {
MethodTree method = (MethodTree) member;
annotations = method.getModifiers().getAnnotations();
memberType = method.getReturnType();
@@ -1342,14 +1342,14 @@ public class JavaPersistenceGenerator implements PersistenceGenerator {
property = createProperty(m);
if(existingTree !=null){
Tree exMemberType = null;
- if (Kind.VARIABLE.equals(existingTree.getKind())) {
+ if (Kind.VARIABLE == existingTree.getKind()) {
VariableTree variable = (VariableTree) existingTree;
exMemberType = variable.getType();
//need to find accessors
property.setOldField(variable);
property.setOldGetter(getters.get(m.getColumnName().toUpperCase()));
property.setOldSetter(setters.get(m.getColumnName().toUpperCase()));
- } else if (Kind.METHOD.equals(existingTree.getKind())) {
+ } else if (Kind.METHOD == existingTree.getKind()) {
MethodTree method = (MethodTree) existingTree;
exMemberType = method.getReturnType();
//need to find setter and variable
@@ -1613,10 +1613,7 @@ public class JavaPersistenceGenerator implements PersistenceGenerator {
* @return the created field.
*/
private VariableTree createSerialVersionUID() {
- Set<Modifier> serialVersionUIDModifiers = new HashSet<Modifier>();
- serialVersionUIDModifiers.add(Modifier.PRIVATE);
- serialVersionUIDModifiers.add(Modifier.STATIC);
- serialVersionUIDModifiers.add(Modifier.FINAL);
+ Set<Modifier> serialVersionUIDModifiers = EnumSet.of(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL);
TreeMaker make = copy.getTreeMaker();
VariableTree serialVersionUID = make.Variable(make.Modifiers(serialVersionUIDModifiers),
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableUISupport.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableUISupport.java
index 31385992af..91dfd2344d 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableUISupport.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableUISupport.java
@@ -223,8 +223,8 @@ public class TableUISupport {
JLabel component = (JLabel)super.getListCellRendererComponent(list, displayName, index, isSelected, cellHasFocus);
boolean needDisable = (disabledReason instanceof Table.NoPrimaryKeyDisabledReason) || (disabledReason instanceof Table.ExistingNotInSourceDisabledReason) ||
- (filter.equals(FilterAvailable.NEW) && (disabledReason instanceof Table.ExistingDisabledReason)) ||
- (filter.equals(FilterAvailable.UPDATE) && (disabledReason==null));
+ (filter == FilterAvailable.NEW && (disabledReason instanceof Table.ExistingDisabledReason)) ||
+ (filter == FilterAvailable.UPDATE && (disabledReason==null));
component.setEnabled(!needDisable);
component.setToolTipText(disabledReason != null ? disabledReason.getDescription() : null);
diff --git a/java/j2ee.persistenceapi/src/org/netbeans/modules/j2ee/persistenceapi/metadata/orm/annotation/AttributesHelper.java b/java/j2ee.persistenceapi/src/org/netbeans/modules/j2ee/persistenceapi/metadata/orm/annotation/AttributesHelper.java
index 5a0ccbff5a..d6cf9e8713 100644
--- a/java/j2ee.persistenceapi/src/org/netbeans/modules/j2ee/persistenceapi/metadata/orm/annotation/AttributesHelper.java
+++ b/java/j2ee.persistenceapi/src/org/netbeans/modules/j2ee/persistenceapi/metadata/orm/annotation/AttributesHelper.java
@@ -58,11 +58,11 @@ public final class AttributesHelper {
for (Element element : typeElement.getEnclosedElements()) {
ElementKind elementKind = element.getKind();
if (fieldAccess) {
- if (ElementKind.FIELD.equals(elementKind)) {
+ if (ElementKind.FIELD == elementKind) {
handleProperty(element);
}
} else {
- if (ElementKind.METHOD.equals(elementKind)) {
+ if (ElementKind.METHOD == elementKind) {
handleProperty(element);
}
}
@@ -74,7 +74,7 @@ public final class AttributesHelper {
return;
}
String propertyName = element.getSimpleName().toString();
- if (ElementKind.METHOD.equals(element.getKind())) {
+ if (ElementKind.METHOD == element.getKind()) {
propertyName = EntityMappingsUtilities.getterNameToPropertyName(propertyName);
if (propertyName == null) {
return;
diff --git a/java/j2ee.persistenceapi/src/org/netbeans/modules/j2ee/persistenceapi/metadata/orm/annotation/EntityMappingsUtilities.java b/java/j2ee.persistenceapi/src/org/netbeans/modules/j2ee/persistenceapi/metadata/orm/annotation/EntityMappingsUtilities.java
index bc99c6f74d..c39ea61001 100644
--- a/java/j2ee.persistenceapi/src/org/netbeans/modules/j2ee/persistenceapi/metadata/orm/annotation/EntityMappingsUtilities.java
+++ b/java/j2ee.persistenceapi/src/org/netbeans/modules/j2ee/persistenceapi/metadata/orm/annotation/EntityMappingsUtilities.java
@@ -133,7 +133,7 @@ public class EntityMappingsUtilities {
public static String getElementTypeName(Element element) {
TypeMirror elementType = element.asType();
- if (TypeKind.DECLARED.equals(elementType.getKind())) {
+ if (TypeKind.DECLARED == elementType.getKind()) {
return ((TypeElement)((DeclaredType)elementType).asElement()).getQualifiedName().toString(); // NOI18N
}
return void.class.getName();
diff --git a/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java b/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
index d4298e774f..471bd1407b 100644
--- a/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
+++ b/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
@@ -3262,7 +3262,7 @@ public final class JavaCompletionTask<T> extends BaseTask {
final Elements elements = controller.getElements();
TypeMirror tm = controller.getTreeUtilities().parseType(env.getPrefix(), env.getScope().getEnclosingClass());
TypeElement e = (TypeElement) ((DeclaredType) tm).asElement();
- if (e.getSimpleName().toString().contentEquals(env.getPrefix()) && (e.getKind().equals(ElementKind.RECORD))) {
+ if (e.getSimpleName().toString().contentEquals(env.getPrefix()) && (e.getKind() == ElementKind.RECORD)) {
results.add(((RecordPatternItemFactory<T>) itemFactory).createRecordPatternItem(env.getController(), e, (DeclaredType) e.asType(), anchorOffset, null, elements.isDeprecated(e), env.isInsideNew(), env.isInsideNew() || env.isInsideClass()));
}
}
@@ -4253,7 +4253,7 @@ public final class JavaCompletionTask<T> extends BaseTask {
for (TypeElement e : controller.getElementUtilities().getGlobalTypes(acceptor)) {
Tree iot = env.getPath().getLeaf();
TokenSequence<JavaTokenId> ts = findLastNonWhitespaceToken(env, iot, env.getOffset());
- if (env.getPrefix() != null && e.getSimpleName().toString().contentEquals(env.getPrefix()) && (e.getKind().equals(ElementKind.RECORD))
+ if (env.getPrefix() != null && e.getSimpleName().toString().contentEquals(env.getPrefix()) && (e.getKind() == ElementKind.RECORD)
&& ts != null && ts.token().id() == JavaTokenId.INSTANCEOF) {
results.add(((RecordPatternItemFactory<T>) itemFactory).createRecordPatternItem(controller, e, (DeclaredType) e.asType(), anchorOffset, null, controller.getElements().isDeprecated(e), env.isInsideNew(), env.isInsideNew() || env.isInsideClass()));
} else {
diff --git a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java
index 18dd923ea4..fdfdc8fdfe 100644
--- a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java
+++ b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java
@@ -708,7 +708,7 @@ public abstract class SemanticHighlighterBase extends JavaParserResultTask {
tl.moveToOffset(sourcePositions.getStartPosition(info.getCompilationUnit(), node));
List<? extends CaseLabelTree> labels = node.getLabels();
for (CaseLabelTree labelTree : labels) {
- if (labelTree.getKind().equals(Tree.Kind.PATTERN_CASE_LABEL)) {
+ if (labelTree.getKind() == Tree.Kind.PATTERN_CASE_LABEL) {
PatternCaseLabelTree patternLabel = (PatternCaseLabelTree) labelTree;
tl.moveToOffset(sourcePositions.getEndPosition(info.getCompilationUnit(), patternLabel.getPattern()));
tl.moveNext();
@@ -1115,7 +1115,7 @@ public abstract class SemanticHighlighterBase extends JavaParserResultTask {
if (t != null) {
contextKeywords.add(t);
}
- } else if (tree != null && tree.getKind().equals(Kind.MODIFIERS)) {
+ } else if (tree != null && tree.getKind() == Kind.MODIFIERS) {
visitModifier(tree);
}
return super.scan(tree, p);
diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java
index aa52558e64..15a4140e97 100644
--- a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java
+++ b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java
@@ -129,7 +129,7 @@ public abstract class JavaCompletionItem implements CompletionItem {
}
public static JavaCompletionItem createRecordPatternItem(CompilationInfo info, TypeElement elem, DeclaredType type, int substitutionOffset, ReferencesCount referencesCount, boolean isDeprecated, boolean insideNew, boolean addTypeVars) {
- if(elem.getKind().equals(ElementKind.RECORD)) {
+ if(elem.getKind() == ElementKind.RECORD) {
return new RecordPatternItem(info, elem, type, 0, substitutionOffset, referencesCount, isDeprecated, insideNew);
}
else {
diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/codegen/ConstructorGenerator.java b/java/java.editor/src/org/netbeans/modules/java/editor/codegen/ConstructorGenerator.java
index 3b77ed77b3..aa92a04509 100644
--- a/java/java.editor/src/org/netbeans/modules/java/editor/codegen/ConstructorGenerator.java
+++ b/java/java.editor/src/org/netbeans/modules/java/editor/codegen/ConstructorGenerator.java
@@ -83,7 +83,7 @@ public class ConstructorGenerator implements CodeGenerator {
return ret;
}
final TypeElement typeElement = (TypeElement)controller.getTrees().getElement(path);
- if (typeElement == null || !typeElement.getKind().isClass() || NestingKind.ANONYMOUS.equals(typeElement.getNestingKind())) {
+ if (typeElement == null || !typeElement.getKind().isClass() || NestingKind.ANONYMOUS == typeElement.getNestingKind()) {
return ret;
}
final WorkingCopy wc = context.lookup(WorkingCopy.class);
diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/overridden/ElementDescription.java b/java/java.editor/src/org/netbeans/modules/java/editor/overridden/ElementDescription.java
index 9f89b7378a..1c4c836959 100644
--- a/java/java.editor/src/org/netbeans/modules/java/editor/overridden/ElementDescription.java
+++ b/java/java.editor/src/org/netbeans/modules/java/editor/overridden/ElementDescription.java
@@ -59,7 +59,7 @@ public class ElementDescription {
public ElementDescription(CompilationInfo info, Element element, boolean overriddenFlag) {
this.originalCPInfo = info.getClasspathInfo();
this.handle = ElementHandle.create(element);
- if (METHOD.equals(element.getKind()) && null != element.getEnclosingElement()) {
+ if (METHOD == element.getKind() && null != element.getEnclosingElement()) {
//when showing the implementors/overriders of a method, show the type icon (not the method icon)
this.imageKind = element.getEnclosingElement().getKind();
} else {
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/EmptyStatements.java b/java/java.hints/src/org/netbeans/modules/java/hints/EmptyStatements.java
index 590bf81ed7..901b4b6a51 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/EmptyStatements.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/EmptyStatements.java
@@ -124,7 +124,7 @@ public class EmptyStatements {
public static ErrorDescription forDO_WHILE_LOOP(HintContext ctx) {
Tree parent = ctx.getPath().getParentPath().getLeaf();
- if (!Kind.DO_WHILE_LOOP.equals(parent.getKind())) {
+ if (Kind.DO_WHILE_LOOP != parent.getKind()) {
return null;
}
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/ExportNonAccessibleElement.java b/java/java.hints/src/org/netbeans/modules/java/hints/ExportNonAccessibleElement.java
index f8117f1944..e8e774efa2 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/ExportNonAccessibleElement.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/ExportNonAccessibleElement.java
@@ -388,7 +388,8 @@ implements ElementVisitor<Boolean,Void>, TypeVisitor<Boolean,Void> {
Tree t = wc.getTrees().getTree(e);
if (TreeUtilities.CLASS_TREE_KINDS.contains(t.getKind())) {
ClassTree ct = (ClassTree)t;
- Set<Modifier> flags = new HashSet<Modifier>(ct.getModifiers().getFlags());
+ Set<Modifier> flags = EnumSet.noneOf(Modifier.class);
+ flags.addAll(ct.getModifiers().getFlags());
flags.remove(Modifier.PUBLIC);
flags.remove(Modifier.PROTECTED);
ModifiersTree mt = wc.getTreeMaker().Modifiers(flags, ct.getModifiers().getAnnotations());
@@ -397,7 +398,8 @@ implements ElementVisitor<Boolean,Void>, TypeVisitor<Boolean,Void> {
}
if (t.getKind() == Kind.METHOD) {
MethodTree mt = (MethodTree)t;
- Set<Modifier> flags = new HashSet<Modifier>(mt.getModifiers().getFlags());
+ Set<Modifier> flags = EnumSet.noneOf(Modifier.class);
+ flags.addAll(mt.getModifiers().getFlags());
flags.remove(Modifier.PUBLIC);
flags.remove(Modifier.PROTECTED);
ModifiersTree modt = wc.getTreeMaker().Modifiers(flags, mt.getModifiers().getAnnotations());
@@ -406,7 +408,8 @@ implements ElementVisitor<Boolean,Void>, TypeVisitor<Boolean,Void> {
}
if (t.getKind() == Kind.VARIABLE) {
VariableTree vt = (VariableTree)t;
- Set<Modifier> flags = new HashSet<Modifier>(vt.getModifiers().getFlags());
+ Set<Modifier> flags = EnumSet.noneOf(Modifier.class);
+ flags.addAll(vt.getModifiers().getFlags());
flags.remove(Modifier.PUBLIC);
flags.remove(Modifier.PROTECTED);
ModifiersTree modt = wc.getTreeMaker().Modifiers(flags, vt.getModifiers().getAnnotations());
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/LoggerNotStaticFinal.java b/java/java.hints/src/org/netbeans/modules/java/hints/LoggerNotStaticFinal.java
index 6200ce6399..166243c78a 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/LoggerNotStaticFinal.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/LoggerNotStaticFinal.java
@@ -86,11 +86,8 @@ public class LoggerNotStaticFinal {
TreePath tp = ctx.getPath();
VariableTree vt = (VariableTree) tp.getLeaf();
ModifiersTree mt = vt.getModifiers();
- Set<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
-
+ Set<Modifier> modifiers = EnumSet.of(Modifier.FINAL, Modifier.STATIC);
modifiers.addAll(mt.getFlags());
- modifiers.add(Modifier.FINAL);
- modifiers.add(Modifier.STATIC);
ModifiersTree newMod = wc.getTreeMaker().Modifiers(modifiers, mt.getAnnotations());
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/NoLoggers.java b/java/java.hints/src/org/netbeans/modules/java/hints/NoLoggers.java
index b8e9a57d36..73d7918e10 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/NoLoggers.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/NoLoggers.java
@@ -34,6 +34,7 @@ import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
+import java.util.EnumSet;
import java.util.prefs.Preferences;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
@@ -202,10 +203,7 @@ public final class NoLoggers {
}
// modifiers
- Set<Modifier> mods = new HashSet<Modifier>();
- mods.add(Modifier.PRIVATE);
- mods.add(Modifier.STATIC);
- mods.add(Modifier.FINAL);
+ Set<Modifier> mods = EnumSet.of(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL);
ModifiersTree mt = m.Modifiers(mods);
// logger type
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/SerialVersionUID.java b/java/java.hints/src/org/netbeans/modules/java/hints/SerialVersionUID.java
index 76cba81f98..d641a43f55 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/SerialVersionUID.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/SerialVersionUID.java
@@ -106,7 +106,7 @@ public class SerialVersionUID implements ErrorRule<Void>, OverrideErrorMessage<V
fixes.add(new FixImpl(TreePathHandle.create(treePath, info), false).toEditorFix());
// fixes.add(new FixImpl(TreePathHandle.create(treePath, info), true));
- if (!type.getNestingKind().equals(NestingKind.ANONYMOUS)) {
+ if (type.getNestingKind() != NestingKind.ANONYMOUS) {
// add SuppressWarning only to non-anonymous class
fixes.addAll(FixFactory.createSuppressWarnings(info, treePath, SERIAL));
}
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/StaticImport.java b/java/java.hints/src/org/netbeans/modules/java/hints/StaticImport.java
index 10f58f6d71..0628ceeaef 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/StaticImport.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/StaticImport.java
@@ -95,7 +95,7 @@ public class StaticImport {
return null;
}
- if (ElementKind.METHOD.equals(e.getKind())) {
+ if (ElementKind.METHOD == e.getKind()) {
TreePath mitp = treePath.getParentPath();
if (mitp == null || mitp.getLeaf().getKind() != Kind.METHOD_INVOCATION) {
return null;
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/errors/ChangeMethodParameters.java b/java/java.hints/src/org/netbeans/modules/java/hints/errors/ChangeMethodParameters.java
index 1956048418..1c8427974f 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/errors/ChangeMethodParameters.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/errors/ChangeMethodParameters.java
@@ -165,7 +165,7 @@ public class ChangeMethodParameters implements ErrorRule<Void> {
List<TreePath> methods = new LinkedList<>();
for (Tree tree : ((ClassTree) enclosingTypePath.getLeaf()).getMembers()) {
if (cancel) return Collections.<Fix>emptyList();
- if (tree.getKind().equals(Tree.Kind.METHOD)) {
+ if (tree.getKind() == Tree.Kind.METHOD) {
MethodTree method = (MethodTree) tree;
if (method.getName().contentEquals(methodName)) {
methods.add(new TreePath(enclosingTypePath, method));
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/errors/ImplementAllAbstractMethods.java b/java/java.hints/src/org/netbeans/modules/java/hints/errors/ImplementAllAbstractMethods.java
index 3ed7fe332e..294ccb102c 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/errors/ImplementAllAbstractMethods.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/errors/ImplementAllAbstractMethods.java
@@ -39,6 +39,7 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
+import java.util.EnumSet;
import java.util.concurrent.Future;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
@@ -518,9 +519,10 @@ public final class ImplementAllAbstractMethods implements ErrorRule<Object>, Ove
}
ClassTree ct = (ClassTree)ctx.getPath().getLeaf();
ModifiersTree mt = ct.getModifiers();
- Set<Modifier> mods = new HashSet<>(mt.getFlags());
+
+ Set<Modifier> mods = EnumSet.of(Modifier.ABSTRACT);
+ mods.addAll(mt.getFlags());
mods.remove(Modifier.FINAL);
- mods.add(Modifier.ABSTRACT);
ModifiersTree newMt = wc.getTreeMaker().Modifiers(mods, mt.getAnnotations());
wc.rewrite(mt, newMt);
}
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/errors/RemoveInvalidModifier.java b/java/java.hints/src/org/netbeans/modules/java/hints/errors/RemoveInvalidModifier.java
index dfbbf02570..62b4857b30 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/errors/RemoveInvalidModifier.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/errors/RemoveInvalidModifier.java
@@ -80,7 +80,11 @@ public class RemoveInvalidModifier implements ErrorRule<Void> {
//support multiple invalid modifiers
Collection<Modifier> modss=convertToModifiers(invalidMod.split(","));
TreePath modifierTreePath = TreePath.getPath(treePath, getModifierTree(treePath));
- Fix removeModifiersFix = FixFactory.removeModifiersFix(compilationInfo, modifierTreePath, new HashSet<>(modss), NbBundle.getMessage(RemoveInvalidModifier.class, "FIX_RemoveInvalidModifier", invalidMod, modss.size()));
+
+ EnumSet<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
+ modifiers.addAll(modss);
+
+ Fix removeModifiersFix = FixFactory.removeModifiersFix(compilationInfo, modifierTreePath, modifiers, NbBundle.getMessage(RemoveInvalidModifier.class, "FIX_RemoveInvalidModifier", invalidMod, modss.size()));
return Arrays.asList(removeModifiersFix);
}
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java b/java/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java
index 1f2c075e4f..479c5da53c 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java
@@ -86,6 +86,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.EnumMap;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
@@ -809,7 +810,7 @@ public class Utilities {
private static final Map<Kind, String> operator2DN;
static {
- operator2DN = new HashMap<Kind, String>();
+ operator2DN = new EnumMap<>(Kind.class);
operator2DN.put(AND, "&");
operator2DN.put(XOR, "^");
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/jdk/AnnotationProcessors.java b/java/java.hints/src/org/netbeans/modules/java/hints/jdk/AnnotationProcessors.java
index f3e7a8f876..97b880bf73 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/jdk/AnnotationProcessors.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/jdk/AnnotationProcessors.java
@@ -361,7 +361,7 @@ public class AnnotationProcessors {
)
), false);
MethodTree overrideMethod = make.Method(
- make.Modifiers(Collections.singleton(Modifier.PUBLIC),
+ make.Modifiers(Collections.singleton(Modifier.PUBLIC),
// @Override is since 1.5 as well as AnnotationProcessors.
// we always implement in subclass; so @Override is desired.
Collections.singletonList(
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToNestedRecordPattern.java b/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToNestedRecordPattern.java
index cc2d539e02..c735a0b80f 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToNestedRecordPattern.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToNestedRecordPattern.java
@@ -82,7 +82,7 @@ public class ConvertToNestedRecordPattern {
return null;
}
TreePath t = ctx.getPath();
- if (!t.getParentPath().getLeaf().getKind().equals(Tree.Kind.INSTANCE_OF)) {
+ if (t.getParentPath().getLeaf().getKind() != Tree.Kind.INSTANCE_OF) {
return null;
}
Set<String> recordPatternVarSet = new HashSet<>();
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToRecordPattern.java b/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToRecordPattern.java
index 5ead0e6785..864ed9c5a2 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToRecordPattern.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToRecordPattern.java
@@ -86,7 +86,7 @@ public class ConvertToRecordPattern {
return null;
}
ElementKind kind = ctx.getInfo().getTrees().getElement(ctx.getVariables().get("$typeI0")).getKind();
- if (kind.equals(ElementKind.RECORD)) {
+ if (kind == ElementKind.RECORD) {
Set<TreePath> convertPath = new HashSet<>();
Set<String> localVarList = new HashSet<>();
localVarList.add(ctx.getInfo().getTrees().getElement(ctx.getVariables().get("$expr")).getSimpleName().toString());
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/jdk/mapreduce/ProspectiveOperation.java b/java/java.hints/src/org/netbeans/modules/java/hints/jdk/mapreduce/ProspectiveOperation.java
index df8701cd52..22a12839a6 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/jdk/mapreduce/ProspectiveOperation.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/jdk/mapreduce/ProspectiveOperation.java
@@ -41,6 +41,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.EnumSet;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.Name;
import javax.lang.model.element.TypeElement;
@@ -81,7 +82,7 @@ import org.netbeans.api.java.source.WorkingCopy;
private static ProspectiveOperation handleCompoundAssignementReducer(TreeMaker tm, ExpressionTree expr, OperationType operationType, PreconditionsChecker precond, WorkingCopy workingCopy, List<ProspectiveOperation> ls, ProspectiveOperation redOp) {
//this variable will be removed at a later stage.
- VariableTree var = tm.Variable(tm.Modifiers(new HashSet<Modifier>()), "dummyVar18912", tm.Type("Object"), ((CompoundAssignmentTree) expr).getExpression());
+ VariableTree var = tm.Variable(tm.Modifiers(EnumSet.noneOf(Modifier.class)), "dummyVar18912", tm.Type("Object"), ((CompoundAssignmentTree) expr).getExpression());
ProspectiveOperation map = new ProspectiveOperation(var, operationType.MAP, precond.getInnerVariables(), workingCopy, precond.getVarToName());
map.getAvailableVariables().add(var.getName());
ls.add(map);
@@ -277,7 +278,7 @@ import org.netbeans.api.java.source.WorkingCopy;
args.add(this.reducingVariable);
if (TreeUtilities.isPreOrPostfixOp(opKind)) {
Tree type = null;//treeMaker.Type("Integer");
- var = this.treeMaker.Variable(treeMaker.Modifiers(new HashSet<Modifier>()), "accumulator", null, null);
+ var = this.treeMaker.Variable(treeMaker.Modifiers(EnumSet.noneOf(Modifier.class)), "accumulator", null, null);
VariableTree var1 = makeUnknownVariable();
if (opKind == Tree.Kind.POSTFIX_INCREMENT || opKind == Tree.Kind.PREFIX_INCREMENT) {
if (isInteger(this.reducingVariable, workingCopy)) {
@@ -299,7 +300,7 @@ import org.netbeans.api.java.source.WorkingCopy;
} else if (TreeUtilities.isCompoundAssignementAssignement(opKind)) {
Tree type = null;//treeMaker.Type("Integer");
- var = this.treeMaker.Variable(treeMaker.Modifiers(new HashSet<Modifier>()), "accumulator", null, null);
+ var = this.treeMaker.Variable(treeMaker.Modifiers(EnumSet.noneOf(Modifier.class)), "accumulator", null, null);
VariableTree var1 = makeUnknownVariable();
if (opKind == Tree.Kind.PLUS_ASSIGNMENT) {
if (isString(this.reducingVariable)) {
@@ -332,7 +333,7 @@ import org.netbeans.api.java.source.WorkingCopy;
Name varName = getOneFromSet(this.neededVariables);
//If types need to be made explicit the null should be replaced with the commented expression
Tree type = null;// treeMaker.Type(this.varToType.get(varName).toString());
- var = this.treeMaker.Variable(treeMaker.Modifiers(new HashSet<Modifier>()), varName.toString(), type, null);
+ var = this.treeMaker.Variable(treeMaker.Modifiers(EnumSet.noneOf(Modifier.class)), varName.toString(), type, null);
}
return var;
}
@@ -354,7 +355,7 @@ import org.netbeans.api.java.source.WorkingCopy;
}
private VariableTree makeUnknownVariable() {
- return this.treeMaker.Variable(treeMaker.Modifiers(new HashSet<Modifier>()), UNKNOWN_NAME, null, null);
+ return this.treeMaker.Variable(treeMaker.Modifiers(EnumSet.noneOf(Modifier.class)), UNKNOWN_NAME, null, null);
}
public static enum OperationType {
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/perf/Tiny.java b/java/java.hints/src/org/netbeans/modules/java/hints/perf/Tiny.java
index 7373f01ba7..ce6826e48d 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/perf/Tiny.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/perf/Tiny.java
@@ -37,6 +37,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.EnumMap;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
@@ -427,7 +428,7 @@ public class Tiny {
JavaFixUtilities.rewriteFix(ctx, Bundle.FIX_RedundantToString(), ctx.getPath(), "$v"));
}
- private static final Map<TypeKind, String[]> PARSE_METHODS = new HashMap<>(7);
+ private static final Map<TypeKind, String[]> PARSE_METHODS = new EnumMap<>(TypeKind.class);
static {
PARSE_METHODS.put(TypeKind.BOOLEAN, new String[] { "Boolean", "parseBoolean" }); // NOI18N
PARSE_METHODS.put(TypeKind.BYTE, new String[] { "Byte", "parseByte"}); // NOI18N
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/suggestions/FlipOperands.java b/java/java.hints/src/org/netbeans/modules/java/hints/suggestions/FlipOperands.java
index 93160209e3..25fb8f5486 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/suggestions/FlipOperands.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/suggestions/FlipOperands.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.EnumSet;
import javax.lang.model.type.TypeMirror;
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.modules.java.hints.errors.Utilities;
@@ -58,14 +59,14 @@ import org.openide.util.NbBundle.Messages;
@Hint(displayName = "#DN_FlipOperands", description = "#DESC_FlipOperands", category = "suggestions", hintKind = Kind.ACTION, severity = Severity.HINT)
public class FlipOperands {
- private static final Set<Tree.Kind> /*ALMOST*/SAFE_FLIP = new HashSet<>(Arrays.asList(
+ private static final Set<Tree.Kind> /*ALMOST*/SAFE_FLIP = EnumSet.of(
Tree.Kind.EQUAL_TO, Tree.Kind.NOT_EQUAL_TO, Tree.Kind.MULTIPLY, Tree.Kind.PLUS,
Tree.Kind.AND, Tree.Kind.OR, Tree.Kind.XOR, Tree.Kind.CONDITIONAL_AND, Tree.Kind.CONDITIONAL_OR
- ));
- private static final Set<Tree.Kind> UNSAFE_FLIP = new HashSet<>(Arrays.asList(
+ );
+ private static final Set<Tree.Kind> UNSAFE_FLIP = EnumSet.of(
Tree.Kind.DIVIDE, Tree.Kind.REMAINDER, Tree.Kind.MINUS, Tree.Kind.LEFT_SHIFT,
Tree.Kind.RIGHT_SHIFT, Tree.Kind.UNSIGNED_RIGHT_SHIFT
- ));
+ );
private static final Map<Tree.Kind, Tree.Kind> CONVERT_FLIP = new HashMap<>();
private static final Map<Tree.Kind, String> OPERATOR_DN = new HashMap<>();
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ConstructorGenerator.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ConstructorGenerator.java
index 9f739277f7..2db3dac827 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ConstructorGenerator.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ConstructorGenerator.java
@@ -106,7 +106,7 @@ public final class ConstructorGenerator extends CodeActionsProvider {
return Collections.emptyList();
}
TypeElement typeElement = (TypeElement) info.getTrees().getElement(tp);
- if (typeElement == null || !typeElement.getKind().isClass() || NestingKind.ANONYMOUS.equals(typeElement.getNestingKind())) {
+ if (typeElement == null || !typeElement.getKind().isClass() || NestingKind.ANONYMOUS == typeElement.getNestingKind()) {
return Collections.emptyList();
}
final Set<? extends VariableElement> uninitializedFields = info.getTreeUtilities().getUninitializedFields(tp);
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java
index 65b9be36c2..9d4dc2eb66 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java
@@ -28,6 +28,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.EnumSet;
import java.util.concurrent.CompletableFuture;
import java.util.function.BiConsumer;
import java.util.logging.Level;
@@ -255,7 +256,7 @@ public final class ChangeMethodParametersRefactoring extends CodeRefactoring {
ChangeParametersRefactoring refactoring = new ChangeParametersRefactoring(handle);
Modifier selectedModifier = ui.getSelectedModifier();
if (selectedModifier != null) {
- Set<javax.lang.model.element.Modifier> modifiers = new HashSet<>(1);
+ Set<javax.lang.model.element.Modifier> modifiers = EnumSet.noneOf(javax.lang.model.element.Modifier.class);
switch (selectedModifier) {
case PRIVATE: modifiers.add(javax.lang.model.element.Modifier.PRIVATE);break;
case PACKAGE_PRIVATE: break; /* no modifier */
diff --git a/java/java.project.ui/src/org/netbeans/modules/java/project/ui/ProjectProblemsProviders.java b/java/java.project.ui/src/org/netbeans/modules/java/project/ui/ProjectProblemsProviders.java
index 21f9c7268a..07a632d689 100644
--- a/java/java.project.ui/src/org/netbeans/modules/java/project/ui/ProjectProblemsProviders.java
+++ b/java/java.project.ui/src/org/netbeans/modules/java/project/ui/ProjectProblemsProviders.java
@@ -631,8 +631,7 @@ public class ProjectProblemsProviders {
return false;
}
final BaseResolver otherResolver = (BaseResolver) other;
- return type.equals(otherResolver.type) &&
- id.equals(otherResolver.id);
+ return type == otherResolver.type && id.equals(otherResolver.id);
}
@Override
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/matching/CopyFinder.java b/java/java.source.base/src/org/netbeans/modules/java/source/matching/CopyFinder.java
index e1cf7449df..4fc414b06f 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/matching/CopyFinder.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/matching/CopyFinder.java
@@ -1630,7 +1630,7 @@ public class CopyFinder extends ErrorAwareTreeScanner<Boolean, TreePath> {
MemberReferenceTree t = (MemberReferenceTree) p.getLeaf();
- if (!node.getMode().equals(t.getMode()))
+ if (node.getMode() != t.getMode())
return false;
if (!scan(node.getQualifierExpression(), t.getQualifierExpression(), p))
diff --git a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/ForLoopTest.java b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/ForLoopTest.java
index 34ea7faf87..b31dc5f694 100644
--- a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/ForLoopTest.java
+++ b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/ForLoopTest.java
@@ -324,7 +324,7 @@ public class ForLoopTest extends GeneratorTestMDRCompat {
WhileLoopTree wlt = (WhileLoopTree) stmts.get(0);
ExpressionStatementTree statement = (ExpressionStatementTree) wlt.getStatement();
VariableTree var = make.Variable(
- make.Modifiers(Collections.<Modifier>emptySet()),
+ make.Modifiers(Collections.<Modifier>emptySet()),
"properties",
make.Identifier("Properties"),
statement.getExpression()
@@ -385,7 +385,7 @@ public class ForLoopTest extends GeneratorTestMDRCompat {
ForLoopTree foor = (ForLoopTree) stmts.get(0);
ExpressionStatementTree statement = (ExpressionStatementTree) foor.getStatement();
VariableTree var = make.Variable(
- make.Modifiers(Collections.<Modifier>emptySet()),
+ make.Modifiers(Collections.<Modifier>emptySet()),
"properties",
make.Identifier("Properties"),
statement.getExpression()
@@ -444,7 +444,7 @@ public class ForLoopTest extends GeneratorTestMDRCompat {
WhileLoopTree wlt = (WhileLoopTree) stmts.get(0);
ExpressionStatementTree statement = (ExpressionStatementTree) wlt.getStatement();
VariableTree var = make.Variable(
- make.Modifiers(Collections.<Modifier>emptySet()),
+ make.Modifiers(Collections.<Modifier>emptySet()),
"properties",
make.Identifier("Properties"),
statement.getExpression()
diff --git a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/Method1Test.java b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/Method1Test.java
index 090b0a0595..fc96614b3d 100644
--- a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/Method1Test.java
+++ b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/Method1Test.java
@@ -141,9 +141,7 @@ public class Method1Test extends GeneratorTestMDRCompat {
ClassTree clazz = (ClassTree) workingCopy.getCompilationUnit().getTypeDecls().get(0);
MethodTree method = (MethodTree) clazz.getMembers().get(1);
ModifiersTree origMods = method.getModifiers();
- Set<Modifier> njuMods = new HashSet<Modifier>();
- njuMods.add(Modifier.PRIVATE);
- njuMods.add(Modifier.STATIC);
+ Set<Modifier> njuMods = EnumSet.of(Modifier.PRIVATE, Modifier.STATIC);
workingCopy.rewrite(origMods, make.Modifiers(njuMods));
}
diff --git a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/ModifiersTest.java b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/ModifiersTest.java
index f1724c8e29..d7b9207ce3 100644
--- a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/ModifiersTest.java
+++ b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/ModifiersTest.java
@@ -170,8 +170,8 @@ public class ModifiersTest extends GeneratorTestMDRCompat {
// finally, find the correct body and rewrite it.
ClassTree clazz = (ClassTree) workingCopy.getCompilationUnit().getTypeDecls().get(0);
ModifiersTree mods = clazz.getModifiers();
- Set<Modifier> s = new HashSet<Modifier>(mods.getFlags());
- s.add(Modifier.ABSTRACT);
+ Set<Modifier> s = EnumSet.of(Modifier.ABSTRACT);
+ s.addAll(mods.getFlags());
workingCopy.rewrite(mods, make.Modifiers(s));
}
@@ -687,8 +687,8 @@ public class ModifiersTest extends GeneratorTestMDRCompat {
TreeMaker make = workingCopy.getTreeMaker();
ClassTree clazz = (ClassTree) workingCopy.getCompilationUnit().getTypeDecls().get(0);
ModifiersTree mods = clazz.getModifiers();
- Set<Modifier> flags = new HashSet<Modifier>(mods.getFlags());
- flags.add(Modifier.ABSTRACT);
+ Set<Modifier> flags = EnumSet.of(Modifier.ABSTRACT);
+ flags.addAll(mods.getFlags());
workingCopy.rewrite(mods, make.Modifiers(flags, mods.getAnnotations()));
}
@@ -1017,7 +1017,8 @@ public class ModifiersTest extends GeneratorTestMDRCompat {
TreeMaker make = workingCopy.getTreeMaker();
ClassTree clazz = (ClassTree) workingCopy.getCompilationUnit().getTypeDecls().get(0);
ModifiersTree mods = clazz.getModifiers();
- Set<Modifier> flags = new HashSet<Modifier>(mods.getFlags());
+ Set<Modifier> flags = EnumSet.noneOf(Modifier.class);
+ flags.addAll(mods.getFlags());
flags.remove(Modifier.PUBLIC);
ModifiersTree modified = make.Modifiers(flags);
diff --git a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/TutorialTest.java b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/TutorialTest.java
index f8b48ae5a0..dc06281c7c 100644
--- a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/TutorialTest.java
+++ b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/TutorialTest.java
@@ -28,7 +28,6 @@ import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.List;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeKind;
diff --git a/java/junit.ant/src/org/netbeans/modules/junit/ant/JUnitOutputReader.java b/java/junit.ant/src/org/netbeans/modules/junit/ant/JUnitOutputReader.java
index 72521877fa..b5c512d891 100644
--- a/java/junit.ant/src/org/netbeans/modules/junit/ant/JUnitOutputReader.java
+++ b/java/junit.ant/src/org/netbeans/modules/junit/ant/JUnitOutputReader.java
@@ -331,7 +331,7 @@ final class JUnitOutputReader {
}
}
- if (state.equals(State.TESTCASE_ISSUE) && !msg.equals("")){
+ if (state == State.TESTCASE_ISSUE && !msg.equals("")){
addStackTraceLine(testcase, msg, true);
}
break;
diff --git a/java/junit/src/org/netbeans/modules/junit/JUnit4TestGenerator.java b/java/junit/src/org/netbeans/modules/junit/JUnit4TestGenerator.java
index b53c5e034d..a9804ca577 100644
--- a/java/junit/src/org/netbeans/modules/junit/JUnit4TestGenerator.java
+++ b/java/junit/src/org/netbeans/modules/junit/JUnit4TestGenerator.java
@@ -464,7 +464,12 @@ final class JUnit4TestGenerator extends AbstractTestGenerator {
boolean flagsModified = false;
Set<Modifier> currFlags = modifiers.getFlags();
- Set<Modifier> flags = currFlags.isEmpty() ? EnumSet.noneOf(Modifier.class) : EnumSet.copyOf(currFlags);
+ Set<Modifier> flags = EnumSet.noneOf(Modifier.class);
+
+ if (!currFlags.isEmpty()) {
+ flags.addAll(currFlags);
+ }
+
flagsModified |= flags.remove(PRIVATE);
flagsModified |= flags.remove(PROTECTED);
flagsModified |= flags.add(PUBLIC);
diff --git a/java/maven.hints/src/org/netbeans/modules/maven/hints/errors/SearchClassDependencyInRepo.java b/java/maven.hints/src/org/netbeans/modules/maven/hints/errors/SearchClassDependencyInRepo.java
index ac39a29fde..74abed62c1 100644
--- a/java/maven.hints/src/org/netbeans/modules/maven/hints/errors/SearchClassDependencyInRepo.java
+++ b/java/maven.hints/src/org/netbeans/modules/maven/hints/errors/SearchClassDependencyInRepo.java
@@ -225,7 +225,7 @@ public class SearchClassDependencyInRepo implements ErrorRule<Void> {
NewArrayTree arrayTree = (NewArrayTree) initializer;
Tree type = arrayTree.getType();
if (type != null) {
- if (type.getKind().equals(Kind.IDENTIFIER)) {
+ if (type.getKind() == Kind.IDENTIFIER) {
itName = ((IdentifierTree) type).getName();
}
}
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/RefactoringUtils.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/RefactoringUtils.java
index b9666e7c49..aff4e5dfc7 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/RefactoringUtils.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/RefactoringUtils.java
@@ -526,7 +526,7 @@ public class RefactoringUtils {
public static boolean elementExistsIn(TypeElement target, Element member, CompilationInfo info) {
for (Element currentMember : target.getEnclosedElements()) {
- if (currentMember.getKind().equals(member.getKind())
+ if (currentMember.getKind() == member.getKind()
&& currentMember.getSimpleName().equals(member.getSimpleName())) {
if (currentMember.getKind() == ElementKind.METHOD) {
ExecutableElement exMethod = (ExecutableElement) currentMember;
@@ -943,8 +943,8 @@ public class RefactoringUtils {
if (oldMods.getFlags().contains(Modifier.ABSTRACT)) {
return oldMods;
}
- Set<Modifier> flags = new HashSet<Modifier>(oldMods.getFlags());
- flags.add(Modifier.ABSTRACT);
+ Set<Modifier> flags = EnumSet.of(Modifier.ABSTRACT);
+ flags.addAll(oldMods.getFlags());
flags.remove(Modifier.FINAL);
return make.Modifiers(flags, oldMods.getAnnotations());
}
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/api/EncapsulateFieldRefactoring.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/api/EncapsulateFieldRefactoring.java
index 30e6d1df99..41db8425b3 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/api/EncapsulateFieldRefactoring.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/api/EncapsulateFieldRefactoring.java
@@ -19,6 +19,7 @@
package org.netbeans.modules.refactoring.java.api;
import java.util.Collections;
+import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import javax.lang.model.element.Modifier;
@@ -114,8 +115,9 @@ public final class EncapsulateFieldRefactoring extends AbstractRefactoring {
* @param methodModifiers New value of methodModifiers
*/
public void setMethodModifiers(Set<Modifier> methodModifiers) {
- this.methodModifiers = Collections.unmodifiableSet(
- new HashSet<Modifier>(methodModifiers));
+ EnumSet<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
+ modifiers.addAll(methodModifiers);
+ this.methodModifiers = Collections.unmodifiableSet(modifiers);
}
/**
@@ -123,8 +125,9 @@ public final class EncapsulateFieldRefactoring extends AbstractRefactoring {
* @param fieldModifiers New value of fieldModifiers
*/
public void setFieldModifiers(Set<Modifier> fieldModifiers) {
- this.fieldModifiers = Collections.unmodifiableSet(
- new HashSet<Modifier>(fieldModifiers));
+ EnumSet<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
+ modifiers.addAll(fieldModifiers);
+ this.fieldModifiers = Collections.unmodifiableSet(modifiers);
}
/**
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ChangeParametersPlugin.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ChangeParametersPlugin.java
index a0f78b2251..217a290840 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ChangeParametersPlugin.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ChangeParametersPlugin.java
@@ -412,23 +412,23 @@ public class ChangeParametersPlugin extends JavaRefactoringPlugin {
*/
switch (exType.getKind()) {
case DOUBLE:
- if(paramType.getKind().equals(TypeKind.FLOAT)) {
+ if(paramType.getKind() == TypeKind.FLOAT) {
break;
}
case FLOAT:
- if(paramType.getKind().equals(TypeKind.LONG)) {
+ if(paramType.getKind() == TypeKind.LONG) {
break;
}
case LONG:
- if(paramType.getKind().equals(TypeKind.INT)) {
+ if(paramType.getKind() == TypeKind.INT) {
break;
}
case INT:
- if(paramType.getKind().equals(TypeKind.SHORT)) {
+ if(paramType.getKind() == TypeKind.SHORT) {
break;
}
case SHORT:
- if(paramType.getKind().equals(TypeKind.BYTE)) {
+ if(paramType.getKind() == TypeKind.BYTE) {
break;
}
case BYTE:
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ChangeParamsTransformer.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ChangeParamsTransformer.java
index cd8e624bbd..921f0e9259 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ChangeParamsTransformer.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ChangeParamsTransformer.java
@@ -200,7 +200,7 @@ public class ChangeParamsTransformer extends RefactoringVisitor {
List<? extends Tree> members = node.getMembers();
for (int i = 0; i < members.size(); i++) {
Tree tree = members.get(i);
- if (tree.getKind().equals(Kind.METHOD)) {
+ if (tree.getKind() == Kind.METHOD) {
ExecutableElement element = (ExecutableElement) workingCopy.getTrees().getElement(new TreePath(getCurrentPath(), tree));
if (p.equals(element)) {
List<ExpressionTree> paramList = getNewCompatibleArguments(((MethodTree)tree).getParameters());
@@ -627,7 +627,8 @@ public class ChangeParamsTransformer extends RefactoringVisitor {
}
// apply new access modifiers if necessary
- Set<Modifier> modifiers = new HashSet<Modifier>(current.getModifiers().getFlags());
+ Set<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
+ modifiers.addAll(current.getModifiers().getFlags());
if (newModifiers!=null && !el.getEnclosingElement().getKind().isInterface()) {
modifiers.removeAll(ALL_ACCESS_MODIFIERS);
modifiers.addAll(newModifiers);
@@ -720,8 +721,8 @@ public class ChangeParamsTransformer extends RefactoringVisitor {
Tree returnType = nju.getReturnType();
if (this.returnType == null) {
boolean hasReturn = false;
- if (returnType != null && returnType.getKind().equals(Tree.Kind.PRIMITIVE_TYPE)) {
- if (!((PrimitiveTypeTree) returnType).getPrimitiveTypeKind().equals(TypeKind.VOID)) {
+ if (returnType != null && returnType.getKind() == Tree.Kind.PRIMITIVE_TYPE) {
+ if (((PrimitiveTypeTree) returnType).getPrimitiveTypeKind() != TypeKind.VOID) {
hasReturn = true;
}
}
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/EncapsulateFieldRefactoringPlugin.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/EncapsulateFieldRefactoringPlugin.java
index f9018cfa7f..16fa6e3214 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/EncapsulateFieldRefactoringPlugin.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/EncapsulateFieldRefactoringPlugin.java
@@ -257,13 +257,16 @@ public final class EncapsulateFieldRefactoringPlugin extends JavaRefactoringPlug
if (mods.isEmpty()) {
return null;
}
- Set<Modifier> s = new HashSet<Modifier>(mods);
+ Set<Modifier> s = EnumSet.noneOf(Modifier.class);
+ s.addAll(mods);
s.retainAll(accessModifiers);
return s.isEmpty() ? null : s.iterator().next();
}
private static Set<Modifier> replaceAccessibility(Modifier currentAccess, Modifier futureAccess, Element elm) {
- Set<Modifier> mods = new HashSet<Modifier>(elm.getModifiers());
+ Set<Modifier> mods = EnumSet.noneOf(Modifier.class);
+ mods.addAll(elm.getModifiers());
+
if (currentAccess != null) {
mods.remove(currentAccess);
}
@@ -971,7 +974,9 @@ public final class EncapsulateFieldRefactoringPlugin extends JavaRefactoringPlug
setterBody.append("}");//NOI18N
- Set<Modifier> mods = new HashSet<Modifier>(useModifiers);
+ Set<Modifier> mods = EnumSet.noneOf(Modifier.class);
+ mods.addAll(useModifiers);
+
if (staticMod) {
mods.add(Modifier.STATIC);
}
@@ -1092,7 +1097,8 @@ public final class EncapsulateFieldRefactoringPlugin extends JavaRefactoringPlug
&& desc.refactoring.getSetterName() != null) {
// remove final flag in case user wants to create setter
ModifiersTree mot = newModTree == null ? node.getModifiers() : newModTree;
- Set<Modifier> flags = new HashSet<Modifier>(mot.getFlags());
+ Set<Modifier> flags = EnumSet.noneOf(Modifier.class);
+ flags.addAll(mot.getFlags());
flags.remove(Modifier.FINAL);
newModTree = make.Modifiers(flags, mot.getAnnotations());
}
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InlineRefactoringPlugin.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InlineRefactoringPlugin.java
index 9dbea15f3e..489d60517d 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InlineRefactoringPlugin.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InlineRefactoringPlugin.java
@@ -212,7 +212,7 @@ public class InlineRefactoringPlugin extends JavaRefactoringPlugin {
case FIELD:
case LOCAL_VARIABLE:
Tree tree = javac.getTrees().getTree(element);
- if (!tree.getKind().equals(Tree.Kind.VARIABLE)) {
+ if (tree.getKind() != Tree.Kind.VARIABLE) {
preCheckProblem = createProblem(preCheckProblem, true, ERR_InlineWrongType(element.getKind().toString())); //NOI18N
}
VariableTree variableTree = (VariableTree) tree;
@@ -247,7 +247,7 @@ public class InlineRefactoringPlugin extends JavaRefactoringPlugin {
// Possible change
ExpressionTree initializer = variableTree.getInitializer();
int skipFirstMethodInvocation = 0;
- if (initializer.getKind().equals(Tree.Kind.METHOD_INVOCATION)) {
+ if (initializer.getKind() == Tree.Kind.METHOD_INVOCATION) {
skipFirstMethodInvocation++;
}
ErrorAwareTreeScanner<Boolean, Boolean> scanner = new UnsafeTreeScanner(skipFirstMethodInvocation);
@@ -294,8 +294,8 @@ public class InlineRefactoringPlugin extends JavaRefactoringPlugin {
MethodTree methodTree = (MethodTree) methodPath.getLeaf();
Tree returnType = methodTree.getReturnType();
boolean hasReturn = true;
- if (returnType.getKind().equals(Tree.Kind.PRIMITIVE_TYPE)) {
- if (((PrimitiveTypeTree) returnType).getPrimitiveTypeKind().equals(TypeKind.VOID)) {
+ if (returnType.getKind() == Tree.Kind.PRIMITIVE_TYPE) {
+ if (((PrimitiveTypeTree) returnType).getPrimitiveTypeKind() == TypeKind.VOID) {
hasReturn = false;
}
}
@@ -348,9 +348,9 @@ public class InlineRefactoringPlugin extends JavaRefactoringPlugin {
if (element.equals(asElement)) {
isRecursive = true;
} else if (asElement != null) {
- if (asElement.getKind().equals(ElementKind.FIELD)
- || asElement.getKind().equals(ElementKind.METHOD)
- || asElement.getKind().equals(ElementKind.CLASS)) {
+ if (asElement.getKind() == ElementKind.FIELD
+ || asElement.getKind() == ElementKind.METHOD
+ || asElement.getKind() == ElementKind.CLASS) {
Modifier mod = getAccessSpecifier(asElement.getModifiers());
// accessorRightProblem = hasAccessorRightProblem(mod);
qualIdentProblem = hasQualIdentProblem(element, asElement);
@@ -364,8 +364,7 @@ public class InlineRefactoringPlugin extends JavaRefactoringPlugin {
ElementUtilities elementUtilities = workingCopy.getElementUtilities();
TypeElement bodyEnclosingTypeElement = elementUtilities.enclosingTypeElement(p);
TypeElement invocationEnclosingTypeElement = elementUtilities.enclosingTypeElement(asElement);
- if (bodyEnclosingTypeElement.equals(invocationEnclosingTypeElement)
- && (access == null || !access.equals(Modifier.PRIVATE))) {
+ if (bodyEnclosingTypeElement.equals(invocationEnclosingTypeElement) && access != Modifier.PRIVATE) {
result = true;
}
return result;
@@ -415,9 +414,9 @@ public class InlineRefactoringPlugin extends JavaRefactoringPlugin {
Element asElement = asElement(new TreePath(p, node));
if (!node.getName().contentEquals("this") &&
asElement != null &&
- (asElement.getKind().equals(ElementKind.FIELD)
- || asElement.getKind().equals(ElementKind.METHOD)
- || asElement.getKind().equals(ElementKind.CLASS))) {
+ (asElement.getKind() == ElementKind.FIELD
+ || asElement.getKind() == ElementKind.METHOD
+ || asElement.getKind() == ElementKind.CLASS)) {
Modifier mod = getAccessSpecifier(asElement.getModifiers());
// accessorRightProblem = hasAccessorRightProblem(mod);
qualIdentProblem = hasQualIdentProblem(element, asElement);
@@ -428,9 +427,9 @@ public class InlineRefactoringPlugin extends JavaRefactoringPlugin {
@Override
public Tree visitNewClass(NewClassTree node, TreePath p) {
Element asElement = asElement(new TreePath(p, node));
- if (asElement != null && (asElement.getKind().equals(ElementKind.FIELD)
- || asElement.getKind().equals(ElementKind.METHOD)
- || asElement.getKind().equals(ElementKind.CLASS))) {
+ if (asElement != null && (asElement.getKind() == ElementKind.FIELD
+ || asElement.getKind() == ElementKind.METHOD
+ || asElement.getKind() == ElementKind.CLASS)) {
Modifier mod = getAccessSpecifier(asElement.getModifiers());
// accessorRightProblem = hasAccessorRightProblem(mod);
qualIdentProblem = hasQualIdentProblem(element, asElement);
@@ -441,9 +440,9 @@ public class InlineRefactoringPlugin extends JavaRefactoringPlugin {
@Override
public Tree visitMemberSelect(MemberSelectTree node, TreePath p) {
Element asElement = asElement(new TreePath(p, node));
- if (asElement != null && (asElement.getKind().equals(ElementKind.FIELD)
- || asElement.getKind().equals(ElementKind.METHOD)
- || asElement.getKind().equals(ElementKind.CLASS))) {
+ if (asElement != null && (asElement.getKind() == ElementKind.FIELD
+ || asElement.getKind() == ElementKind.METHOD
+ || asElement.getKind() == ElementKind.CLASS)) {
Modifier mod = getAccessSpecifier(asElement.getModifiers());
// accessorRightProblem = hasAccessorRightProblem(mod);
qualIdentProblem = hasQualIdentProblem(element, asElement);
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InnerToOuterTransformer.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InnerToOuterTransformer.java
index 33e993f174..226e6ae0b4 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InnerToOuterTransformer.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InnerToOuterTransformer.java
@@ -594,7 +594,8 @@ public class InnerToOuterTransformer extends RefactoringVisitor {
AssignmentTree assign = make.Assignment(make.Identifier("this."+referenceName), make.Identifier(referenceName)); // NOI18N
BlockTree block = make.insertBlockStatement(newConstructor.getBody(), 1, make.ExpressionStatement(assign));
- Set<Modifier> modifiers = new HashSet(newConstructor.getModifiers().getFlags());
+ Set<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
+ modifiers.addAll(newConstructor.getModifiers().getFlags());
modifiers.remove(Modifier.PRIVATE);
newConstructor = make.Constructor(
make.Modifiers(modifiers,newConstructor.getModifiers().getAnnotations()),
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/IntroduceLocalExtensionTransformer.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/IntroduceLocalExtensionTransformer.java
index b54f98309b..d2492b4830 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/IntroduceLocalExtensionTransformer.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/IntroduceLocalExtensionTransformer.java
@@ -134,7 +134,8 @@ public class IntroduceLocalExtensionTransformer extends RefactoringVisitor {
// create new class
Tree newClassTree;
- final Set<Modifier> modifiers = new HashSet(source.getModifiers());
+ final Set<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
+ modifiers.addAll(source.getModifiers());
modifiers.remove(Modifier.ABSTRACT);
modifiers.remove(Modifier.STATIC);
if(noInterface) {
@@ -211,7 +212,9 @@ public class IntroduceLocalExtensionTransformer extends RefactoringVisitor {
setterBody.append(longName).append(" = ").append(parName).append(";"); //NOI18N
setterBody.append("}");//NOI18N
- Set<Modifier> mods = new HashSet<>(useModifiers);
+ Set<Modifier> mods = EnumSet.noneOf(Modifier.class);
+ mods.addAll(useModifiers);
+
if (staticMod) {
mods.add(Modifier.STATIC);
}
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java
index acb3624d3e..c6a917cef7 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java
@@ -251,7 +251,7 @@ public class JavaWhereUsedQueryPlugin extends JavaRefactoringPlugin implements F
}
} else if (el.getKind() == ElementKind.CONSTRUCTOR) {
sourceSet.addAll(idx.getResources(ElementHandle.create((TypeElement) el.getEnclosingElement()), EnumSet.of(ClassIndex.SearchKind.TYPE_REFERENCES, ClassIndex.SearchKind.IMPLEMENTORS), searchScopeType, resourceType));
- } else if((el.getKind().equals(ElementKind.LOCAL_VARIABLE) || el.getKind().equals(ElementKind.PARAMETER))
+ } else if((el.getKind() == ElementKind.LOCAL_VARIABLE || el.getKind() == ElementKind.PARAMETER)
|| el.getModifiers().contains(Modifier.PRIVATE)) {
sourceSet.add(file);
}
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveMembersRefactoringPlugin.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveMembersRefactoringPlugin.java
index a98bf1d9e6..cb8627ceb1 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveMembersRefactoringPlugin.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveMembersRefactoringPlugin.java
@@ -396,23 +396,23 @@ public class MoveMembersRefactoringPlugin extends JavaRefactoringPlugin {
*/
switch (exType.getKind()) {
case DOUBLE:
- if (paramType.getKind().equals(TypeKind.FLOAT)) {
+ if (paramType.getKind() ==TypeKind.FLOAT) {
break;
}
case FLOAT:
- if (paramType.getKind().equals(TypeKind.LONG)) {
+ if (paramType.getKind() == TypeKind.LONG) {
break;
}
case LONG:
- if (paramType.getKind().equals(TypeKind.INT)) {
+ if (paramType.getKind() == TypeKind.INT) {
break;
}
case INT:
- if (paramType.getKind().equals(TypeKind.SHORT)) {
+ if (paramType.getKind() == TypeKind.SHORT) {
break;
}
case SHORT:
- if (paramType.getKind().equals(TypeKind.BYTE)) {
+ if (paramType.getKind() == TypeKind.BYTE) {
break;
}
case BYTE:
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveMembersTransformer.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveMembersTransformer.java
index 8b8472ae3c..b62e5bd9e0 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveMembersTransformer.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveMembersTransformer.java
@@ -908,8 +908,8 @@ public class MoveMembersTransformer extends RefactoringVisitor {
builder.append("\n"); // NOI18N
}
boolean hasReturn = false;
- if (returnType != null && returnType.getKind().equals(Tree.Kind.PRIMITIVE_TYPE)) {
- if (!((PrimitiveTypeTree) returnType).getPrimitiveTypeKind().equals(TypeKind.VOID)) {
+ if (returnType != null && returnType.getKind() == Tree.Kind.PRIMITIVE_TYPE) {
+ if (((PrimitiveTypeTree) returnType).getPrimitiveTypeKind() != TypeKind.VOID) {
hasReturn = true;
}
}
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/OperatorPrecedence.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/OperatorPrecedence.java
index c1b1a7be8b..c912e3ec8f 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/OperatorPrecedence.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/OperatorPrecedence.java
@@ -156,15 +156,15 @@ public class OperatorPrecedence {
case ASSIGNMENT:
return false;
}
- if(parent.getKind().equals(Tree.Kind.PLUS) && expression.getKind().equals(Tree.Kind.PLUS)) {
- if (((BinaryTree) expression).getLeftOperand().getKind().equals(Tree.Kind.STRING_LITERAL)
- || ((BinaryTree) parent).getLeftOperand().getKind().equals(Tree.Kind.STRING_LITERAL)
- || ((BinaryTree) expression).getRightOperand().getKind().equals(Tree.Kind.STRING_LITERAL)
- || ((BinaryTree) parent).getRightOperand().getKind().equals(Tree.Kind.STRING_LITERAL)) {
+ if(parent.getKind() == Tree.Kind.PLUS && expression.getKind() == Tree.Kind.PLUS) {
+ if (((BinaryTree) expression).getLeftOperand().getKind() == Tree.Kind.STRING_LITERAL
+ || ((BinaryTree) parent).getLeftOperand().getKind() == Tree.Kind.STRING_LITERAL
+ || ((BinaryTree) expression).getRightOperand().getKind() == Tree.Kind.STRING_LITERAL
+ || ((BinaryTree) parent).getRightOperand().getKind() ==Tree.Kind.STRING_LITERAL) {
return true;
}
}
- if(parent.getKind().equals(Tree.Kind.MINUS)) {
+ if(parent.getKind() == Tree.Kind.MINUS) {
ExpressionTree rightOperand = ((BinaryTree) parent).getRightOperand();
Element rightElement = trees.getElement(trees.getPath(cut, rightOperand));
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/PushDownTransformer.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/PushDownTransformer.java
index 0e9b4b813d..85e942f373 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/PushDownTransformer.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/PushDownTransformer.java
@@ -347,15 +347,16 @@ public class PushDownTransformer extends RefactoringVisitor {
if (!classIsAbstract) {
classIsAbstract = true;
- Set<Modifier> mod = new HashSet<>(njuClass.getModifiers().getFlags());
- mod.add(Modifier.ABSTRACT);
+ Set<Modifier> mod = EnumSet.of(Modifier.ABSTRACT);
+ mod.addAll(njuClass.getModifiers().getFlags());
ModifiersTree modifiers = make.Modifiers(mod);
translateQueue.getLast().put(njuClass.getModifiers(), modifiers);
}
MethodTree method = (MethodTree) t;
- Set<Modifier> mod = new HashSet<>(method.getModifiers().getFlags());
- mod.add(Modifier.ABSTRACT);
+ Set<Modifier> mod = EnumSet.of(Modifier.ABSTRACT);
+ mod.addAll(method.getModifiers().getFlags());
+
if(mod.contains(Modifier.PRIVATE)) {
mod.remove(Modifier.PRIVATE);
mod.add(Modifier.PROTECTED);
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/RenameTransformer.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/RenameTransformer.java
index 35477b58a2..a27dd29726 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/RenameTransformer.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/RenameTransformer.java
@@ -273,7 +273,7 @@ public class RenameTransformer extends RefactoringVisitor {
}
}
}
- if (elementToFind!=null && elementToFind.getKind().isField() || elementToFind.getKind().equals(ElementKind.METHOD)) {
+ if (elementToFind!=null && elementToFind.getKind().isField() || elementToFind.getKind() == ElementKind.METHOD) {
Scope scope = workingCopy.getTrees().getScope(elementPath);
TypeElement enclosingTypeElement = scope.getEnclosingClass();
TypeMirror superclass = enclosingTypeElement==null ? null:enclosingTypeElement.getSuperclass();
@@ -396,7 +396,7 @@ public class RenameTransformer extends RefactoringVisitor {
@Override
public boolean accept(Element element, TypeMirror type) {
- return !element.equals(p) && element.getKind().equals(p.getKind()) && element.getSimpleName().contentEquals(newName);
+ return !element.equals(p) && element.getKind() == p.getKind() && element.getSimpleName().contentEquals(newName);
}
});
}
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/SafeDeleteRefactoringPlugin.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/SafeDeleteRefactoringPlugin.java
index 026f331fce..345dad4f94 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/SafeDeleteRefactoringPlugin.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/SafeDeleteRefactoringPlugin.java
@@ -131,7 +131,7 @@ public class SafeDeleteRefactoringPlugin extends JavaRefactoringPlugin {
q.getContext().add(refactoring);
q.getContext().add(this);
- if(Tree.Kind.METHOD.equals(handle.getKind())) {
+ if(Tree.Kind.METHOD == handle.getKind()) {
JavaSource source;
source = JavaSource.forFileObject(handle.getFileObject());
try {
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/UseSuperTypeRefactoringPlugin.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/UseSuperTypeRefactoringPlugin.java
index ff48db4cb7..1ffd44d995 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/UseSuperTypeRefactoringPlugin.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/UseSuperTypeRefactoringPlugin.java
@@ -244,8 +244,8 @@ public class UseSuperTypeRefactoringPlugin extends JavaRefactoringPlugin {
Element expreElem = asElement(memSelTree.getExpression());
//If a static member was referenced using the object instead
//of the class, don't handle it here.
- if(expreElem == null || ! (ElementKind.CLASS.equals(expreElem.getKind()) ||
- ElementKind.INTERFACE.equals(expreElem.getKind()))){
+ if(expreElem == null || ! (ElementKind.CLASS == expreElem.getKind() ||
+ ElementKind.INTERFACE == expreElem.getKind())) {
return super.visitMemberSelect(memSelTree, elemToFind);
}
TypeElement type = (TypeElement) expreElem;
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/VarUsageVisitor.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/VarUsageVisitor.java
index 48a5369191..08a0828c27 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/VarUsageVisitor.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/VarUsageVisitor.java
@@ -117,7 +117,7 @@ class VarUsageVisitor extends RefactoringVisitor {
VariableElement parameter = method.getParameters().get(i);
Types types = workingCopy.getTypes();
TypeMirror parameterType = parameter.asType();
- if(parameterType.getKind().equals(TypeKind.TYPEVAR)) {
+ if(parameterType.getKind() == TypeKind.TYPEVAR) {
TypeVariable typeVariable = (TypeVariable) parameterType;
TypeMirror upperBound = typeVariable.getUpperBound();
TypeMirror lowerBound = typeVariable.getLowerBound();
@@ -207,7 +207,7 @@ class VarUsageVisitor extends RefactoringVisitor {
private boolean isMemberAvailable(TypeElement subTypeElement, Element methodElement,
TypeElement superTypeElement) {
ElementKind memberKind = methodElement.getKind();
- if(ElementKind.METHOD.equals(memberKind)){
+ if(ElementKind.METHOD == memberKind) {
return isMethodAvailable(subTypeElement, (ExecutableElement)methodElement,
superTypeElement);
}else{
@@ -220,7 +220,7 @@ class VarUsageVisitor extends RefactoringVisitor {
Elements elements = workingCopy.getElements();
List<? extends Element> memberElements = elements.getAllMembers(superTypeElement);
for (Element elem : memberElements) {
- if(ElementKind.METHOD.equals(elem.getKind())){
+ if(ElementKind.METHOD == elem.getKind()) {
if(execElem.getModifiers().contains(Modifier.STATIC) && elements.hides(execElem, elem)){
return true;
}else{
@@ -276,7 +276,7 @@ class VarUsageVisitor extends RefactoringVisitor {
}
private boolean isDeclaredType(TypeMirror type) {
- return TypeKind.DECLARED.equals(type.getKind());
+ return TypeKind.DECLARED == type.getKind();
}
}
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ChangeParametersPanel.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ChangeParametersPanel.java
index 8b1a21278f..2669bc1240 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ChangeParametersPanel.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ChangeParametersPanel.java
@@ -269,7 +269,7 @@ public class ChangeParametersPanel extends JPanel implements CustomRefactoringPa
}
protected Set<Modifier> getModifier() {
- Set<Modifier> modifiers = new HashSet<Modifier>(1);
+ Set<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
// modifiers.remove(Modifier.PRIVATE);
// modifiers.remove(Modifier.PUBLIC);
// modifiers.remove(Modifier.PROTECTED);
@@ -853,7 +853,7 @@ public class ChangeParametersPanel extends JPanel implements CustomRefactoringPa
}
}
- private Set<Modifier> modifiers = new HashSet<Modifier>();
+ private Set<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
private List<String> typeParameters = new LinkedList<String>();
private Modifier currentModifier = null;
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/RenamePanel.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/RenamePanel.java
index 7deb97f5a4..6c9758ec02 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/RenamePanel.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/RenamePanel.java
@@ -213,7 +213,7 @@ public class RenamePanel extends JPanel implements CustomRefactoringPanel {
String methodName = RefactoringUtils.getTestMethodName(methodElement.getSimpleName().toString());
for (ExecutableElement testClassMethod : testClassMethods) {
if (testClassMethod.getSimpleName().contentEquals(methodName)
- && testClassMethod.getReturnType().getKind().equals(TypeKind.VOID)) { // test method should at least be void
+ && testClassMethod.getReturnType().getKind() == TypeKind.VOID) { // test method should at least be void
return true;
}
}
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/WhereUsedPanel.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/WhereUsedPanel.java
index 3332292981..8af1d6eff2 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/WhereUsedPanel.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/WhereUsedPanel.java
@@ -145,7 +145,7 @@ public class WhereUsedPanel extends JPanel implements CustomRefactoringPanel {
final Element element = WhereUsedPanel.this.element.resolveElement(info);
panel.initialize(element, info);
- if((element.getKind().equals(ElementKind.LOCAL_VARIABLE) || element.getKind().equals(ElementKind.PARAMETER))
+ if((element.getKind() == ElementKind.LOCAL_VARIABLE || element.getKind() == ElementKind.PARAMETER)
|| element.getModifiers().contains(Modifier.PRIVATE)) {
enableScope = false;
} else {
diff --git a/java/spi.debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/apiregistry/DebuggerProcessor.java b/java/spi.debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/apiregistry/DebuggerProcessor.java
index 9b2ad0920a..4fa49ec3d1 100644
--- a/java/spi.debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/apiregistry/DebuggerProcessor.java
+++ b/java/spi.debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/apiregistry/DebuggerProcessor.java
@@ -102,7 +102,7 @@ public class DebuggerProcessor extends LayerGeneratingProcessor {
case CLASS: {
TypeElement te = (TypeElement) e;
TypeMirror superType = te.getSuperclass();
- if (superType.getKind().equals(TypeKind.NONE)) {
+ if (superType.getKind() == TypeKind.NONE) {
return false;
} else {
e = ((DeclaredType) superType).asElement();
@@ -116,7 +116,7 @@ public class DebuggerProcessor extends LayerGeneratingProcessor {
}
case METHOD: {
TypeMirror retType = ((ExecutableElement) e).getReturnType();
- if (retType.getKind().equals(TypeKind.NONE)) {
+ if (retType.getKind() == TypeKind.NONE) {
return false;
} else {
e = ((DeclaredType) retType).asElement();
diff --git a/java/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/support/JavaSourceHelper.java b/java/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/support/JavaSourceHelper.java
index ef60ec7e6c..f943357243 100644
--- a/java/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/support/JavaSourceHelper.java
+++ b/java/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/support/JavaSourceHelper.java
@@ -43,6 +43,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.Arrays;
+import java.util.EnumSet;
import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -608,11 +610,8 @@ public class JavaSourceHelper {
private static ModifiersTree createModifiersTree(WorkingCopy copy, Modifier[] modifiers, String[] annotations, Object[] annotationAttrs) {
TreeMaker maker = copy.getTreeMaker();
- Set<Modifier> modifierSet = new HashSet<Modifier>();
-
- for (Modifier modifier : modifiers) {
- modifierSet.add(modifier);
- }
+ Set<Modifier> modifierSet = EnumSet.noneOf(Modifier.class);
+ modifierSet.addAll(Arrays.asList(modifiers));
List<AnnotationTree> annotationTrees = createAnnotationTrees(copy, annotations, annotationAttrs);
diff --git a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/actions/ControllerGenerator.java b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/actions/ControllerGenerator.java
index fb0875985a..aadca49ad6 100644
--- a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/actions/ControllerGenerator.java
+++ b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/actions/ControllerGenerator.java
@@ -371,7 +371,7 @@ public class ControllerGenerator implements Task<WorkingCopy> {
// @FXML private void {handlerName}({eventType} event);
MethodTree handler = mk.Method(
- mk.Modifiers(Collections.singleton(Modifier.PRIVATE),
+ mk.Modifiers(Collections.singleton(Modifier.PRIVATE),
Collections.singletonList(fxmlAnnotationTree)
),
handlerName,
@@ -379,7 +379,7 @@ public class ControllerGenerator implements Task<WorkingCopy> {
Collections.<TypeParameterTree>emptyList(),
Collections.singletonList(
mk.Variable(
- mk.Modifiers(Collections.<Modifier>emptySet()),
+ mk.Modifiers(Collections.<Modifier>emptySet()),
"event", mk.Type(eventType.asType()), null)
),
Collections.<ExpressionTree>emptyList(),
@@ -543,7 +543,7 @@ public class ControllerGenerator implements Task<WorkingCopy> {
TreeMaker make = wcopy.getTreeMaker();
VariableTree newVar = make.Variable(
- make.Modifiers(Collections.singleton(Modifier.PRIVATE),
+ make.Modifiers(Collections.singleton(Modifier.PRIVATE),
Collections.singletonList(fxmlAnnotationTree)
),
name, typeTree, null);
diff --git a/javafx/javafx2.editor/test/unit/src/org/netbeans/modules/javafx2/editor/actions/ControllerGeneratorTest.java b/javafx/javafx2.editor/test/unit/src/org/netbeans/modules/javafx2/editor/actions/ControllerGeneratorTest.java
index 9ba4ce5878..bf7ca6f109 100644
--- a/javafx/javafx2.editor/test/unit/src/org/netbeans/modules/javafx2/editor/actions/ControllerGeneratorTest.java
+++ b/javafx/javafx2.editor/test/unit/src/org/netbeans/modules/javafx2/editor/actions/ControllerGeneratorTest.java
@@ -84,7 +84,7 @@ public class ControllerGeneratorTest extends FXMLCompletionTestBase {
public void run(WorkingCopy wcp) throws Exception {
wcp.toPhase(JavaSource.Phase.RESOLVED);
ClassTree clazz =wcp.getTreeMaker().Class(
- wcp.getTreeMaker().Modifiers(Collections.<Modifier>emptySet()),
+ wcp.getTreeMaker().Modifiers(Collections.<Modifier>emptySet()),
"FieldsWithTypeParams2", Collections.<TypeParameterTree>emptyList(), null, Collections.<Tree>emptyList(),
Collections.<Tree>emptyList());
@@ -106,7 +106,7 @@ public class ControllerGeneratorTest extends FXMLCompletionTestBase {
// add to the generated class a field, with the simplename derived from the class:
VariableTree v = wcp.getTreeMaker().Variable(
- wcp.getTreeMaker().Modifiers(Collections.<Modifier>emptySet()),
+ wcp.getTreeMaker().Modifiers(Collections.<Modifier>emptySet()),
"f" + e.getSimpleName(),
wcp.getTreeMaker().Type(erased), null);
diff --git a/nbi/engine/src/org/netbeans/installer/downloader/connector/MyProxy.java b/nbi/engine/src/org/netbeans/installer/downloader/connector/MyProxy.java
index 2309c557cd..c1a44884cf 100644
--- a/nbi/engine/src/org/netbeans/installer/downloader/connector/MyProxy.java
+++ b/nbi/engine/src/org/netbeans/installer/downloader/connector/MyProxy.java
@@ -71,7 +71,7 @@ public class MyProxy implements DomExternalizable {
public MyProxy(Proxy proxy, MyProxyType type) throws IllegalArgumentException {
this(proxy);
- if (!proxy.type().equals(type.getType())) {
+ if (proxy.type() != type.getType()) {
throw new IllegalArgumentException(ResourceUtils.getString(
MyProxy.class,
ERROR_TYPES_CONFLICT_KEY,
diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/launchers/LauncherResource.java b/nbi/engine/src/org/netbeans/installer/utils/system/launchers/LauncherResource.java
index 6ed28b03a3..6d30bc2fc7 100644
--- a/nbi/engine/src/org/netbeans/installer/utils/system/launchers/LauncherResource.java
+++ b/nbi/engine/src/org/netbeans/installer/utils/system/launchers/LauncherResource.java
@@ -75,9 +75,9 @@ public class LauncherResource {
}
}
public String getPathString(String path) {
- if(this.equals(Type.ABSOLUTE)) {
+ if(this == Type.ABSOLUTE) {
return path;
- } else if (this.equals(Type.BUNDLED)) {
+ } else if (this == Type.BUNDLED) {
return "$L{" + Type.BUNDLED.toString()+ "}/" +
new File(path).getName();
} else {
@@ -116,7 +116,7 @@ public class LauncherResource {
return type;
}
public boolean isBundled() {
- return type.equals(Type.BUNDLED);
+ return type == Type.BUNDLED;
}
public String getPath() {
return path;
diff --git a/php/php.phpunit/src/org/netbeans/modules/php/phpunit/coverage/PhpUnitCoverageLogParser.java b/php/php.phpunit/src/org/netbeans/modules/php/phpunit/coverage/PhpUnitCoverageLogParser.java
index 4d6e9edd95..c34fb83aac 100644
--- a/php/php.phpunit/src/org/netbeans/modules/php/phpunit/coverage/PhpUnitCoverageLogParser.java
+++ b/php/php.phpunit/src/org/netbeans/modules/php/phpunit/coverage/PhpUnitCoverageLogParser.java
@@ -107,7 +107,7 @@ public final class PhpUnitCoverageLogParser extends DefaultHandler {
}
private void processFile(Attributes attributes) {
- assert content.equals(Content.COVERAGE);
+ assert content == Content.COVERAGE;
assert file == null;
content = Content.FILE;
file = new FileImpl(getPath(attributes));
@@ -115,7 +115,7 @@ public final class PhpUnitCoverageLogParser extends DefaultHandler {
}
private void processClass(Attributes attributes) {
- assert content.equals(Content.FILE);
+ assert content == Content.FILE;
assert file != null;
assert clazz == null;
content = Content.CLASS;
@@ -182,14 +182,14 @@ public final class PhpUnitCoverageLogParser extends DefaultHandler {
}
private void endFile() {
- assert content.equals(Content.FILE);
+ assert content == Content.FILE;
assert file != null;
file = null;
content = Content.COVERAGE;
}
private void endClass() {
- assert content.equals(Content.CLASS);
+ assert content == Content.CLASS;
assert clazz != null;
clazz = null;
content = Content.FILE;
diff --git a/platform/api.intent/src/org/netbeans/modules/intent/OpenUriHandlerProcessor.java b/platform/api.intent/src/org/netbeans/modules/intent/OpenUriHandlerProcessor.java
index ef9bd7d1fd..66a38a2562 100644
--- a/platform/api.intent/src/org/netbeans/modules/intent/OpenUriHandlerProcessor.java
+++ b/platform/api.intent/src/org/netbeans/modules/intent/OpenUriHandlerProcessor.java
@@ -68,7 +68,7 @@ public class OpenUriHandlerProcessor extends LayerGeneratingProcessor {
TypeElement objectTypeElement = getTypeElement(Object.class);
TypeElement resultTypeElement = getTypeElement(Result.class);
- if (!ElementKind.METHOD.equals(e.getKind())) {
+ if (ElementKind.METHOD != e.getKind()) {
throw error(e, "The annotation can be applied only to" //NOI18N
+ " a method.");//NOI18N
}
diff --git a/platform/api.search/src/org/netbeans/modules/search/PatternSandbox.java b/platform/api.search/src/org/netbeans/modules/search/PatternSandbox.java
index eebd035e11..59c403a494 100644
--- a/platform/api.search/src/org/netbeans/modules/search/PatternSandbox.java
+++ b/platform/api.search/src/org/netbeans/modules/search/PatternSandbox.java
@@ -555,7 +555,7 @@ public abstract class PatternSandbox extends JPanel
* text, but are not in the JTextPane.
*/
private int countCRs(String text, int from, int to) {
- if (!LineEnding.CRLF.equals(lineEnding)) { //NOI18N
+ if (LineEnding.CRLF != lineEnding) { //NOI18N
return 0;
}
int count = 0;
diff --git a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/UnitCategoryTableModel.java b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/UnitCategoryTableModel.java
index 6af25e2f67..f3b536ef28 100644
--- a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/UnitCategoryTableModel.java
+++ b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/UnitCategoryTableModel.java
@@ -97,7 +97,7 @@ public abstract class UnitCategoryTableModel extends AbstractTableModel {
}
public static boolean isMarkedAsDefault(Type type) {
- return (type.equals(Type.LOCAL) || type.equals(Type.UPDATE)) ? true : false;
+ return type == Type.LOCAL || type == Type.UPDATE;
}
protected final boolean isMarkedAsDefault() {
@@ -393,8 +393,7 @@ public abstract class UnitCategoryTableModel extends AbstractTableModel {
}
public static boolean isExpandableType (Type type) {
- return type.equals(UnitCategoryTableModel.Type.AVAILABLE) ||
- type.equals(UnitCategoryTableModel.Type.UPDATE);
+ return type == UnitCategoryTableModel.Type.AVAILABLE || type == UnitCategoryTableModel.Type.UPDATE;
}
@Override
diff --git a/platform/core.output2/src/org/netbeans/core/output2/options/OutputOptions.java b/platform/core.output2/src/org/netbeans/core/output2/options/OutputOptions.java
index 5af72a073a..87413f47fb 100644
--- a/platform/core.output2/src/org/netbeans/core/output2/options/OutputOptions.java
+++ b/platform/core.output2/src/org/netbeans/core/output2/options/OutputOptions.java
@@ -563,7 +563,7 @@ public class OutputOptions {
public void setLinkStyle(LinkStyle linkStyle) {
Parameters.notNull("linkStyle", linkStyle); //NOI18N
- if (!linkStyle.equals(this.linkStyle)) {
+ if (linkStyle != this.linkStyle) {
LinkStyle oldLinkStyle = this.linkStyle;
this.linkStyle = linkStyle;
pcs.firePropertyChange(PROP_STYLE_LINK, oldLinkStyle, linkStyle);
diff --git a/platform/core.ui/src/org/netbeans/core/ui/options/general/WebBrowsersOptionsModel.java b/platform/core.ui/src/org/netbeans/core/ui/options/general/WebBrowsersOptionsModel.java
index 05ff52de2b..5dc9cd95ea 100644
--- a/platform/core.ui/src/org/netbeans/core/ui/options/general/WebBrowsersOptionsModel.java
+++ b/platform/core.ui/src/org/netbeans/core/ui/options/general/WebBrowsersOptionsModel.java
@@ -106,7 +106,7 @@ public class WebBrowsersOptionsModel extends DefaultListModel {
index2desc.clear();
int index = 0;
for (WebBrowserDesc desc : browsersList) {
- if (!desc.getChangeStatus().equals(ChangeStatus.REMOVED)) {
+ if (desc.getChangeStatus() != ChangeStatus.REMOVED) {
String newName = desc.getNewName();
if (newName != null) {
addElement(newName);
diff --git a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectFactory.java b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectFactory.java
index 8e65d6e15e..e065b233ba 100644
--- a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectFactory.java
+++ b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectFactory.java
@@ -220,10 +220,10 @@ public final class FileObjectFactory {
* @return always true.
*/
private boolean checkCacheState(boolean expectedExists, File file, Caller caller) {
- if (!expectedExists && (caller.equals(Caller.GetParent) || caller.equals(Caller.ToFileObject))) {
+ if (!expectedExists && (caller == Caller.GetParent || caller == Caller.ToFileObject)) {
return true;
}
- if (isWarningEnabled() && caller != null && !caller.equals(Caller.GetChildern)) {
+ if (isWarningEnabled() && caller != null && caller != Caller.GetChildern) {
boolean realExists = file.exists();
boolean notsame = expectedExists != realExists;
if (notsame) {
diff --git a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/naming/NamingFactory.java b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/naming/NamingFactory.java
index ec73d8127a..9d4a495fa0 100644
--- a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/naming/NamingFactory.java
+++ b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/naming/NamingFactory.java
@@ -351,7 +351,7 @@ public final class NamingFactory {
) {
FileName retVal = null;
//TODO: check all tests for isFile & isDirectory
- if (type.equals(FileType.unknown)) {
+ if (type == FileType.unknown) {
if (f.isDirectory()) {
type = FileType.directory;
} else {
diff --git a/platform/openide.text/src/org/openide/text/PrintPreferences.java b/platform/openide.text/src/org/openide/text/PrintPreferences.java
index 43b537b1a2..3728f488b5 100644
--- a/platform/openide.text/src/org/openide/text/PrintPreferences.java
+++ b/platform/openide.text/src/org/openide/text/PrintPreferences.java
@@ -251,7 +251,7 @@ public final class PrintPreferences {
* @param alignment whether the header should be centered, left aligned, or right aligned.
*/
public static void setHeaderAlignment(PrintPreferences.Alignment alignment) {
- if (getHeaderAlignment().equals(alignment)) return;
+ if (getHeaderAlignment() == alignment) return;
getPreferences().put(PROP_HEADER_ALIGNMENT, alignment.name());
}
@@ -266,7 +266,7 @@ public final class PrintPreferences {
* @param alignment whether the footer should be centered, left aligned, or right aligned.
*/
public static void setFooterAlignment(PrintPreferences.Alignment alignment) {
- if (getFooterAlignment().equals(alignment)) return;
+ if (getFooterAlignment() == alignment) return;
getPreferences().put(PROP_FOOTER_ALIGNMENT, alignment.name());
}
diff --git a/platform/options.api/src/org/netbeans/modules/options/export/OptionsExportModel.java b/platform/options.api/src/org/netbeans/modules/options/export/OptionsExportModel.java
index 4ba81fa103..40c4f5daa4 100644
--- a/platform/options.api/src/org/netbeans/modules/options/export/OptionsExportModel.java
+++ b/platform/options.api/src/org/netbeans/modules/options/export/OptionsExportModel.java
@@ -274,7 +274,7 @@ public final class OptionsExportModel {
String passwords = NbBundle.getMessage(OptionsChooserPanel.class, "OptionsChooserPanel.export.passwords.category.displayName");
for (OptionsExportModel.Category category : getCategories()) {
if (category.isApplicable()) {
- if (state.equals(State.ENABLED)) {
+ if (state == State.ENABLED) {
if (category.getDisplayName() != null && !category.getDisplayName().equals(passwords)) {
category.setState(state);
}
diff --git a/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java b/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
index 9babdd42fd..3f9783a5fd 100644
--- a/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
+++ b/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
@@ -87,7 +87,7 @@ class SamplesOutputStream {
tids.add(tid);
if (lastThread != null) {
- if (lastThread.getThreadState().equals(tinfo.getThreadState())) {
+ if (lastThread.getThreadState() == tinfo.getThreadState()) {
StackTraceElement[] lastStack = lastThread.getStackTrace();
StackTraceElement[] stack = tinfo.getStackTrace();
diff --git a/platform/uihandler/src/org/netbeans/modules/uihandler/Installer.java b/platform/uihandler/src/org/netbeans/modules/uihandler/Installer.java
index 3e89d3f097..029b5aeed8 100644
--- a/platform/uihandler/src/org/netbeans/modules/uihandler/Installer.java
+++ b/platform/uihandler/src/org/netbeans/modules/uihandler/Installer.java
@@ -1764,7 +1764,7 @@ public class Installer extends ModuleInstall implements Runnable {
synchronized (this) {
RP_UI.post(this);
- while (dialogState.equals(DialogState.NON_CREATED)) {
+ while (dialogState == DialogState.NON_CREATED) {
try {
wait();
} catch (InterruptedException ex) {
@@ -1773,7 +1773,7 @@ public class Installer extends ModuleInstall implements Runnable {
}
notifyAll();
}
- if (dialogState.equals(DialogState.FAILED)){
+ if (dialogState == DialogState.FAILED) {
return;
}
@@ -1883,7 +1883,7 @@ public class Installer extends ModuleInstall implements Runnable {
assignInternalURL(url);
refresh = false;
synchronized (this) {
- while (dialogState.equals(DialogState.CREATED) && !refresh) {
+ while (dialogState == DialogState.CREATED && !refresh) {
try {
wait();
} catch (InterruptedException ex) {
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTable.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTable.java
index 331805b684..67ade207ca 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTable.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTable.java
@@ -236,7 +236,7 @@ public class ProfilerTable extends JTable {
private Color background(int row, int column) {
Color background = (row & 0x1) == 0 ? getBackground() : UIUtils.getDarker(getBackground());
// if (convertColumnIndexToModel(column) == getSortColumn()) return UIUtils.getDarker(background);
- if (convertColumnIndexToModel(column) == getSortColumn() && !SortOrder.UNSORTED.equals(_getRowSorter().getSortOrder())) {
+ if (convertColumnIndexToModel(column) == getSortColumn() && SortOrder.UNSORTED != _getRowSorter().getSortOrder()) {
int r = background.getRed() - 4;
int g = background.getGreen() - 4;
int b = background.getBlue() + 6;
@@ -714,7 +714,7 @@ public class ProfilerTable extends JTable {
if (isSortable()) {
getRowSorter().addRowSorterListener(new RowSorterListener() {
public void sorterChanged(RowSorterEvent e) {
- if (RowSorterEvent.Type.SORTED.equals(e.getType()))
+ if (RowSorterEvent.Type.SORTED == e.getType())
updateColumnsPreferredWidth();
}
});
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java
index 25c3fcf418..cdd4b7a651 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java
@@ -652,9 +652,9 @@ public class ProfilerTreeTable extends ProfilerTable {
SortKey sortKey = sortKeys.get(0);
SortOrder sortOrder = sortKey.getSortOrder();
- if (SortOrder.UNSORTED.equals(sortOrder)) return null;
+ if (SortOrder.UNSORTED == sortOrder) return null;
- final boolean ascending = SortOrder.ASCENDING.equals(sortOrder);
+ final boolean ascending = SortOrder.ASCENDING == sortOrder;
final int sortColumn = sortKey.getColumn();
Class columnClass = model.getColumnClass(sortColumn);
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadsPanel.java
index 1e2848fc91..a375575291 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadsPanel.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadsPanel.java
@@ -121,7 +121,7 @@ public class ThreadsPanel extends DataView {
public void setFilter(Filter filter) {
selectedApplied.clear();
- if (Filter.SELECTED.equals(filter)) selectedApplied.addAll(selected);
+ if (Filter.SELECTED == filter) selectedApplied.addAll(selected);
this.filter = filter;
threadsTable.addRowFilter(new ThreadsFilter());
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ViewManager.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ViewManager.java
index 43ac489cd9..313d66c7b3 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ViewManager.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ViewManager.java
@@ -328,14 +328,14 @@ public class ViewManager extends ProfilerTableContainer.ColumnChangeAdapter {
int maxIndex = getMaxIndex();
int newIndex = i == Integer.MIN_VALUE ? maxIndex : i;
Position position = getIndexPosition(newIndex);
- while (newIndex > 0 && Position.RIGHT.equals(position))
+ while (newIndex > 0 && Position.RIGHT == position)
position = getIndexPosition(--newIndex);
// All indexes on right
- if (Position.RIGHT.equals(position)) return Integer.MAX_VALUE;
+ if (Position.RIGHT == position) return Integer.MAX_VALUE;
// All indexes on left
- if (Position.LEFT.equals(position) && newIndex == maxIndex &&
+ if (Position.LEFT == position && newIndex == maxIndex &&
getMaxPosition() - offset < 0) return Integer.MIN_VALUE;
// Last visible index
@@ -349,15 +349,15 @@ public class ViewManager extends ProfilerTableContainer.ColumnChangeAdapter {
int maxIndex = getMaxIndex();
int newIndex = i == Integer.MAX_VALUE ? 0 : i;
Position position = getIndexPosition(newIndex);
- while (newIndex < maxIndex && !Position.RIGHT.equals(position))
+ while (newIndex < maxIndex && Position.RIGHT != position)
position = getIndexPosition(++newIndex);
// First invisible inedx or all indexes on right
- if (Position.RIGHT.equals(position))
+ if (Position.RIGHT == position)
return newIndex == 0 ? Integer.MAX_VALUE : newIndex - 1;
// All indexes on left
- if (Position.LEFT.equals(position) && newIndex == maxIndex &&
+ if (Position.LEFT == position && newIndex == maxIndex &&
getMaxPosition() - offset < 0) return Integer.MIN_VALUE;
// Last visible index
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassInfo.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassInfo.java
index cfc80ce717..83336b4804 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassInfo.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassInfo.java
@@ -431,13 +431,13 @@ public abstract class ClassInfo extends BaseClassInfo implements JavaClassConsta
private void setOffsetDelta(int methodIdx, StackMapFrame frame, int newOffsetDelta) {
FrameType frameType = frame.frameType;
- if (frameType.equals(FrameType.SAME) && newOffsetDelta > 63) {
+ if (frameType == FrameType.SAME && newOffsetDelta > 63) {
extendFrame(methodIdx,frame,2);
frame.setFrameType(FrameType.SAME_FRAME_EXTENDED);
}
- if (frameType.equals(FrameType.SAME_LOCALS_1_STACK_ITEM) && newOffsetDelta > 63) {
+ if (frameType == FrameType.SAME_LOCALS_1_STACK_ITEM && newOffsetDelta > 63) {
extendFrame(methodIdx,frame,2);
- frame.setFrameType(frameType.SAME_LOCALS_1_STACK_ITEM_EXTENDED);
+ frame.setFrameType(FrameType.SAME_LOCALS_1_STACK_ITEM_EXTENDED);
}
frame.setOffsetDelta(newOffsetDelta);
}
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
index 2ead829cff..84409a160d 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
@@ -356,7 +356,7 @@ public class StackTraceSnapshotBuilder {
}
Thread.State newState = tinfo.getThreadState();
// ignore threads, which has not yet started.
- if (Thread.State.NEW.equals(newState)) {
+ if (Thread.State.NEW == newState) {
tinfoIt.remove();
continue;
}
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/ArrayValueView.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/ArrayValueView.java
index f1ae4f15d9..1d6865393f 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/ArrayValueView.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/basic/ArrayValueView.java
@@ -328,7 +328,7 @@ final class ArrayValueView extends DetailsProvider.View implements Scrollable, E
@Override
public boolean hasRawData() {
- return type.equals(PRIMITIVE_ARRAY);
+ return type == PRIMITIVE_ARRAY;
}
@Override
diff --git a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileElementNavigatorAction.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileElementNavigatorAction.java
index 035e2683a3..2a96d5cd94 100644
--- a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileElementNavigatorAction.java
+++ b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfileElementNavigatorAction.java
@@ -73,12 +73,12 @@ public final class ProfileElementNavigatorAction extends NodeAction {
ElementHandle eh = getHandle(activatedNodes);
ElementKind kind = eh == null ? null : eh.getKind();
- if (ElementKind.METHOD.equals(kind) || ElementKind.CONSTRUCTOR.equals(kind)) {
+ if (ElementKind.METHOD == kind || ElementKind.CONSTRUCTOR == kind) {
name = Bundle.ProfileMethodEditorAction_Name();
return true;
}
- if (ElementKind.CLASS.equals(kind)) {
+ if (ElementKind.CLASS == kind) {
name = Bundle.ProfileClassEditorAction_Name();
return true;
}
@@ -106,9 +106,9 @@ public final class ProfileElementNavigatorAction extends NodeAction {
Object sourceInfo = null;
ElementKind kind = eh.getKind();
- if (ElementKind.METHOD.equals(kind) || ElementKind.CONSTRUCTOR.equals(kind)) {
+ if (ElementKind.METHOD == kind || ElementKind.CONSTRUCTOR == kind) {
sourceInfo = getMethod(eh, src.getClasspathInfo());
- } else if (ElementKind.CLASS.equals(kind)) {
+ } else if (ElementKind.CLASS == kind) {
sourceInfo = new JavacClassInfo(eh, src.getClasspathInfo());
}
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/SampledCPUSnapshot.java b/profiler/profiler/src/org/netbeans/modules/profiler/SampledCPUSnapshot.java
index 020b7c7b3a..ce96cefa06 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/SampledCPUSnapshot.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/SampledCPUSnapshot.java
@@ -96,7 +96,7 @@ public final class SampledCPUSnapshot {
getSample(sampleIndex);
long ret = 0;
for (ThreadInfo info : sample.getTinfos()) {
- if (info.getThreadState().equals(Thread.State.RUNNABLE)) {
+ if (info.getThreadState() == Thread.State.RUNNABLE) {
ret += info.getStackTrace().length;
}
}
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/FilterSelector.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/FilterSelector.java
index 990204568e..e028ecde90 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/FilterSelector.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/FilterSelector.java
@@ -138,8 +138,7 @@ public abstract class FilterSelector {
JPanel filters = new JPanel(new GridLayout(3, 1));
- noFilterChoice = new JRadioButton(Bundle.FilterSelector_noFilter(),
- FilterName.NO_FILTER.equals(filterName));
+ noFilterChoice = new JRadioButton(Bundle.FilterSelector_noFilter(), FilterName.NO_FILTER == filterName);
bg.add(noFilterChoice);
JPanel noFilter = new JPanel(null);
noFilter.setLayout(new BoxLayout(noFilter, BoxLayout.LINE_AXIS));
@@ -147,7 +146,7 @@ public abstract class FilterSelector {
filters.add(noFilter);
javaClassesChoice = new JRadioButton(Bundle.FilterSelector_excludeCoreJava(),
- FilterName.EXCLUDE_JAVA_FILTER.equals(filterName));
+ FilterName.EXCLUDE_JAVA_FILTER == filterName);
bg.add(javaClassesChoice);
JLabel javaClassesHint = new JLabel("(java.*, javax.*, sun.*, com.sun.*, etc.)", JLabel.LEADING);
@@ -162,11 +161,11 @@ public abstract class FilterSelector {
filters.add(javaFilters);
excludeCustomChoice = new JRadioButton(Bundle.FilterSelector_excludeCustomEx(),
- FilterName.EXCLUDE_CUSTOM_FILTER.equals(filterName));
+ FilterName.EXCLUDE_CUSTOM_FILTER == filterName);
bg.add(excludeCustomChoice);
includeCustomChoice = new JRadioButton(Bundle.FilterSelector_includeCustomEx(),
- FilterName.INCLUDE_CUSTOM_FILTER.equals(filterName));
+ FilterName.INCLUDE_CUSTOM_FILTER == filterName);
bg.add(includeCustomChoice);
JPanel customFilters = new JPanel(null);
diff --git a/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/AndroidBrowser.java b/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/AndroidBrowser.java
index 42dfaeb305..863fb2211e 100644
--- a/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/AndroidBrowser.java
+++ b/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/AndroidBrowser.java
@@ -168,10 +168,10 @@ public class AndroidBrowser extends HtmlBrowser.Impl implements EnhancedBrowser{
Browser b;
boolean emulator;
- if (kind.equals(AndroidBrowser.Kind.ANDROID_DEVICE_DEFAULT)) {
+ if (kind == AndroidBrowser.Kind.ANDROID_DEVICE_DEFAULT) {
b = Browser.DEFAULT;
emulator = false;
- } else if (kind.equals(AndroidBrowser.Kind.ANDROID_DEVICE_CHROME)) {
+ } else if (kind == AndroidBrowser.Kind.ANDROID_DEVICE_CHROME) {
b = Browser.CHROME;
emulator = false;
} else {
@@ -231,7 +231,7 @@ public class AndroidBrowser extends HtmlBrowser.Impl implements EnhancedBrowser{
return Bundle.ERR_AdbNotFound();
}
try {
- if (kind.equals(AndroidBrowser.Kind.ANDROID_EMULATOR_DEFAULT)) { //NOI18N
+ if (kind == AndroidBrowser.Kind.ANDROID_EMULATOR_DEFAULT) { //NOI18N
for (Device dev : AndroidPlatform.getDefault().getConnectedDevices()) {
if (dev.isEmulator()) {
return null;
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsCompletionItem.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsCompletionItem.java
index 1022cab3d2..59395833e0 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsCompletionItem.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsCompletionItem.java
@@ -181,7 +181,15 @@ public class JsCompletionItem implements CompletionProposal {
@Override
public Set<Modifier> getModifiers() {
- Set<Modifier> modifiers = (getElement() == null || getElement().getModifiers().isEmpty() ? Collections.EMPTY_SET : EnumSet.copyOf(getElement().getModifiers()));
+ Set<Modifier> modifiers;
+
+ if (getElement() == null || getElement().getModifiers().isEmpty()) {
+ modifiers = Collections.EMPTY_SET;
+ } else {
+ modifiers = EnumSet.noneOf(Modifier.class);
+ modifiers.addAll(getElement().getModifiers());
+ }
+
if (modifiers.contains(Modifier.PRIVATE) && (modifiers.contains(Modifier.PUBLIC) || modifiers.contains(Modifier.PROTECTED))) {
modifiers.remove(Modifier.PUBLIC);
modifiers.remove(Modifier.PROTECTED);
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsStructureScanner.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsStructureScanner.java
index 1d06f0222f..37bc2795d5 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsStructureScanner.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsStructureScanner.java
@@ -476,7 +476,15 @@ public class JsStructureScanner implements StructureScanner {
@Override
public Set<Modifier> getModifiers() {
- Set<Modifier> modifiers = modelElement.getModifiers().isEmpty() ? Collections.EMPTY_SET : EnumSet.copyOf(modelElement.getModifiers());
+ Set<Modifier> modifiers;
+
+ if (modelElement.getModifiers().isEmpty()) {
+ modifiers = Collections.EMPTY_SET;
+ } else {
+ modifiers = EnumSet.noneOf(Modifier.class);
+ modifiers.addAll(modelElement.getModifiers());
+ }
+
if (modifiers.contains(Modifier.PRIVATE) && (modifiers.contains(Modifier.PUBLIC) || modifiers.contains(Modifier.PROTECTED))) {
modifiers.remove(Modifier.PUBLIC);
modifiers.remove(Modifier.PROTECTED);
diff --git a/webcommon/javascript2.html/src/org/netbeans/modules/javascript2/html/CssIdCompletionItem.java b/webcommon/javascript2.html/src/org/netbeans/modules/javascript2/html/CssIdCompletionItem.java
index 780696cf8e..994a58c13b 100644
--- a/webcommon/javascript2.html/src/org/netbeans/modules/javascript2/html/CssIdCompletionItem.java
+++ b/webcommon/javascript2.html/src/org/netbeans/modules/javascript2/html/CssIdCompletionItem.java
@@ -58,7 +58,15 @@ class CssIdCompletionItem implements CompletionProposal {
@Override
public Set<Modifier> getModifiers() {
- Set<Modifier> modifiers = (getElement() == null || getElement().getModifiers().isEmpty() ? Collections.EMPTY_SET : EnumSet.copyOf(getElement().getModifiers()));
+ Set<Modifier> modifiers;
+
+ if (getElement() == null || getElement().getModifiers().isEmpty()) {
+ modifiers = Collections.EMPTY_SET;
+ } else {
+ modifiers = EnumSet.noneOf(Modifier.class);
+ modifiers.addAll(getElement().getModifiers());
+ }
+
if (modifiers.contains(Modifier.PRIVATE) && (modifiers.contains(Modifier.PUBLIC) || modifiers.contains(Modifier.PROTECTED))) {
modifiers.remove(Modifier.PUBLIC);
modifiers.remove(Modifier.PROTECTED);
diff --git a/webcommon/javascript2.knockout/src/org/netbeans/modules/javascript2/knockout/model/KnockoutExportInterceptor.java b/webcommon/javascript2.knockout/src/org/netbeans/modules/javascript2/knockout/model/KnockoutExportInterceptor.java
index 60ffd576a0..25c39674d7 100644
--- a/webcommon/javascript2.knockout/src/org/netbeans/modules/javascript2/knockout/model/KnockoutExportInterceptor.java
+++ b/webcommon/javascript2.knockout/src/org/netbeans/modules/javascript2/knockout/model/KnockoutExportInterceptor.java
@@ -103,8 +103,11 @@ public class KnockoutExportInterceptor implements FunctionInterceptor {
LOGGER.log(Level.FINE, "Exporting property {0} to {1} as {2}",
new Object[] {name, object.getFullyQualifiedName(), value.getFullyQualifiedName()});
}
- EnumSet<Modifier> modifiers = EnumSet.copyOf(value.getModifiers());
+
+ EnumSet<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
+ modifiers.addAll(value.getModifiers());
modifiers.remove(Modifier.STATIC);
+
object.addProperty(name,
factory.newReference(object, name, offsetRange, value, true, modifiers));
}
diff --git a/webcommon/javascript2.lexer/src/org/netbeans/modules/javascript2/lexer/JsColoringLexer.java b/webcommon/javascript2.lexer/src/org/netbeans/modules/javascript2/lexer/JsColoringLexer.java
index a68d43590c..90bd141044 100644
--- a/webcommon/javascript2.lexer/src/org/netbeans/modules/javascript2/lexer/JsColoringLexer.java
+++ b/webcommon/javascript2.lexer/src/org/netbeans/modules/javascript2/lexer/JsColoringLexer.java
@@ -952,7 +952,7 @@ public final class JsColoringLexer {
return false;
}
for (int i = 0; i < this.braceBalances.size(); i++) {
- if (this.braceBalances.get(i).equals(other.braceBalances.get(i))) {
+ if (this.braceBalances.get(i) == other.braceBalances.get(i)) {
return false;
}
}
diff --git a/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/breakpoints/DOMBreakpoint.java b/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/breakpoints/DOMBreakpoint.java
index 8ee3a67e9d..3dd50e4235 100644
--- a/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/breakpoints/DOMBreakpoint.java
+++ b/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/breakpoints/DOMBreakpoint.java
@@ -165,15 +165,15 @@ public class DOMBreakpoint extends AbstractBreakpoint {
public boolean addType(Type type) {
boolean added = false;
- if (Type.SUBTREE_MODIFIED.equals(type)) {
+ if (Type.SUBTREE_MODIFIED == type) {
added = !isOnSubtreeModification();
setOnSubtreeModification(true);
}
- if (Type.ATTRIBUTE_MODIFIED.equals(type)) {
+ if (Type.ATTRIBUTE_MODIFIED == type) {
added = !isOnAttributeModification();
setOnAttributeModification(true);
}
- if (Type.NODE_REMOVED.equals(type)) {
+ if (Type.NODE_REMOVED == type) {
added = !isOnNodeRemoval();
setOnNodeRemoval(true);
}
@@ -182,15 +182,15 @@ public class DOMBreakpoint extends AbstractBreakpoint {
public synchronized boolean removeType(Type type) {
boolean removed = false;
- if (Type.SUBTREE_MODIFIED.equals(type)) {
+ if (Type.SUBTREE_MODIFIED == type) {
removed = isOnSubtreeModification();
setOnSubtreeModification(false);
}
- if (Type.ATTRIBUTE_MODIFIED.equals(type)) {
+ if (Type.ATTRIBUTE_MODIFIED == type) {
removed = isOnAttributeModification();
setOnAttributeModification(false);
}
- if (Type.NODE_REMOVED.equals(type)) {
+ if (Type.NODE_REMOVED == type) {
removed = isOnNodeRemoval();
setOnNodeRemoval(false);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists