Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2006-06-07 13:28:05 -0400
committerMichael Valenta2006-06-07 13:28:05 -0400
commitc500d7cca0b8796c709a840ab67c2a673935c403 (patch)
tree51c57d6f3f90d66ec821753e06a39facd277cc59
parent096c5b03ccec022b345d9dde4943e8d222185a41 (diff)
downloadeclipse.platform.team-c500d7cca0b8796c709a840ab67c2a673935c403.tar.gz
eclipse.platform.team-c500d7cca0b8796c709a840ab67c2a673935c403.tar.xz
eclipse.platform.team-c500d7cca0b8796c709a840ab67c2a673935c403.zip
Bug 141312 Show Annotations caused NPE
-rw-r--r--bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java9
2 files changed, 8 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 4c69d8ddd..4a2f4cf1c 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.2.0.qualifier
+Bundle-Version: 3.2.100.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/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 3769ed6bb..49eb7c715 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
@@ -308,7 +308,7 @@ public class ShowAnnotationOperation extends CVSOperation {
}
}
- private RevisionInformation createRevisionInformation(final AnnotateListener listener, IProgressMonitor monitor) {
+ private RevisionInformation createRevisionInformation(final AnnotateListener listener, IProgressMonitor monitor) throws CVSException {
Map logEntriesByRevision= new HashMap();
if (fCVSResource instanceof ICVSFile) {
try {
@@ -317,8 +317,11 @@ public class ShowAnnotationOperation extends CVSOperation {
ILogEntry entry= logEntries[i];
logEntriesByRevision.put(entry.getRevision(), entry);
}
+ } catch (CVSException e) {
+ throw e;
} catch (TeamException e) {
- CVSUIPlugin.log(e);
+ // XXX why does getLogEntries throw TeamException?
+ throw new CVSException("", e); //$NON-NLS-1$
}
}
@@ -332,6 +335,8 @@ public class ShowAnnotationOperation extends CVSOperation {
Revision revision= (Revision) sets.get(revisionString);
if (revision == null) {
final ILogEntry entry= (ILogEntry) logEntriesByRevision.get(revisionString);
+ if (entry == null)
+ continue;
revision= new Revision() {
public Object getHoverInfo() {

Back to the top