Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2020-01-13 10:53:36 +0000
committerAlexander Kurtakov2020-01-13 11:05:06 +0000
commitebaa8b80e9689a7196791589cdce8e536d22480b (patch)
tree64be18e1bdf0e62528d1a09c68053971c065ce36
parent6a03eb7dc122495aad94d59cb63de5ed5d1d4391 (diff)
downloadeclipse.platform.team-ebaa8b80e9689a7196791589cdce8e536d22480b.tar.gz
eclipse.platform.team-ebaa8b80e9689a7196791589cdce8e536d22480b.tar.xz
eclipse.platform.team-ebaa8b80e9689a7196791589cdce8e536d22480b.zip
Bug 559097 - Compile warnings in I20200113-0130Y20200114-0045I20200113-1800
Suppress warning in ShowAnnotationOperation as the open editor will access the resource. Change-Id: I1ba30eb4cab855232aff69734bef659d79faaf0a Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/pom.xml2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java3
3 files changed, 4 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF
index 2a7dce926..2031bdbaf 100644
--- a/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.team.cvs.ui; singleton:=true
-Bundle-Version: 3.4.700.qualifier
+Bundle-Version: 3.4.800.qualifier
Bundle-Activator: org.eclipse.team.internal.ccvs.ui.CVSUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.team.cvs.ui/pom.xml b/bundles/org.eclipse.team.cvs.ui/pom.xml
index 99e6b1eac..1db453720 100644
--- a/bundles/org.eclipse.team.cvs.ui/pom.xml
+++ b/bundles/org.eclipse.team.cvs.ui/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.team</groupId>
<artifactId>org.eclipse.team.cvs.ui</artifactId>
- <version>3.4.700-SNAPSHOT</version>
+ <version>3.4.800-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java
index 2f9260afd..febd585a8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -139,6 +139,7 @@ public class ShowAnnotationOperation extends CVSOperation {
}
}
+ @SuppressWarnings("resource")
private AbstractDecoratedTextEditor getEditor(AnnotateListener listener) throws PartInitException {
IResource resource= fCVSResource.getIResource();
if (resource instanceof IFile){

Back to the top