Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2008-04-17 15:41:31 +0000
committerTomasz Zarna2008-04-17 15:41:31 +0000
commit822c62964e4a18b4560a272f02eaa6dff9a9fadc (patch)
tree8cdc1394aedcbdf291f111fbee3d6604e2c9fe81
parentfe437d8ea9562b7fb309b2299412ff6ca891bac0 (diff)
downloadeclipse.platform.team-822c62964e4a18b4560a272f02eaa6dff9a9fadc.tar.gz
eclipse.platform.team-822c62964e4a18b4560a272f02eaa6dff9a9fadc.tar.xz
eclipse.platform.team-822c62964e4a18b4560a272f02eaa6dff9a9fadc.zip
bug 227522: ContentMergeViewer#getToolBarManager(Composite) misses @since tag
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java1
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
index 3158187f5..0979d6bc0 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
@@ -787,6 +787,7 @@ public abstract class ContentMergeViewer extends ContentViewer
* @param parent
* a <code>Composite</code> or <code>null</code>
* @return a <code>IToolBarManager</code>
+ * @since 3.4
*/
protected IToolBarManager getToolBarManager(Composite parent) {
return CompareViewerPane.getToolBarManager(parent);
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
index 3158187f5..0979d6bc0 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
@@ -787,6 +787,7 @@ public abstract class ContentMergeViewer extends ContentViewer
* @param parent
* a <code>Composite</code> or <code>null</code>
* @return a <code>IToolBarManager</code>
+ * @since 3.4
*/
protected IToolBarManager getToolBarManager(Composite parent) {
return CompareViewerPane.getToolBarManager(parent);

Back to the top