diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiAnnotations.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiAnnotations.java index 74703a7228..a6ae6501d6 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiAnnotations.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiAnnotations.java @@ -57,8 +57,7 @@ public String toString() { @Override public boolean equals(Object obj) { - if (obj instanceof ApiAnnotations) { - ApiAnnotations desc = (ApiAnnotations) obj; + if (obj instanceof ApiAnnotations desc) { return this.bits == desc.bits; } return false; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionManager.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionManager.java index 7cd5641b50..ef227a61c3 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionManager.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionManager.java @@ -356,8 +356,7 @@ private void restoreNode(ProjectApiDescription apiDesc, Element element, Manifes break; } case IApiXmlConstants.ELEMENT_FIELD: - if (parentNode.element instanceof IReferenceTypeDescriptor) { - IReferenceTypeDescriptor type = (IReferenceTypeDescriptor) parentNode.element; + if (parentNode.element instanceof IReferenceTypeDescriptor type) { int vis = getInt(element, IApiXmlConstants.ATTR_VISIBILITY); int res = getInt(element, IApiXmlConstants.ATTR_RESTRICTIONS); String name = element.getAttribute(IApiXmlConstants.ATTR_NAME); @@ -366,8 +365,7 @@ private void restoreNode(ProjectApiDescription apiDesc, Element element, Manifes } break; case IApiXmlConstants.ELEMENT_METHOD: - if (parentNode.element instanceof IReferenceTypeDescriptor) { - IReferenceTypeDescriptor type = (IReferenceTypeDescriptor) parentNode.element; + if (parentNode.element instanceof IReferenceTypeDescriptor type) { int vis = getInt(element, IApiXmlConstants.ATTR_VISIBILITY); int res = getInt(element, IApiXmlConstants.ATTR_RESTRICTIONS); String name = element.getAttribute(IApiXmlConstants.ATTR_NAME); diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleVersionRange.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleVersionRange.java index c641dbc753..7f2a837c96 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleVersionRange.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleVersionRange.java @@ -68,8 +68,7 @@ public boolean isIncludeMinimum() { @Override public boolean equals(Object obj) { - if (obj instanceof BundleVersionRange) { - BundleVersionRange range = (BundleVersionRange) obj; + if (obj instanceof BundleVersionRange range) { return fRange.equals(range.fRange); } return false; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/JavadocTagManager.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/JavadocTagManager.java index d84fa66e47..4bc9cd9a0f 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/JavadocTagManager.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/JavadocTagManager.java @@ -50,8 +50,7 @@ public Key(int t, int m) { @Override public boolean equals(Object obj) { - if (obj instanceof Key) { - Key other = (Key) obj; + if (obj instanceof Key other) { return type == other.type && member == other.member; } return super.equals(obj); diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/RequiredComponentDescription.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/RequiredComponentDescription.java index cf1297292d..41e021c0a8 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/RequiredComponentDescription.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/RequiredComponentDescription.java @@ -59,8 +59,7 @@ public RequiredComponentDescription(String id, IVersionRange range, boolean isOp @Override public boolean equals(Object obj) { - if (obj instanceof RequiredComponentDescription) { - RequiredComponentDescription desc = (RequiredComponentDescription) obj; + if (obj instanceof RequiredComponentDescription desc) { return fId.equals(desc.fId) && fRange.equals(desc.fRange); } return super.equals(obj); diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalMethodReference.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalMethodReference.java index e0fd2244ba..bc2b57d84c 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalMethodReference.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalMethodReference.java @@ -74,8 +74,7 @@ public boolean considerReference(IReference reference, IProgressMonitor monitor) } catch (CoreException ce) { // do nothing, skip it } - if (member instanceof IApiMethod) { - IApiMethod method = (IApiMethod) member; + if (member instanceof IApiMethod method) { if (method.isDefaultMethod()) { return considerReference(reference, monitor); } diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractProblemDetector.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractProblemDetector.java index 9f15fb0f21..34244994a3 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractProblemDetector.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractProblemDetector.java @@ -517,8 +517,7 @@ public List createProblems(IProgressMonitor monitor) { IApiComponent component = reference.getMember().getApiComponent(); try { IApiProblem problem = null; - if (component instanceof ProjectComponent) { - ProjectComponent ppac = (ProjectComponent) component; + if (component instanceof ProjectComponent ppac) { IJavaProject project = ppac.getJavaProject(); problem = createProblem(reference, project); } else { diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java index 4d4238e9c1..b6845ac9e0 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java @@ -629,10 +629,9 @@ public boolean contains(ISchedulingRule rule) { @Override public boolean isConflicting(ISchedulingRule rule) { - if (!(rule instanceof ApiAnalysisJobRule)) { + if (!(rule instanceof ApiAnalysisJobRule other)) { return false; } - ApiAnalysisJobRule other = (ApiAnalysisJobRule) rule; return project.equals(other.project); } diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BaseApiAnalyzer.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BaseApiAnalyzer.java index 18880b7e16..369366baea 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BaseApiAnalyzer.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BaseApiAnalyzer.java @@ -2666,8 +2666,7 @@ public void checkBaselineMismatch(IApiBaseline baseline, IApiBaseline workspaceB * @return Java project or null */ private IJavaProject getJavaProject(IApiComponent component) { - if (component instanceof ProjectComponent) { - ProjectComponent pp = (ProjectComponent) component; + if (component instanceof ProjectComponent pp) { return pp.getJavaProject(); } return null; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IncrementalApiBuilder.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IncrementalApiBuilder.java index 17409b7b6d..689145282e 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IncrementalApiBuilder.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IncrementalApiBuilder.java @@ -166,8 +166,7 @@ public boolean visit(IResourceDelta delta) throws CoreException { if (component != null) { try { IApiAnnotations annotations = component.getApiDescription().resolveAnnotations(Factory.typeDescriptor(type.replace('/', '.'))); - if (annotations instanceof TypeAnnotations) { - TypeAnnotations ta = (TypeAnnotations) annotations; + if (annotations instanceof TypeAnnotations ta) { if (ta.getBuildStamp() == BuildStamps.getBuildStamp(resource.getProject())) { // note description change in // addition to structure diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ProblemDetectorBuilder.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ProblemDetectorBuilder.java index f05c4ba30b..0bb636b416 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ProblemDetectorBuilder.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ProblemDetectorBuilder.java @@ -197,8 +197,7 @@ public void setOwningComponent(IApiComponent component) { * not a {@link PluginProjectApiComponent} */ private IProject getProject(IApiComponent component) { - if (component instanceof ProjectComponent) { - ProjectComponent comp = (ProjectComponent) component; + if (component instanceof ProjectComponent comp) { return comp.getJavaProject().getProject(); } return null; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java index 2d35c700a1..3cd2fde2ab 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java @@ -417,8 +417,7 @@ && getDefaultDefined(type, name, desc, false) != null) { @Override public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) { for (Object arg : bsmArgs) { - if (arg instanceof Handle) { - Handle handle = (Handle) arg; + if (arg instanceof Handle handle) { Type declaringType = Type.getObjectType(handle.getOwner()); Reference reference = ReferenceExtractor.this.addMethodReference(declaringType, handle.getName(), handle.getDesc(), IReference.REF_VIRTUALMETHOD, 0); if (reference != null) { @@ -564,14 +563,12 @@ public void visitLocalVariable(String name, String desc, String signature, Label @Override public void visitLdcInsn(Object cst) { - if (cst instanceof Type) { - Type type = (Type) cst; + if (cst instanceof Type type) { Reference reference = ReferenceExtractor.this.addTypeReference(type, IReference.REF_CONSTANTPOOL); if (reference != null) { this.linePositionTracker.addLocation(reference); } - } else if (cst instanceof String) { - String str = (String) cst; + } else if (cst instanceof String str) { this.stringLiteral = (Util.EMPTY_STRING.equals(str) ? null : str); } } @@ -762,15 +759,13 @@ public void computeLineNumbers() { remainingCatchLabelInfos = remaingEntriesTemp; } } - } else if (current instanceof Reference) { - Reference ref = (Reference) current; + } else if (current instanceof Reference ref) { if (ref.getLineNumber() == -1) { ref.setLineNumber(currentLineNumber); } else { currentLineNumber = ref.getLineNumber(); } - } else if (current instanceof LineInfo) { - LineInfo lineInfo = (LineInfo) current; + } else if (current instanceof LineInfo lineInfo) { currentLineNumber = lineInfo.line; } } @@ -810,8 +805,7 @@ public int compareTo(Object o) { @Override public boolean equals(Object obj) { - if (obj instanceof LineInfo) { - LineInfo lineInfo2 = (LineInfo) obj; + if (obj instanceof LineInfo lineInfo2) { return this.line == lineInfo2.line && this.label.equals(lineInfo2.label); } return super.equals(obj); @@ -841,8 +835,7 @@ public LocalLineNumberMarker(int line, int varIndex) { @Override public boolean equals(Object obj) { - if (obj instanceof LocalLineNumberMarker) { - LocalLineNumberMarker marker = (LocalLineNumberMarker) obj; + if (obj instanceof LocalLineNumberMarker marker) { return this.lineNumber == marker.lineNumber && this.varIndex == marker.varIndex; } return false; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/SystemApiDetector.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/SystemApiDetector.java index ded068a580..c4e7fba1f3 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/SystemApiDetector.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/SystemApiDetector.java @@ -393,8 +393,7 @@ public List createProblems(IProgressMonitor monitor) { try { IApiProblem problem = null; IApiComponent component = reference.getMember().getApiComponent(); - if (component instanceof ProjectComponent) { - ProjectComponent ppac = (ProjectComponent) component; + if (component instanceof ProjectComponent ppac) { IJavaProject project = ppac.getJavaProject(); problem = createProblem(reference, project); } else { diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Validator.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Validator.java index 54a7fd2f40..01c71c0049 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Validator.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Validator.java @@ -210,8 +210,7 @@ protected int getParentModifiers(ASTNode node) { if (node == null) { return 0; } - if (node instanceof AbstractTypeDeclaration) { - AbstractTypeDeclaration type = (AbstractTypeDeclaration) node; + if (node instanceof AbstractTypeDeclaration type) { return type.getModifiers(); } return getParentModifiers(node.getParent()); diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/Delta.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/Delta.java index 1f6ea1fc53..ececc8a5de 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/Delta.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/Delta.java @@ -187,10 +187,9 @@ public boolean equals(Object obj) { if (obj == null) { return false; } - if (!(obj instanceof Delta)) { + if (!(obj instanceof Delta other)) { return false; } - Delta other = (Delta) obj; if (this.elementType != other.elementType) { return false; } diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/FieldDescriptorImpl.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/FieldDescriptorImpl.java index 4a22fc6731..0981d2e6ef 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/FieldDescriptorImpl.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/FieldDescriptorImpl.java @@ -46,8 +46,7 @@ public String toString() { @Override public boolean equals(Object obj) { - if (obj instanceof IFieldDescriptor) { - IFieldDescriptor field = (IFieldDescriptor) obj; + if (obj instanceof IFieldDescriptor field) { return getName().equals(field.getName()) && getEnclosingType().equals(field.getEnclosingType()); } return false; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MethodDescriptorImpl.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MethodDescriptorImpl.java index ca63d0e8a6..7ce2b4743c 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MethodDescriptorImpl.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MethodDescriptorImpl.java @@ -53,8 +53,7 @@ public String toString() { @Override public boolean equals(Object obj) { - if (obj instanceof IMethodDescriptor) { - IMethodDescriptor method = (IMethodDescriptor) obj; + if (obj instanceof IMethodDescriptor method) { return getName().equals(method.getName()) && getEnclosingType().equals(method.getEnclosingType()) && getSignature().equals(method.getSignature()); } return false; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/PackageDescriptorImpl.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/PackageDescriptorImpl.java index d1954a1072..9186543970 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/PackageDescriptorImpl.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/PackageDescriptorImpl.java @@ -41,8 +41,7 @@ public String toString() { @Override public boolean equals(Object obj) { - if (obj instanceof IPackageDescriptor) { - IPackageDescriptor pkg = (IPackageDescriptor) obj; + if (obj instanceof IPackageDescriptor pkg) { return getName().equals(pkg.getName()); } return false; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/ReferenceTypeDescriptorImpl.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/ReferenceTypeDescriptorImpl.java index 1322d4bf50..79b661b20e 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/ReferenceTypeDescriptorImpl.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/ReferenceTypeDescriptorImpl.java @@ -118,8 +118,7 @@ public synchronized String getQualifiedName() { @Override public boolean equals(Object obj) { - if (obj instanceof IReferenceTypeDescriptor) { - IReferenceTypeDescriptor refType = (IReferenceTypeDescriptor) obj; + if (obj instanceof IReferenceTypeDescriptor refType) { return getQualifiedName().equals(refType.getQualifiedName()); } return false; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java index 45170bc9d2..b525cfc08c 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java @@ -396,8 +396,7 @@ protected void addComponent(IApiComponent component) { } fComponentsById.put(component.getSymbolicName(), component); - if (component instanceof ProjectComponent) { - ProjectComponent projectApiComponent = (ProjectComponent) component; + if (component instanceof ProjectComponent projectApiComponent) { if (this.fComponentsByProjectNames == null) { this.fComponentsByProjectNames = new HashMap<>(); } @@ -805,8 +804,7 @@ public void setName(String name) { @Override public boolean equals(Object obj) { - if (obj instanceof IApiBaseline) { - IApiBaseline baseline = (IApiBaseline) obj; + if (obj instanceof IApiBaseline baseline) { return this.getName().equals(baseline.getName()); } return super.equals(obj); diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMember.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMember.java index e5a5e6dc6b..7452818232 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMember.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMember.java @@ -99,8 +99,7 @@ public String getPackageName() { @Override public boolean equals(Object obj) { - if (obj instanceof IApiElement) { - IApiElement element = (IApiElement) obj; + if (obj instanceof IApiElement element) { if (element.getType() == this.getType()) { return enclosingTypesEqual(this, element) && getName().equals(element.getName()); } diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java index f124b31165..bfea24f05a 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java @@ -321,8 +321,7 @@ private void reOrganizeComponents(IApiComponent[] components) throws CoreExcepti if (javaEE != null) { for (int i = 0; i < components.length; i++) { IApiComponent iComponent = components[i]; - if (iComponent instanceof SystemLibraryApiComponent) { - SystemLibraryApiComponent sysCom = (SystemLibraryApiComponent) iComponent; + if (iComponent instanceof SystemLibraryApiComponent sysCom) { if (sysCom.getSymbolicName().equals(javaEE)) { // swap i and 0; IApiComponent temp = components[i]; @@ -495,8 +494,7 @@ public IMemberDescriptor getHandle() { @Override public boolean equals(Object obj) { - if (obj instanceof IApiType) { - IApiType type = (IApiType) obj; + if (obj instanceof IApiType type) { if (getApiComponent() == null) { return type.getApiComponent() == null && getName().equals(type.getName()); } diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ArchiveApiTypeContainer.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ArchiveApiTypeContainer.java index 42732186ea..6bb37240ae 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ArchiveApiTypeContainer.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ArchiveApiTypeContainer.java @@ -81,8 +81,7 @@ public int compareTo(Object o) { @Override public boolean equals(Object obj) { - if (obj instanceof ArchiveApiTypeRoot) { - ArchiveApiTypeRoot classFile = (ArchiveApiTypeRoot) obj; + if (obj instanceof ArchiveApiTypeRoot classFile) { return this.getName().equals(classFile.getName()); } return false; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java index b837c68809..d9a462fb16 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java @@ -260,8 +260,7 @@ public boolean isValidBundle() throws CoreException { @Override public boolean equals(Object obj) { - if (obj instanceof BundleComponent) { - BundleComponent comp = (BundleComponent) obj; + if (obj instanceof BundleComponent comp) { return getName().equals(comp.getName()) && getSymbolicName().equals(comp.getSymbolicName()) && getVersion().equals(comp.getVersion()); } return false; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/MethodKey.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/MethodKey.java index 8c00687ed1..5994c89ba9 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/MethodKey.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/MethodKey.java @@ -44,8 +44,7 @@ public MethodKey(String typename, String name, String sig, boolean considertypen @Override public boolean equals(Object obj) { - if (obj instanceof MethodKey) { - MethodKey key = (MethodKey) obj; + if (obj instanceof MethodKey key) { return fSelector.equals(key.fSelector) && signaturesEqual(fSig, key.fSig) && (fConsiderTypename ? fTypename.equals(key.fTypename) : true); } return false; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ResourceApiTypeRoot.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ResourceApiTypeRoot.java index af7a190d55..fcc8e9e0d2 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ResourceApiTypeRoot.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ResourceApiTypeRoot.java @@ -96,8 +96,7 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if (obj instanceof IApiTypeRoot) { - IApiTypeRoot file = (IApiTypeRoot) obj; + if (obj instanceof IApiTypeRoot file) { return getName().equals(file.getTypeName()); } return super.equals(obj); diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/StubArchiveApiTypeContainer.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/StubArchiveApiTypeContainer.java index f609a3d8e9..1c0062e811 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/StubArchiveApiTypeContainer.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/StubArchiveApiTypeContainer.java @@ -79,8 +79,7 @@ public int compareTo(Object o) { @Override public boolean equals(Object obj) { - if (obj instanceof ArchiveApiTypeRoot) { - ArchiveApiTypeRoot classFile = (ArchiveApiTypeRoot) obj; + if (obj instanceof ArchiveApiTypeRoot classFile) { return this.getName().equals(classFile.getName()); } return false; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java index b492b6c19d..c4d5523c02 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java @@ -282,8 +282,7 @@ public static IApiType buildTypeStructure(byte[] bytes, IApiComponent component, */ public static void setEnclosingMethod(IApiType enclosingType, ApiType currentAnonymousLocalType) { IApiTypeRoot typeRoot = enclosingType.getTypeRoot(); - if (typeRoot instanceof AbstractApiTypeRoot) { - AbstractApiTypeRoot abstractApiTypeRoot = (AbstractApiTypeRoot) typeRoot; + if (typeRoot instanceof AbstractApiTypeRoot abstractApiTypeRoot) { EnclosingMethodSetter visitor = new EnclosingMethodSetter(new ClassNode(), currentAnonymousLocalType.getName()); try { ClassReader classReader = new ClassReader(abstractApiTypeRoot.getContents()); diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/problems/ApiProblem.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/problems/ApiProblem.java index 977841be7b..c189f0d104 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/problems/ApiProblem.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/problems/ApiProblem.java @@ -209,8 +209,7 @@ public String[] getMessageArguments() { @Override public boolean equals(Object obj) { - if (obj instanceof IApiProblem) { - IApiProblem problem = (IApiProblem) obj; + if (obj instanceof IApiProblem problem) { if (problem.getId() == fId && argumentsEqual(problem.getMessageArguments())) { String resourcePath = problem.getResourcePath(); if (resourcePath == null) { diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/problems/ApiProblemFilter.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/problems/ApiProblemFilter.java index e70706048d..97da369e9f 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/problems/ApiProblemFilter.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/problems/ApiProblemFilter.java @@ -68,8 +68,7 @@ public String getComponentId() { @Override public boolean equals(Object obj) { - if (obj instanceof IApiProblemFilter) { - IApiProblemFilter filter = (IApiProblemFilter) obj; + if (obj instanceof IApiProblemFilter filter) { return elementsEqual(filter.getComponentId(), fComponentId) && filter.getUnderlyingProblem().equals(fProblem); } else if (obj instanceof IApiProblem) { return fProblem.equals(obj); diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/scanner/TagScanner.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/scanner/TagScanner.java index a976b3a339..55094446bc 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/scanner/TagScanner.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/scanner/TagScanner.java @@ -245,8 +245,7 @@ void scanMethodAnnotation(String name, MethodDeclaration node) { if (JavadocTagManager.ANNOTATION_NOOVERRIDE.equals(name)) { if (!Flags.isFinal(node.getModifiers()) && !Flags.isStatic(node.getModifiers())) { ASTNode parent = node.getParent(); - if (parent instanceof TypeDeclaration) { - TypeDeclaration type = (TypeDeclaration) parent; + if (parent instanceof TypeDeclaration type) { if (type.isInterface()) { if (Flags.isDefaultMethod(node.getModifiers())) { restrictions |= RestrictionModifiers.NO_OVERRIDE; @@ -480,8 +479,7 @@ public boolean visit(PackageDeclaration node) { public boolean visit(MethodDeclaration node) { if (isNotVisible(node.getModifiers())) { ASTNode parent = node.getParent(); - if (parent instanceof TypeDeclaration) { - TypeDeclaration type = (TypeDeclaration) parent; + if (parent instanceof TypeDeclaration type) { if (!type.isInterface()) { return false; } @@ -532,8 +530,7 @@ void scanMethodJavaDoc(MethodDeclaration node) { continue; } ASTNode parent = node.getParent(); - if (parent instanceof TypeDeclaration) { - TypeDeclaration type = (TypeDeclaration) parent; + if (parent instanceof TypeDeclaration type) { if (type.isInterface()) { if (Flags.isDefaultMethod(node.getModifiers())) { restrictions |= RestrictionModifiers.NO_OVERRIDE; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ConsumerReportConvertor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ConsumerReportConvertor.java index 30c604f9d4..0c3177cec8 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ConsumerReportConvertor.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ConsumerReportConvertor.java @@ -512,8 +512,7 @@ protected void writeIndexPage(List scanResult) throws Exception { File refereehtml = null; String link = null; for (Object obj : scanResult) { - if (obj instanceof Consumer) { - Consumer consumer = (Consumer) obj; + if (obj instanceof Consumer consumer) { refereehtml = new File(getReportsRoot(), consumer.name + File.separator + "index.html"); //$NON-NLS-1$ link = extractLinkFrom(getReportsRoot(), refereehtml.getAbsolutePath()); buffer.append(getReferenceTableEntry(consumer.counts, link, consumer.name, true)); diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefReportConverter.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefReportConverter.java index 85a55ef010..da746312ed 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefReportConverter.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefReportConverter.java @@ -374,8 +374,7 @@ protected void writeIndexPage(List result) throws Exception { buffer.append(getProblemSummaryTable()); if (result.size() > 0) { for (Object obj : result) { - if (obj instanceof Report) { - Report report = (Report) obj; + if (obj instanceof Report report) { File refereehtml = new File(getReportsRoot(), report.name + File.separator + "index.html"); //$NON-NLS-1$ String link = extractLinkFrom(getReportsRoot(), refereehtml.getAbsolutePath()); buffer.append(getReferenceTableEntry(report, link)); diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ReferenceDescriptor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ReferenceDescriptor.java index 879df3943d..d4c990ad70 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ReferenceDescriptor.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ReferenceDescriptor.java @@ -48,8 +48,7 @@ public ReferenceDescriptor(IComponentDescriptor from, IMemberDescriptor origin, @Override public boolean equals(Object obj) { - if (obj instanceof ReferenceDescriptor) { - ReferenceDescriptor rd = (ReferenceDescriptor) obj; + if (obj instanceof ReferenceDescriptor rd) { return origin.equals(rd.origin) && target.equals(rd.target) && from.equals(rd.from) && to.equals(rd.to) && line == rd.line && kind == rd.kind && visibility == rd.visibility; } return false; diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseReportConverter.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseReportConverter.java index a1ec2ebd4d..549b0a830d 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseReportConverter.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseReportConverter.java @@ -1463,8 +1463,7 @@ protected void writeIndexPage(List scanResult) throws Exception { File refereehtml = null; String link = null; for (Object obj : scanResult) { - if (obj instanceof Report) { - Report report = (Report) obj; + if (obj instanceof Report report) { refereehtml = new File(getReportsRoot(), report.name + File.separator + "index.html"); //$NON-NLS-1$ link = extractLinkFrom(getReportsRoot(), refereehtml.getAbsolutePath()); buffer.append(getReferenceTableEntry(report.counts, link, report.name, true)); diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Signatures.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Signatures.java index 573b211b91..065c9a83de 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Signatures.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Signatures.java @@ -795,8 +795,7 @@ static void collectSyntheticParam(final MethodDeclaration method, List r } continue; } - if (parent instanceof CompilationUnit) { - CompilationUnit cunit = (CompilationUnit) parent; + if (parent instanceof CompilationUnit cunit) { PackageDeclaration pdec = cunit.getPackage(); if (pdec != null) { name.insert(0, '.'); diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java index 83c5e485ff..849b0c6c55 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java @@ -261,8 +261,7 @@ protected IStatus run(IProgressMonitor monitor) { private void cancelBuild(Object jobfamily) { Job[] buildJobs = Job.getJobManager().find(jobfamily); for (Job curr : buildJobs) { - if (curr != this && curr instanceof BuildJob) { - BuildJob job = (BuildJob) curr; + if (curr != this && curr instanceof BuildJob job) { if (job.isCoveredBy(this)) { curr.cancel(); // cancel all other build jobs of our // kind @@ -1198,12 +1197,10 @@ public static IType updateType(String typeName, IJavaProject javaProject) throws IPath path = IPath.fromOSString(typeNameWithSeparator); IPath pathExceptLastSegment = path.removeLastSegments(1); IJavaElement packFrag = javaProject.findElement(pathExceptLastSegment, DefaultWorkingCopyOwner.PRIMARY); - if (packFrag instanceof PackageFragment) { - PackageFragment pf = (PackageFragment) packFrag; + if (packFrag instanceof PackageFragment pf) { List children = pf.getChildrenOfType(IJavaElement.COMPILATION_UNIT); for (JavaElement object : children) { - if (object instanceof CompilationUnit) { - CompilationUnit compilationUn = (CompilationUnit) object; + if (object instanceof CompilationUnit compilationUn) { ITypeRoot typeRoot = compilationUn.getTypeRoot(); if (typeRoot.findPrimaryType() == null) { continue; @@ -1216,8 +1213,7 @@ public static IType updateType(String typeName, IJavaProject javaProject) throws } List children2 = pf.getChildrenOfType(IJavaElement.CLASS_FILE); for (JavaElement object : children2) { - if (object instanceof ClassFile) { - ClassFile compilationUn = (ClassFile) object; + if (object instanceof ClassFile compilationUn) { ITypeRoot typeRoot = compilationUn.getTypeRoot(); if (typeRoot.findPrimaryType() == null) { continue; @@ -1251,8 +1247,7 @@ public static IType getTypeInSameJavaProject(IType type, String typeName, IJavaP IJavaElement ancestor = type.getAncestor(IJavaElement.JAVA_PROJECT); IType newType = null; try { - if (ancestor instanceof IJavaProject) { - IJavaProject pro = (IJavaProject) ancestor; + if (ancestor instanceof IJavaProject pro) { if (!pro.equals(javaProject)) { newType = updateType(typeName, javaProject); if (newType != null) { @@ -2853,8 +2848,7 @@ public static IType findSourceTypeinJavaProject(IJavaProject javaProject, String IType type = null; try { String pkgName = typeName.substring(0, typeName.lastIndexOf('.')); - if (javaProject instanceof JavaProject) { - JavaProject jp = (JavaProject) javaProject; + if (javaProject instanceof JavaProject jp) { NameLookup newNameLookup = null; try { newNameLookup = jp.newNameLookup(DefaultWorkingCopyOwner.PRIMARY);