Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2011-04-11 10:11:36 +0000
committerTomasz Zarna2011-04-11 10:11:36 +0000
commit2179c64452a8d19089367916b67d30bdc6354e57 (patch)
treeaecffe7bc7d81c19e29853d3a9e5b7ea6942919a /bundles/org.eclipse.team.core/src
parent591c1d37b05df95041d068d70a34e61a48b1f460 (diff)
downloadeclipse.platform.team-2179c64452a8d19089367916b67d30bdc6354e57.tar.gz
eclipse.platform.team-2179c64452a8d19089367916b67d30bdc6354e57.tar.xz
eclipse.platform.team-2179c64452a8d19089367916b67d30bdc6354e57.zip
bug 76386: [History View] CVS Resource History shows revisions from all branches -- Olexiy's patch
Diffstat (limited to 'bundles/org.eclipse.team.core/src')
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/IFileRevision.java12
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/provider/FileRevision.java13
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties1
3 files changed, 23 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/IFileRevision.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/IFileRevision.java
index 95e2a298c..ee6b283bd 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/IFileRevision.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/IFileRevision.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Olexiy Buyanskyy <olexiyb@gmail.com> - Bug 76386 - [History View] CVS Resource History shows revisions from all branches
*******************************************************************************/
package org.eclipse.team.core.history;
@@ -95,6 +96,15 @@ public interface IFileRevision {
public String getComment();
/**
+ * Returns the branches names of file revision.
+ *
+ * @return an array of ITag's if branch names exist for this revision
+ * or an empty ITag array if no names exist
+ * @since 3.6
+ */
+ public ITag[] getBranches();
+
+ /**
* Returns the set of tags available for this file revision.
*
* @return an array of ITag's if ITags exist for this revision or an empty ITag array
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/provider/FileRevision.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/provider/FileRevision.java
index 054b1ad83..346932109 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/provider/FileRevision.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/provider/FileRevision.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Olexiy Buyanskyy <olexiyb@gmail.com> - Bug 76386 - [History View] CVS Resource History shows revisions from all branches
*******************************************************************************/
package org.eclipse.team.core.history.provider;
@@ -131,7 +132,15 @@ public abstract class FileRevision implements IFileRevision {
public String getComment() {
return null;
}
-
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.core.history.IFileRevision#getBranches()
+ * @since 3.6
+ */
+ public ITag[] getBranches() {
+ return new ITag[0];
+ }
+
/* (non-Javadoc)
* @see org.eclipse.team.core.history.IFileRevision#getTags()
*/
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
index 3bf24214d..e3bacf8ef 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
@@ -7,6 +7,7 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Olexiy Buyanskyy <olexiyb@gmail.com> - Bug 76386 - [History View] CVS Resource History shows revisions from all branches
###############################################################################
ok=OK
concatStrings={0} {1}

Back to the top