Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2005-02-07 19:21:59 +0000
committerMichael Valenta2005-02-07 19:21:59 +0000
commit1276cb359836a4fcfa7b390cdbdb9729ec6e26a5 (patch)
tree7993c1cc1782f9a6dd8ff5e10c99d62751bdf066
parentab76fddf6093d8f6e0ea58996bdd73574ffb4fc2 (diff)
downloadeclipse.platform.team-1276cb359836a4fcfa7b390cdbdb9729ec6e26a5.tar.gz
eclipse.platform.team-1276cb359836a4fcfa7b390cdbdb9729ec6e26a5.tar.xz
eclipse.platform.team-1276cb359836a4fcfa7b390cdbdb9729ec6e26a5.zip
Bug 84331 NPE in CVSCheckedInChangeSetI20050207
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java
index 3083818a8..defb1e6de 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java
@@ -106,9 +106,14 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme
public CVSCheckedInChangeSet(ILogEntry entry) {
this.entry = entry;
- String date = DateFormat.getDateTimeInstance().format(entry.getDate());
+ Date date = entry.getDate();
String comment = HistoryView.flattenText(entry.getComment());
- setName("["+entry.getAuthor()+ "] (" + date +") " + comment); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ if (date == null) {
+ setName("["+entry.getAuthor()+ "] " + comment); //$NON-NLS-1$ //$NON-NLS-2$
+ } else {
+ String dateString = DateFormat.getDateTimeInstance().format(date);
+ setName("["+entry.getAuthor()+ "] (" + dateString +") " + comment); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ }
}
/* (non-Javadoc)

Back to the top