Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2006-01-25 19:33:46 +0000
committerMichael Valenta2006-01-25 19:33:46 +0000
commitf0c35a88a91c90e8a3cd743967eee5718ca2f31b (patch)
tree32b7a3175457282a9a421ecbdca84786f1438ed7
parentf37384b30e7cdf2c6147cdc82b6710faf63af473 (diff)
downloadeclipse.platform.team-f0c35a88a91c90e8a3cd743967eee5718ca2f31b.tar.gz
eclipse.platform.team-f0c35a88a91c90e8a3cd743967eee5718ca2f31b.tar.xz
eclipse.platform.team-f0c35a88a91c90e8a3cd743967eee5718ca2f31b.zip
Fixed javadoc warnings
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffTree.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffVisitor.java12
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/TwoWayDiff.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/package.html17
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/provider/FileRevision.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/provider/package.html17
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeContext.java20
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceDiff.java4
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceDiffTree.java6
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceMappingMerger.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ISynchronizationContext.java10
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java4
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationContext.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/compare/package.html14
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/package.html14
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ICompareAdapter.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java3
19 files changed, 100 insertions, 41 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffTree.java
index e9698234e..6e21dc854 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffTree.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffTree.java
@@ -57,7 +57,7 @@ public interface IDiffTree {
* if applicable. If the visitor returns <code>true</code>, any of the
* delta's children in this tree are also visited.
*
- * @param delta the delta to be visited
+ * @param path the path to start the visit in the tree
* @param visitor the visitor
* @param depth the depth to visit
* @exception CoreException if the visitor failed with this exception.
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffVisitor.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffVisitor.java
index bd669897d..c8da5fc8d 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffVisitor.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/IDiffVisitor.java
@@ -17,9 +17,9 @@ import org.eclipse.core.runtime.CoreException;
* <p>
* Usage:
* <pre>
- * class Visitor implements IDeltaVisitor {
- * public boolean visit(IDelta delta) {
- * switch (delta.getKind()) {
+ * class Visitor implements IDiffVisitor {
+ * public boolean visit(IDiffNode diff) {
+ * switch (diff.getKind()) {
* case IResourceDelta.ADDED :
* // handle added resource
* break;
@@ -33,8 +33,8 @@ import org.eclipse.core.runtime.CoreException;
* return true;
* }
* }
- * IDelta rootDelta = ...;
- * rootDelta.accept(new Visitor());
+ * IDiffTree tree = ...;
+ * tree.accept(new Visitor());
* </pre>
* </p>
* <p>
@@ -46,7 +46,7 @@ import org.eclipse.core.runtime.CoreException;
* work nor that it will remain the same. Please do not use this API without
* consulting with the Platform/Team team.
* </p>
- * @see IDiffNode#accept(IDeltaVisitor)
+ * @see IDiffTree#accept(org.eclipse.core.runtime.IPath, IDiffVisitor, int)
*
* @since 3.2
*/
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java
index d1870a106..829ecee65 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java
@@ -149,7 +149,7 @@ public class DiffTree implements IDiffTree {
* nest sync set modifications within <code>beginInput/endInput</code>.
* </p>
*
- * @param resource the local resource to remove
+ * @param path the path to remove
*/
public synchronized void remove(IPath path) {
try {
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/TwoWayDiff.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/TwoWayDiff.java
index 29aa590a3..015a50811 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/TwoWayDiff.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/TwoWayDiff.java
@@ -47,8 +47,6 @@ public class TwoWayDiff extends Diff implements ITwoWayDiff {
* @param path the path of the model object that has changed
* @param kind the kind of change
* @param flags additional flags that describe the change
- * @param before the before state of the model object
- * @param after the after state of the model object
*/
public TwoWayDiff(IPath path, int kind, int flags) {
super(path, (kind & KIND_MASK) | (flags & ~KIND_MASK));
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/package.html b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/package.html
new file mode 100644
index 000000000..af4a19cb4
--- /dev/null
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/package.html
@@ -0,0 +1,17 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="Author" content="IBM">
+ <title>Package-level Javadoc</title>
+</head>
+<body>
+Application programming interfaces for working with diffs.
+<h2>
+Package Specification</h2>
+This package specifies the API for working with diffs. Diffs are used to describe
+differences between two or more states of the same model. The API supports diff
+descriptions between model elements and model hierarchies. The API also supports
+specific diffs for the <code>IResource</code> model.
+</body>
+</html> \ No newline at end of file
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 a599607aa..c57ff9e74 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
@@ -29,7 +29,7 @@ import org.eclipse.team.core.history.ITag;
* consulting with the Platform/Team team.
* </p>
*
- * @see IFileRevisione
+ * @see IFileRevision
*
* @since 3.2
*/
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/provider/package.html b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/provider/package.html
new file mode 100644
index 000000000..b82a108b1
--- /dev/null
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/provider/package.html
@@ -0,0 +1,17 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="Author" content="IBM">
+ <title>Package-level Javadoc</title>
+</head>
+<body>
+Application programming interfaces for describing the history associated with
+files.
+<h2>
+Package Specification</h2>
+This package specifies the API for describing the history associated with files.
+The history for a file can be obtained from a repository or from the local history
+store.
+</body>
+</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeContext.java
index b7e02b8a9..70c76cf2c 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeContext.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeContext.java
@@ -111,7 +111,7 @@ public interface IMergeContext extends ISynchronizationContext {
* This method will batch change notification by using the
* {@link #run(IWorkspaceRunnable, ISchedulingRule, int, IProgressMonitor) }
* method. The rule for he method will be obtained using
- * {@link #getMergeRule(IResource) } and the flags will be
+ * {@link #getMergeRule(IDiffNode)} and the flags will be
* <code>IResource.NONE</code> meaning that intermittent change events may
* occur. Clients may wrap the call in an outer run that either uses a
* broader scheduling rule or the <code>IWorkspace.AVOID_UPDATES</code>
@@ -167,7 +167,7 @@ public interface IMergeContext extends ISynchronizationContext {
* For two-way merging, as indicated by either the {@link ISynchronizationContext#getType()}
* or {@link #getMergeType()} methods, clients can either accept changes using the
* {@link #merge(IDiffNode[], boolean, IProgressMonitor) } method or reject
- * them using {@link #markAsMerged(IFile, boolean, IProgressMonitor) }.
+ * them using {@link #markAsMerged(IDiffNode, boolean, IProgressMonitor) }.
* Three-way changes are a bit more complicated. The following list
* summarizes how particular remote file changes can be handled. The delta
* kind and flags mentioned in the descriptions are obtained the remote
@@ -213,7 +213,7 @@ public interface IMergeContext extends ISynchronizationContext {
* methods. In the case where there are local changes to the file being
* deleted, the model may either choose to merge using the force flag (thus
* removing the file and the local changes) or call
- * {@link #markAsMerged(IFile, boolean, IProgressMonitor) } on the file
+ * {@link #markAsMerged(IDiffNode, boolean, IProgressMonitor) } on the file
* which will convert the incoming deletion to an outgoing addition.</li>
*
* <li>When the delta kind is {@link IDiffNode#CHANGE} and there is no
@@ -221,7 +221,7 @@ public interface IMergeContext extends ISynchronizationContext {
* {@link #merge(IDiffNode[], boolean, IProgressMonitor) } method to merge
* these changes as this is the most efficient means to do so. However, the
* model can choose to perform the merge themselves and then invoke
- * {@link #markAsMerged(IFile, boolean, IProgressMonitor) } with the
+ * {@link #markAsMerged(IDiffNode, boolean, IProgressMonitor) } with the
* <code>inSyncHint</code> set to <code>true</code> but this will be
* less efficient. </li>
*
@@ -229,17 +229,17 @@ public interface IMergeContext extends ISynchronizationContext {
* conflict, the model can use the
* {@link #merge(IDiffNode[], boolean, IProgressMonitor) } method to merge
* these changes. If the force flag is not set, an auto-merge is attempted
- * using an appropriate {@link IStreamMerger}. If the force flag is set,
+ * using an appropriate {@link IStorageMerger}. If the force flag is set,
* the local changes are discarded. The model can choose to attempt the
* merge themselves and, if it is successful, invoke
- * {@link #markAsMerged(IFile, boolean, IProgressMonitor) } with the
+ * {@link #markAsMerged(IDiffNode, boolean, IProgressMonitor) } with the
* <code>inSyncHint</code> set to <code>false</code> which will make the
* file an outgoing change. </li>
* </ul>
*
* TODO: need to talk about ITwoWayDelta CONTENT and REPLACED
*
- * @see IDiffTree#addDiffChangeListener(org.eclipse.team.core.diff.ISyncDeltaChangeListener)
+ * @see IDiffTree#addDiffChangeListener(IDiffChangeListener)
* @see org.eclipse.core.resources.IWorkspace#addResourceChangeListener(IResourceChangeListener)
*
* @param diff the difference to be merged
@@ -263,7 +263,7 @@ public interface IMergeContext extends ISynchronizationContext {
* This method will batch change notification by using the
* {@link #run(IWorkspaceRunnable, ISchedulingRule, int, IProgressMonitor) }
* method. The rule for he method will be obtained using
- * {@link #getMergeRule(IResource) } and the flags will be
+ * {@link #getMergeRule(IDiffNode) } and the flags will be
* <code>IResource.NONE</code> meaning that intermittent change events may
* occur. Clients may wrap the call in an outer run that either uses a
* broader scheduling rule or the <code>IWorkspace.AVOID_UPDATES</code>
@@ -304,7 +304,7 @@ public interface IMergeContext extends ISynchronizationContext {
* associated with the given diff. If a resource being merged is a folder or
* project, the returned rule will be sufficient to merge any files
* contained in the folder or project. The returned rule also applies to
- * {@link #markAsMerged(IFile, boolean, IProgressMonitor) }.
+ * {@link #markAsMerged(IDiffNode, boolean, IProgressMonitor) }.
*
* @param node the node to be merged
* @return the scheduling rule that is required to merge the resource of the
@@ -317,7 +317,7 @@ public interface IMergeContext extends ISynchronizationContext {
* associated with the given diffs. If a resource being merged is a folder
* or project, the returned rule will be sufficient to merge any files
* contained in the folder or project. The returned rule also applies to
- * {@link #markAsMerged(IFile, boolean, IProgressMonitor) }.
+ * {@link #markAsMerged(IDiffNode, boolean, IProgressMonitor) }.
*
* @param nodes the nodes being merged
* @return the scheduling rule that is required to merge the resources of
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceDiff.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceDiff.java
index e7a3db014..1b61c764f 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceDiff.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceDiff.java
@@ -43,7 +43,7 @@ public interface IResourceDiff extends ITwoWayDiff {
* For example, if the current state of the resource is open then
* it was previously closed.
*
- * @see ITwoWayDelta#getFlags()
+ * @see ITwoWayDiff#getFlags()
* @see org.eclipse.core.resources.IResourceDelta#OPEN
*/
public static final int OPEN = 0x10000;
@@ -51,7 +51,7 @@ public interface IResourceDiff extends ITwoWayDiff {
/**
* Change constant (bit mask) indicating that a project's description has changed.
*
- * @see ITwoWayDelta#getFlags()
+ * @see ITwoWayDiff#getFlags()
* @see org.eclipse.core.resources.IResourceDelta#DESCRIPTION
*/
public static final int DESCRIPTION = 0x20000;
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceDiffTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceDiffTree.java
index 12e99560e..ebddee9db 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceDiffTree.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceDiffTree.java
@@ -17,9 +17,9 @@ import org.eclipse.team.core.diff.*;
/**
* A resource diff tree provides access to a tree of {@link IDiffNode} instances
- * that either contain {@link org.eclipse.team.core.mapping.provider.IResourceDiff}
+ * that either contain {@link IResourceDiff}
* nodes or {@link IThreeWayDiff} nodes that contain
- * {@link org.eclipse.team.core.mapping.provider.IResourceDiff} nodes as the local and
+ * {@link IResourceDiff} nodes as the local and
* remote changes. For efficiency reasons, the tree only provides diffs for
* resources that have changes. Resources that do not contain a change but are
* returned from the tree will contain children in the set.
@@ -48,7 +48,7 @@ public interface IResourceDiffTree extends IDiffTree {
* Return the resource associated with the given diff. This method will only
* return meaningful results for diffs which were obtained from this tree.
*
- * @param delta a delta
+ * @param diff a diff
* @return the resource associated with the given diff
*/
IResource getResource(IDiffNode diff);
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceMappingMerger.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceMappingMerger.java
index 0b3e8067d..37b6d94dc 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceMappingMerger.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IResourceMappingMerger.java
@@ -36,7 +36,7 @@ import org.eclipse.core.runtime.*;
* {@link ResourceMappingMerger} instead.
*
* @see ResourceMappingMerger
- * @see org.eclipse.compare.IStreamMerger
+ * @see IStorageMerger
* @see org.eclipse.core.resources.mapping.ResourceMapping
* @see org.eclipse.core.resources.mapping.ModelProvider
* @see org.eclipse.team.core.mapping.IMergeContext
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ISynchronizationContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ISynchronizationContext.java
index 3693202d2..edfa816d3 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ISynchronizationContext.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ISynchronizationContext.java
@@ -89,24 +89,24 @@ public interface ISynchronizationContext {
IResourceMappingScope getScope();
/**
- * Return a tree that contains {@link IDiffNode} nodes for resources that
+ * Return a tree that contains {@link IDiffNode} entries for resources that
* are out-of-sync. The tree will contain diffs for any out-of-sync
* resources that are within the scope of this context. The tree may include
* diffs for additional resources, which should be ignored by the client.
* Clients can test for inclusion using the method
* {@link IResourceMappingScope#contains(IResource)}.
* <p>
- * The returned {@link IDiffTree} will be homogeneous and contain either
+ * The returned {@link IResourceDiffTree} will be homogeneous and contain either
* {@link IResourceDiff} or {@link IThreeWayDiff} instances. Any
* {@link IThreeWayDiff} contained in the returned tree will contain
* {@link IResourceDiff} instances as the local and remote changes. This
* interface also has several helper methods for handling diffs contained in
* the returned diff tree.
*
- * @return a tree that contains an <code>IDiffNode</code> node for any
+ * @return a tree that contains an entry for any
* resources that are out-of-sync.
- * @see #getDiffs(ResourceTraversal[])
- * @see #getResource(IDiffNode)
+ * @see IResourceDiffTree#getDiffs(ResourceTraversal[])
+ * @see IResourceDiffTree#getResource(IDiffNode)
*/
public IResourceDiffTree getDiffTree();
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java
index 88651bdf0..9792620da 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java
@@ -311,7 +311,7 @@ public abstract class MergeContext extends SynchronizationContext implements IMe
/**
* Default implementation of <code>run</code> that invokes the
- * corresponding <code>run</code> on {@link IWorkspace}.
+ * corresponding <code>run</code> on {@link org.eclipse.core.resources.IWorkspace}.
* @see org.eclipse.team.core.mapping.IMergeContext#run(org.eclipse.core.resources.IWorkspaceRunnable, org.eclipse.core.runtime.jobs.ISchedulingRule, int, org.eclipse.core.runtime.IProgressMonitor)
*/
public void run(IWorkspaceRunnable runnable, ISchedulingRule rule, int flags, IProgressMonitor monitor) throws CoreException {
@@ -321,7 +321,7 @@ public abstract class MergeContext extends SynchronizationContext implements IMe
/**
* Default implementation that returns the resource itself.
* Subclass should override to provide the appropriate rule.
- * @see org.eclipse.team.core.mapping.IMergeContext#getMergeRule(org.eclipse.core.resources.IResource)
+ * @see org.eclipse.team.core.mapping.IMergeContext#getMergeRule(IDiffNode)
*/
public ISchedulingRule getMergeRule(IDiffNode node) {
return getDiffTree().getResource(node);
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationContext.java
index 698ab63bf..52f6e0a23 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationContext.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationContext.java
@@ -90,7 +90,7 @@ public abstract class SynchronizationContext implements ISynchronizationContext
}
/* (non-Javadoc)
- * @see org.eclipse.team.ui.mapping.ISynchronizationContext#getSyncDeltaTree()
+ * @see org.eclipse.team.core.mapping.ISynchronizationContext#getDiffTree()
*/
public IResourceDiffTree getDiffTree() {
return deltaTree;
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java
index 5d2d534ac..e3fe260a8 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java
@@ -97,8 +97,8 @@ public abstract class SubscriberMergeContext extends MergeContext {
return handler.getSubscriber().getSyncInfo(resource);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.provider.MergeContext#run(org.eclipse.core.resources.IWorkspaceRunnable, org.eclipse.core.runtime.jobs.ISchedulingRule, int, org.eclipse.core.runtime.IProgressMonitor)
+ /**
+ * {@inheritDoc}
*/
public void run(final IWorkspaceRunnable runnable, final ISchedulingRule rule, int flags, IProgressMonitor monitor) throws CoreException {
super.run(runnable, rule, flags, monitor);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/compare/package.html b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/compare/package.html
new file mode 100644
index 000000000..b7df5e348
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/compare/package.html
@@ -0,0 +1,14 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="Author" content="IBM">
+ <title>Package-level Javadoc</title>
+</head>
+<body>
+Application programming interfaces for working with compare
+<h2>
+Package Specification</h2>
+This package specifies the API for working with the compare framework.
+</body>
+</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/package.html b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/package.html
new file mode 100644
index 000000000..2aee35da6
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/package.html
@@ -0,0 +1,14 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="Author" content="IBM">
+ <title>Package-level Javadoc</title>
+</head>
+<body>
+Application programming interfaces for working with history
+<h2>
+Package Specification</h2>
+This package specifies the API for providing history pages to the history view.
+</body>
+</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ICompareAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ICompareAdapter.java
index a7e953e7e..3ccfc49e3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ICompareAdapter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ICompareAdapter.java
@@ -46,7 +46,7 @@ public interface ICompareAdapter {
/**
* Return whether their is a compare input associated with the given object.
- * In otherwords, return <code>true</code> if {@link #asCompareInput(Object) }
+ * In otherwords, return <code>true</code> if {@link #asCompareInput(ISynchronizationContext, Object) }
* would return a value and <code>false</code> if it would return <code>null</code>.
* @param context the synchronization context
* @param object the object.
@@ -82,7 +82,7 @@ public interface ICompareAdapter {
* long outgoing = countFor(context, IThreeWayDiff.OUTGOING, IThreeWayDiff.DIRECTION_MASK);
* </pre>
* </p>
- * @param contxt the synchronization context
+ * @param context the synchronization context
* @param state the sync state
* @param mask the sync state mask
* @return the number of matching resources in the set.
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java
index 5ef65e6cf..dd006b03a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java
@@ -66,8 +66,7 @@ public abstract class MergeActionHandler extends AbstractHandler {
/**
* Create the handler.
- * @param model the extension state model that contains the state
- * provided by the synchronize page display the model.
+ * @param configuration the configiuration for the synchronize page displaying the model.
*/
public MergeActionHandler(ISynchronizePageConfiguration configuration) {
this.configuration = configuration;

Back to the top