diff options
author | Paul Pazderski | 2019-11-22 20:21:33 +0000 |
---|---|---|
committer | Paul Pazderski | 2019-11-22 21:07:29 +0000 |
commit | 5287dcf349f6d783a767a5d064cf3c9522387c06 (patch) | |
tree | 849da0f7545741a9eccc16fda0587cc02d4b74e5 | |
parent | 1db5d00c72dd69ac6161cf04145cc7918842c5c0 (diff) | |
download | eclipse.platform.team-5287dcf349f6d783a767a5d064cf3c9522387c06.tar.gz eclipse.platform.team-5287dcf349f6d783a767a5d064cf3c9522387c06.tar.xz eclipse.platform.team-5287dcf349f6d783a767a5d064cf3c9522387c06.zip |
Bug 548250 - Javadoc problems in platform.teamY20191127-0140Y20191126-0500S4_14_0_RC2aS4_14_0_RC2S4_14_0_RC1R4_14I20191210-0610I20191204-1800I20191204-0600I20191203-1800I20191203-0600I20191202-1800I20191202-0600I20191201-1800I20191201-0600I20191130-1800I20191130-0600I20191129-1800I20191127-1800I20191127-0600I20191126-2315I20191126-1800I20191126-0600I20191125-1800I20191125-0600I20191124-1800I20191124-0600I20191123-1800I20191123-1115I20191123-0600I20191123-0100R4_14_maintenance
Change-Id: Ibd321a8cca382afa1deec69c5fb557a94a15209e
Signed-off-by: Paul Pazderski <paul-eclipse@ppazderski.de>
48 files changed, 129 insertions, 116 deletions
diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/LCS.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/LCS.java index 480e3c08e..c528589a0 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/LCS.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/LCS.java @@ -177,7 +177,7 @@ public abstract class LCS { /** * Helper function for Myers' LCS algorithm to find the middle snake for - * l1[bottoml1..topl1] and l2[bottoml2..topl2] The x, y coodrdinates of the + * l1[bottoml1..topl1] and l2[bottoml2..topl2] The x, y coordinates of the * start of the middle snake are saved in snake[0], snake[1] respectively * and the length of the snake is saved in s[2]. * @@ -191,7 +191,7 @@ public abstract class LCS { * to store furthest reaching D-paths * @param snake should be allocated as int[3], used to store the beginning * x, y coordinates and the length of the middle snake - * @subMonitor subMonitor + * @param subMonitor * * @return The number of differences (SES) between l1[bottoml1..topl1] and * l2[bottoml2..topl2] diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java index a6cef6046..49c3ba21d 100644 --- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java +++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java @@ -123,8 +123,7 @@ public class WordComparison { * * <p>An exception is thrown if the id cannot be retrieved</p> * - * Reference information for id assignment: <a href=" - * http://msdn.microsoft.com/en-us/library/w7a36sdf%28VS.80%29.aspx">http://msdn.microsoft.com/en-us/library/w7a36sdf%28VS.80%29.aspx</a> + * Reference information for id assignment: <a href="http://msdn.microsoft.com/en-us/library/w7a36sdf%28VS.80%29.aspx">http://msdn.microsoft.com/en-us/library/w7a36sdf%28VS.80%29.aspx</a> * * @param auto - object from which we want to get the property, must not be <code>null</code> * @param reference - an reference object from which the property will be obtained. diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java index 94613e2f1..9fd561c59 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java @@ -127,7 +127,7 @@ public class CompareResourceFilter { * <li> * * <pre> - * pattern = { '?', 'b', '*' } name = { 'a', 'b', 'c' , 'd' } isCaseSensitive = true result => true + * pattern = { '?', 'b', '*' } name = { 'a', 'b', 'c' , 'd' } isCaseSensitive = true result => true * </pre> * * @@ -135,7 +135,7 @@ public class CompareResourceFilter { * <li> * * <pre> - * pattern = { '?', 'b', '?' } name = { 'a', 'b', 'c' , 'd' } isCaseSensitive = true result => false + * pattern = { '?', 'b', '?' } name = { 'a', 'b', 'c' , 'd' } isCaseSensitive = true result => false * </pre> * * @@ -143,7 +143,7 @@ public class CompareResourceFilter { * <li> * * <pre> - * pattern = { 'b', '*' } name = { 'a', 'b', 'c' , 'd' } isCaseSensitive = true result => false + * pattern = { 'b', '*' } name = { 'a', 'b', 'c' , 'd' } isCaseSensitive = true result => false * </pre> * * @@ -179,7 +179,7 @@ public class CompareResourceFilter { * <li> * * <pre> - * pattern = { '?', 'b', '*' } patternStart = 1 patternEnd = 3 name = { 'a', 'b', 'c' , 'd' } nameStart = 1 nameEnd = 4 isCaseSensitive = true result => true + * pattern = { '?', 'b', '*' } patternStart = 1 patternEnd = 3 name = { 'a', 'b', 'c' , 'd' } nameStart = 1 nameEnd = 4 isCaseSensitive = true result => true * </pre> * * @@ -187,7 +187,7 @@ public class CompareResourceFilter { * <li> * * <pre> - * pattern = { '?', 'b', '*' } patternStart = 1 patternEnd = 2 name = { 'a', 'b', 'c' , 'd' } nameStart = 1 nameEnd = 2 isCaseSensitive = true result => false + * pattern = { '?', 'b', '*' } patternStart = 1 patternEnd = 2 name = { 'a', 'b', 'c' , 'd' } nameStart = 1 nameEnd = 2 isCaseSensitive = true result => false * </pre> * * @@ -278,7 +278,7 @@ public class CompareResourceFilter { * <li> * * <pre> - * divider = 'b' array = { 'a' , 'b', 'b', 'a', 'b', 'a' } result => { { 'a' }, { }, { 'a' }, { 'a' } } + * divider = 'b' array = { 'a' , 'b', 'b', 'a', 'b', 'a' } result => { { 'a' }, { }, { 'a' }, { 'a' } } * </pre> * * @@ -286,7 +286,7 @@ public class CompareResourceFilter { * <li> * * <pre> - * divider = 'c' array = { 'a' , 'b', 'b', 'a', 'b', 'a' } result => { { 'a', 'b', 'b', 'a', 'b', 'a' } } + * divider = 'c' array = { 'a' , 'b', 'b', 'a', 'b', 'a' } result => { { 'a', 'b', 'b', 'a', 'b', 'a' } } * </pre> * * @@ -294,7 +294,7 @@ public class CompareResourceFilter { * <li> * * <pre> - * divider = 'b' array = { 'a' , ' ', 'b', 'b', 'a', 'b', 'a' } result => { { 'a' }, { }, { 'a' }, { 'a' } } + * divider = 'b' array = { 'a' , ' ', 'b', 'b', 'a', 'b', 'a' } result => { { 'a' }, { }, { 'a' }, { 'a' } } * </pre> * * @@ -302,7 +302,7 @@ public class CompareResourceFilter { * <li> * * <pre> - * divider = 'c' array = { ' ', ' ', 'a' , 'b', 'b', 'a', 'b', 'a', ' ' } result => { { 'a', 'b', 'b', 'a', 'b', 'a' } } + * divider = 'c' array = { ' ', ' ', 'a' , 'b', 'b', 'a', 'b', 'a', ' ' } result => { { 'a', 'b', 'b', 'a', 'b', 'a' } } * </pre> * * @@ -360,7 +360,7 @@ public class CompareResourceFilter { * <li> * * <pre> - * array = { 'a' , 'b' } start = 0 end = 1 result => { 'a' } + * array = { 'a' , 'b' } start = 0 end = 1 result => { 'a' } * </pre> * * @@ -368,7 +368,7 @@ public class CompareResourceFilter { * <li> * * <pre> - * array = { 'a', 'b' } start = 0 end = -1 result => { 'a' , 'b' } + * array = { 'a', 'b' } start = 0 end = -1 result => { 'a' , 'b' } * </pre> * * diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceHandler.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceHandler.java index bfcf86823..224638212 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceHandler.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithOtherResourceHandler.java @@ -26,7 +26,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** * This is a temporary replacement for CompareWithOtherResourceAction which was - * available from "Compare With > Other Resource...". See bug 264498. + * available from "Compare With > Other Resource...". See bug 264498. */ public class CompareWithOtherResourceHandler extends AbstractHandler { diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java index 7eaeaa8b0..b375e7bcd 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java @@ -43,7 +43,7 @@ public class DocLineComparator implements ITokenComparator { /** * Creates a <code>DocLineComparator</code> for the given document range. * ignoreWhiteSpace controls whether comparing lines (in method - * <code>rangesEqual<code>) should ignore whitespace. + * <code>rangesEqual</code>) should ignore whitespace. * * @param document the document from which the lines are taken * @param region if non-<code>null</code> only lines within this range are taken @@ -57,7 +57,7 @@ public class DocLineComparator implements ITokenComparator { /** * Creates a <code>DocLineComparator</code> for the given document range. * ignoreWhiteSpace controls whether comparing lines (in method - * <code>rangesEqual<code>) should ignore whitespace. Compare filters may be used + * <code>rangesEqual</code>) should ignore whitespace. Compare filters may be used * to affect the detection of line differences. * * @param document diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageCanvas.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageCanvas.java index c143352ff..15affc0b7 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageCanvas.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageCanvas.java @@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.ScrollBar; /** * A <code>Canvas</code> showing a single centered SWT <code>Image</code>. - * If the <code>Image</code> is larger than the <code>Canvas<code>, + * If the <code>Image</code> is larger than the <code>Canvas</code>, * <code>Scrollbars</code> will appear. */ class ImageCanvas extends Canvas { diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/StringMatcher.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/StringMatcher.java index 7b33a9e78..141e11588 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/StringMatcher.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/StringMatcher.java @@ -50,7 +50,7 @@ public class StringMatcher { } } /** - * Find the first occurrence of the pattern between <code>start</code)(inclusive) + * Find the first occurrence of the pattern between <code>start</code>)(inclusive) * and <code>end</code>(exclusive). * @param text the String object to search in * @param start the starting index of the search range, inclusive diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java index b53ac4eaa..1e5479fa0 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java @@ -48,9 +48,9 @@ public final class ProxyProviderUtil { * or map. <br> * The proxy list contains one or more of the following strings separated by * semicolons:<br> - * <code><pre> + * <pre><code> * ([<scheme>=][<scheme> "://" ]<server>[ ":" <port>]) - * </pre></code> + * </code></pre> * * @param proxyList * the proxy list as a string diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java index 05f853737..cc8cd0ee6 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java @@ -25,7 +25,7 @@ import org.eclipse.core.net.proxy.IProxyData; /** * The <code>WinHttpProxyProvivider</code> gets its settings from the - * "internet options >> connection settings". For this it uses the Windows + * "internet options >> connection settings". For this it uses the Windows * WinHttp API. * * @see "http://msdn2.microsoft.com/en-us/library/aa382925(VS.85).aspx" diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/IBundleImporterDelegate.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/IBundleImporterDelegate.java index ee5100a29..b9f1c22a3 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/IBundleImporterDelegate.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/IBundleImporterDelegate.java @@ -26,6 +26,7 @@ import org.eclipse.team.core.ScmUrlImportDescription; * on bundle manifest entries. * <p> * Following is an example extension: + * </p> * * <pre> * <extension point="org.eclipse.team.core.bundleImporters"> @@ -36,7 +37,6 @@ import org.eclipse.team.core.ScmUrlImportDescription; * </extension> * </pre> * - * </p> * <p> * Clients contributing bundle importer extensions are intended to implement * this interface. They can also subclass {@link BundleImporterDelegate}. diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/BackgroundEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/BackgroundEventHandler.java index 0b6b9a1c8..f5af7e20b 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/BackgroundEventHandler.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/BackgroundEventHandler.java @@ -38,9 +38,9 @@ import org.eclipse.team.core.TeamException; * which cannot be performed in the delta handler because the workspace is locked.</li> * <li>a data structure is not thread safe and requires serialized operations.<li> * </ul> - * </p> * <p> * The event handler has the following characteristics: + * </p> * <ol> * <li>Incoming events are placed in an incoming queue.</li> * <li>Each event is processed by calling the <code>processEvent</code> method @@ -53,8 +53,7 @@ import org.eclipse.team.core.TeamException; * operations.<li> * <li>Errors that occur during event processing or dispatch can be accumulated by calling the <code>handle</code> * method. Accumulated errors are used to form the status that is returned when the job completes.<li> - * </ul> - * </p> + * </ol> * * @since 3.0 */ diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java index 7cd58fbd0..c64e55aad 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java @@ -25,7 +25,7 @@ import org.eclipse.team.core.synchronize.SyncInfo; public class DiffTreeStatistics { /** - * {Integer sync kind -> Long number of infos with that sync kind in this sync set} + * {Integer sync kind -> Long number of infos with that sync kind in this sync set} */ protected Map<Integer, Long> stats = Collections.synchronizedMap(new HashMap<>()); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java index d6c585941..a0086a42e 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java @@ -53,7 +53,7 @@ public class SyncByteConverter { /** * Method startOfSlot returns the index of the slash that occurs before the - * given slot index. The provided index should be >= 1 which assumes that + * given slot index. The provided index should be >= 1 which assumes that * slot zero occurs before the first slash. * * @param syncBytes diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java index aed5ad6f3..3cfce1ef2 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java @@ -272,7 +272,8 @@ public class CVSTeamProvider extends RepositoryProvider { /** * Sets the keyword substitution mode for the specified resources. * <p> - * Applies the following rules in order:<br> + * Applies the following rules in order: + * </p> * <ul> * <li>If a file is not managed, skips it.</li> * <li>If a file is not changing modes, skips it.</li> @@ -285,7 +286,6 @@ public class CVSTeamProvider extends RepositoryProvider { * casually trying to commit pending changes to the repository without first checking out * a new copy. This is not a perfect solution, as they could just as easily do an UPDATE * and not obtain the new keyword sync info. - * </p> * * @param changeSet a map from IFile to KSubstOption * @param monitor the progress monitor @@ -419,7 +419,7 @@ public class CVSTeamProvider extends RepositoryProvider { /** * This method translates the contents of a file from binary into text (ASCII). * Fixes the line delimiters in the local file to reflect the platform's - * native encoding. Performs CR/LF -> LF or LF -> CR/LF conversion + * native encoding. Performs CR/LF -> LF or LF -> CR/LF conversion * depending on the platform but does not affect delimiters that are * already correctly encoded. */ diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSFile.java index 17964ed15..4cb4afe15 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSFile.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSFile.java @@ -107,7 +107,7 @@ public interface ICVSFile extends ICVSResource, ICVSStorage { /** * Answers whether the file is executable or not. * - * @returns <code>false</code> if the platform doesn't support the executable flag. + * @return <code>false</code> if the platform doesn't support the executable flag. */ public boolean isExecutable() throws CVSException; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSFileModificationValidator.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSFileModificationValidator.java index 460ae70e9..535d3b524 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSFileModificationValidator.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSFileModificationValidator.java @@ -21,9 +21,9 @@ import org.eclipse.core.runtime.IStatus; * @author Administrator * * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. + * Window>Preferences>Java>Templates. * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. + * Window>Preferences>Java>Code Generation. */ public interface ICVSFileModificationValidator { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/IUserAuthenticator.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/IUserAuthenticator.java index 10313ce9a..0f1eae70d 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/IUserAuthenticator.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/IUserAuthenticator.java @@ -88,7 +88,7 @@ public interface IUserAuthenticator { /** * Prompts the user for a number values using text fields. The labels are provided in - * the <core>prompt</code> array. Implementors will return the entered values, or null if + * the <code>prompt</code> array. Implementors will return the entered values, or null if * the user cancel the prompt. * * @param location The repository location to authenticate the user for or <code>null</code> diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CheckedInHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CheckedInHandler.java index d2a8af7fa..ea892ca1e 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CheckedInHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CheckedInHandler.java @@ -23,14 +23,14 @@ import org.eclipse.team.internal.ccvs.core.util.Util; * Handles a "Checked-in" response from the CVS server. * <p> * Suppose as a result of performing a command the CVS server responds - * as follows:<br> + * as follows: + * </p> * <pre> * [...] * Checked-in ??? \n * [...] * </pre> - * Then - * </p> + * Then */ class CheckedInHandler extends ResponseHandler { public String getResponseID() { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java index 885ddd29e..e800d790b 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java @@ -785,7 +785,7 @@ public abstract class Command extends Request { * Execute a CVS command on an array of ICVSResource. This method simply converts * the ICVSResource to String paths relative to the local root of the session and * invokes <code>execute(Session, GlobalOption[], LocalOption[], String[], ICommandOutputListener, IProgressMonitor)</code>. - * </p> + * * @param session the open CVS session * @param globalOptions the array of global options, or NO_GLOBAL_OPTIONS * @param localOptions the array of local options, or NO_LOCAL_OPTIONS diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CopyHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CopyHandler.java index 793bc37a1..0923ced79 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CopyHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CopyHandler.java @@ -22,7 +22,8 @@ import org.eclipse.team.internal.ccvs.core.*; * Handles a "Copy-file" response from the CVS server. * <p> * Suppose as a result of performing a command the CVS server responds - * as follows:<br> + * as follows: + * </p> * <pre> * [...] * Copy-file myproject/ \n @@ -33,7 +34,6 @@ import org.eclipse.team.internal.ccvs.core.*; * Then we copy (or optionally rename) the local file "oldfile.txt" in * folder "myproject" to "newfile.txt". This response is used to create * a backup copy of an existing file before merging in new changes. - * </p> */ class CopyHandler extends ResponseHandler { public String getResponseID() { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModTimeHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModTimeHandler.java index 307f18842..4d9957cb3 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModTimeHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModTimeHandler.java @@ -26,7 +26,8 @@ import org.eclipse.team.internal.ccvs.core.util.CVSDateFormatter; * Handles a "Mod-time" response from the CVS server. * <p> * Suppose as a result of performing a command the CVS server responds - * as follows:<br> + * as follows: + * </p> * <pre> * [...] * Mod-time 18 Oct 2001 20:21:13 -0330\n @@ -34,7 +35,6 @@ import org.eclipse.team.internal.ccvs.core.util.CVSDateFormatter; * </pre> * Then we parse and remember the date for use in subsequent * file transfer responses such as Updated. - * </p> */ class ModTimeHandler extends ResponseHandler { public String getResponseID() { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java index 6df20e6e4..d87423d45 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java @@ -23,9 +23,9 @@ import org.eclipse.team.internal.ccvs.core.ICVSFolder; * @author Administrator * * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. + * Window>Preferences>Java>Templates. * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. + * Window>Preferences>Java>Code Generation. */ public class NotifiedHandler extends ResponseHandler { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RLog.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RLog.java index b0857c4a0..e75d8dbfb 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RLog.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RLog.java @@ -30,13 +30,14 @@ public class RLog extends RemoteCommand { /** * Makes a -r option for rlog. Here are the currently supported options: * - * tag1 tag2 result - * ==== ==== ================================= - * date date date<date (all revisions between date and later) - * tag tag tag:tag (all revisions between tag and tag, must be on same branch) - * branch date >date (all revisions of date or later) - * branch tag tag: (all revisions from tag to the end of branchs tip) - * + * <pre>{@code + * tag1 tag2 result + * ====== ==== ================================= + * date date date<date (all revisions between date and later) + * tag tag tag:tag (all revisions between tag and tag, must be on same branch) + * branch date >date (all revisions of date or later) + * branch tag tag: (all revisions from tag to the end of branchs tip) + * }</pre> * Valid for: rlog */ public static LocalOption makeTagOption(CVSTag tag1, CVSTag tag2) { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java index 6a1827aba..b6d940dfd 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java @@ -37,7 +37,8 @@ public abstract class ResponseHandler { * Handles a server response. * <p> * Suppose as a result of performing a command the CVS server responds - * as follows:<br> + * as follows: + * </p> * <pre> * [...] * Clear-sticky myDirectory \n @@ -48,8 +49,7 @@ public abstract class ResponseHandler { * for <em>Clear-sticky</em> will be invoked with <code>argument</code> * set to <em>"myDirectory"</em>. It must then read the remaining * response data from the connection (<em>"/u/cvsroot/myDirectory"</em> - * including the newline) and take any necessary action. - * </p><p> + * including the newline) and take any necessary action.<p> * Note: The type and quantity of additional data that must be read * from the connection varies on a per-response basis. * </p> diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java index c07dc5ef0..aabc321dc 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java @@ -313,12 +313,12 @@ public class Session { /** * Sends an argument to the server. - * <p>e.g. sendArgument("Hello\nWorld\n Hello World") sends: + * <p>e.g. sendArgument("Hello\nWorld\n Hello World") sends:</p> * <pre> * Argument Hello \n * Argumentx World \n * Argumentx Hello World \n - * </pre></p> + * </pre> * * @param arg the argument to send */ @@ -357,10 +357,10 @@ public class Session { /** * Sends an Is-modified request to the server without the file contents. - * <p>e.g. if a file called "local_file" was modified, sends: + * <p>e.g. if a file called "local_file" was modified, sends:</p> * <pre> * Is-modified local_file \n - * </pre></p><p> + * </pre><p> * This request is an optimized form of the Modified request and may not * be supported by all servers. Hence, if it is not supported, a Modified * request is sent instead along with the file's contents. According to @@ -420,11 +420,11 @@ public class Session { /** * Sends a Directory request to the server. - * <p>e.g. sendDirectory("local_dir", "remote_dir") sends: + * <p>e.g. sendDirectory("local_dir", "remote_dir") sends:</p> * <pre> * Directory local_dir * repository_root/remote_dir - * </pre></p> + * </pre> * * @param localDir the path of the local directory relative to localRoot * @param remoteDir the path of the remote directory relative to repositoryRoot @@ -492,10 +492,10 @@ public class Session { /** * Sends a global options to the server. - * <p>e.g. sendGlobalOption("-n") sends: + * <p>e.g. sendGlobalOption("-n") sends:</p> * <pre> * Global_option -n \n - * </pre></p> + * </pre> * * @param option the global option to send */ @@ -563,13 +563,13 @@ public class Session { /** * Sends a Modified request to the server along with the file contents. - * <p>e.g. if a file called "local_file" was modified, sends: + * <p>e.g. if a file called "local_file" was modified, sends:</p> * <pre> * Modified local_file \n * file_permissions \n * file_size \n * [... file_contents ...] - * </pre></p><p> + * </pre><p> * Under some circumstances, Is-modified may be used in place of this request.<br> * Do not use with history, init, import, rdiff, release, rtag, or update. * </p><p> diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StaticHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StaticHandler.java index 59c21d149..c831b408f 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StaticHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StaticHandler.java @@ -26,7 +26,8 @@ import org.eclipse.team.internal.ccvs.core.syncinfo.MutableFolderSyncInfo; * from the CVS server. * <p> * Suppose as a result of performing a command the CVS server responds - * as follows:<br> + * as follows: + * </p> * <pre> * [...] * Set-static-directory myproject/ \n @@ -35,7 +36,6 @@ import org.eclipse.team.internal.ccvs.core.syncinfo.MutableFolderSyncInfo; * </pre> * Then we set or clear the static flag of the folder "myproject", * automatically creating it if it does not exist locally, - * </p> */ class StaticHandler extends ResponseHandler { private final boolean setStaticDirectory; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StickyHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StickyHandler.java index 48fe582ff..b03786434 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StickyHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StickyHandler.java @@ -25,7 +25,8 @@ import org.eclipse.team.internal.ccvs.core.syncinfo.MutableFolderSyncInfo; * Handles any "Set-sticky" and "Clear-stick" responses from the CVS server. * <p> * Suppose as a result of performing a command the CVS server responds - * as follows:<br> + * as follows: + * </p> * <pre> * [...] * Set-sticky myproject/ \n @@ -35,7 +36,6 @@ import org.eclipse.team.internal.ccvs.core.syncinfo.MutableFolderSyncInfo; * </pre> * Then we set or clear the sticky tag property of the folder "myproject", * automatically creating it if it does not exist locally, - * </p> */ class StickyHandler extends ResponseHandler { private final boolean setSticky; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java index 22dfd4246..4b1d8d18c 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java @@ -26,9 +26,9 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; * @author Administrator * * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. + * Window>Preferences>Java>Templates. * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. + * Window>Preferences>Java>Code Generation. */ public class TemplateHandler extends ResponseHandler { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ValidRequestsHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ValidRequestsHandler.java index 6e8ee42e8..fe0b101cd 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ValidRequestsHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ValidRequestsHandler.java @@ -22,7 +22,8 @@ import org.eclipse.team.internal.ccvs.core.client.Session; * Handles a "Valid-requests" response from the CVS server. * <p> * Suppose as a result of performing a command the CVS server responds - * as follows:<br> + * as follows: + * </p> * <pre> * [...] * Valid-requests ci co update Root Directory Valid-responses Argument ...\n @@ -30,7 +31,6 @@ import org.eclipse.team.internal.ccvs.core.client.Session; * </pre> * Then we remember the set of valid requests for this session in * preparation for isValidRequests queries. - * </p> */ class ValidRequestsHandler extends ResponseHandler { public String getResponseID() { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/StatusListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/StatusListener.java index 4af630c88..83c5e2d7f 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/StatusListener.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/StatusListener.java @@ -71,8 +71,8 @@ public class StatusListener extends CommandOutputListener { * If the status returns that the file is in the Attic, then remove the * Attic segment. This is because files added to a branch that are not in * the main trunk (HEAD) are added to the Attic but cvs does magic on - * updateto put them in the correct location. - * (e.g. /project/Attic/file.txt -> /project/file.txt) + * update to put them in the correct location. + * (e.g. /project/Attic/file.txt -> /project/file.txt) */ private String removeAtticSegment(String path) { return Util.removeAtticSegment(path); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java index 4294fa055..8a3e9d92f 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java @@ -266,7 +266,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit * The status of the exception indicates success or failure. The status * of the exception contains a specific message suitable for displaying * to a user who has knowledge of the provided location string. - * @see CVSRepositoryLocation.fromString(String) + * @see CVSRepositoryLocation#fromString(String) */ public static CVSRepositoryLocation fromString(String location, boolean validateOnly) throws CVSException { String errorMessage = null; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnection.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnection.java index 5e33e784f..7b2992532 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnection.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnection.java @@ -89,7 +89,7 @@ public class ExtConnection implements IServerConnection { /** * Opens the connection and invokes cvs in server mode. * - * @see Connection.open() + * @see Connection#open() */ public void open(IProgressMonitor monitor) throws IOException { String[] command = ((CVSRepositoryLocation)location).getExtCommand(password); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSURI.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSURI.java index 2d1832567..eb98eefc9 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSURI.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/CVSURI.java @@ -46,9 +46,9 @@ public class CVSURI { * note, that URIs with the pipe separator are currently not supported. * * <ul> - * <li>cvs://[:]method:user[:password]@host:[port]/root/path#project/path[,tagName]</li> - * <li>cvs://_method_user[_password]~host_[port]!root!path/project/path[?<version,branch,date,revision>=tagName]</li> - * <li>scm:cvs<delimiter>method<delimiter>[user[<delimiter>password]@]host[<delimiter>port]<delimiter>/root/path<delimiter>project/path[;project="projectName"][;tag=tagName]</li> + * <li>{@literal cvs://[:]method:user[:password]@host:[port]/root/path#project/path[,tagName]}</li> + * <li>{@literal cvs://_method_user[_password]~host_[port]!root!path/project/path[?<version,branch,date,revision>=tagName]}</li> + * <li>{@literal scm:cvs<delimiter>method<delimiter>[user[<delimiter>password]@]host[<delimiter>port]<delimiter>/root/path<delimiter>project/path[;project="projectName"][;tag=tagName]}</li> * </ul> * @param uri the URI * @return a CVS URI diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java index 7546634f8..21e20cb93 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java @@ -101,7 +101,8 @@ public class EclipseSynchronizer implements IFlushOperation { * * @param folder the folder * @param info the folder sync info, must not be null - * @see #getFolderSync, #deleteFolderSync + * @see #getFolderSync + * @see #deleteFolderSync */ public void setFolderSync(IContainer folder, FolderSyncInfo info) throws CVSException { Assert.isNotNull(info); // enforce the use of deleteFolderSync @@ -144,7 +145,8 @@ public class EclipseSynchronizer implements IFlushOperation { * * @param folder the folder * @return the folder sync info associated with the folder, or null if none. - * @see #setFolderSync, #deleteFolderSync + * @see #setFolderSync + * @see #deleteFolderSync */ public FolderSyncInfo getFolderSync(IContainer folder) throws CVSException { if (folder.getType() == IResource.ROOT || !isValid(folder)) return null; @@ -166,7 +168,8 @@ public class EclipseSynchronizer implements IFlushOperation { * for all of its children. Does not recurse. * * @param folder the folder - * @see #getFolderSync, #setFolderSync + * @see #getFolderSync + * @see #setFolderSync */ public void deleteFolderSync(IContainer folder) throws CVSException { if (folder.getType() == IResource.ROOT || !isValid(folder)) return; @@ -211,7 +214,8 @@ public class EclipseSynchronizer implements IFlushOperation { * * @param resource the resource * @param info the resource sync info, must not be null - * @see #getResourceSync, #deleteResourceSync + * @see #getResourceSync + * @see #deleteResourceSync */ public void setResourceSync(IResource resource, ResourceSyncInfo info) throws CVSException { Assert.isNotNull(info); // enforce the use of deleteResourceSync @@ -243,7 +247,8 @@ public class EclipseSynchronizer implements IFlushOperation { * * @param resource the resource * @return the resource sync info associated with the resource, or null if none. - * @see #setResourceSync, #deleteResourceSync + * @see #setResourceSync + * @see #deleteResourceSync */ public ResourceSyncInfo getResourceSync(IResource resource) throws CVSException { byte[] info = getSyncBytes(resource); @@ -256,7 +261,8 @@ public class EclipseSynchronizer implements IFlushOperation { * * @param resource the resource * @return the resource sync info associated with the resource, or null if none. - * @see #setResourceSync, #deleteResourceSync + * @see #setResourceSync + * @see #deleteResourceSync */ public byte[] getSyncBytes(IResource resource) throws CVSException { IContainer parent = resource.getParent(); @@ -294,7 +300,8 @@ public class EclipseSynchronizer implements IFlushOperation { * * @param resource the resource * @param info the resource sync info, must not be null - * @see #getResourceSync, #deleteResourceSync + * @see #getResourceSync + * @see #deleteResourceSync */ public void setSyncBytes(IResource resource, byte[] syncBytes) throws CVSException { Assert.isNotNull(syncBytes); // enforce the use of deleteResourceSync @@ -325,7 +332,8 @@ public class EclipseSynchronizer implements IFlushOperation { * Deletes the resource sync info for the specified resource, if it exists. * * @param resource the resource - * @see #getResourceSync, #setResourceSync + * @see #getResourceSync + * @see #setResourceSync */ public void deleteResourceSync(IResource resource) throws CVSException { IContainer parent = resource.getParent(); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java index d58011df4..28d3ab039 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java @@ -106,7 +106,7 @@ public class FolderSyncInfo { return true; } /** - * Gets the root, cannot be <code>null. + * Gets the root, cannot be <code>null</code>. * * @return Returns a String */ diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java index 14f23c3ce..9817e5e7f 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java @@ -691,7 +691,7 @@ public class ResourceSyncInfo { } /** * Method startOfSlot returns the index of the slash that occurs before the - * given slot index. The provided index should be >= 1 which assumes that + * given slot index. The provided index should be >= 1 which assumes that * slot zero occurs before the first slash. * * @param syncBytes diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java index 71f680f27..58404355d 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java @@ -536,7 +536,7 @@ public class Util { * Attic segment. This is because files added to a branch that are not in * the main trunk (HEAD) are added to the Attic but cvs does magic on * update to put them in the correct location. - * (e.g. /project/Attic/file.txt -> /project/file.txt) + * (e.g. /project/Attic/file.txt -> /project/file.txt) */ public static String removeAtticSegment(String path) { int lastSeparator = path.lastIndexOf(Session.SERVER_SEPARATOR); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java index a76f60759..323e7ebd4 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java @@ -32,9 +32,9 @@ import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog; * @author Administrator * * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. + * Window>Preferences>Java>Templates. * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. + * Window>Preferences>Java>Code Generation. */ public class WorkingSetSelectionArea extends DialogArea { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java index 4f627b2b3..caf98ac74 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java @@ -83,8 +83,8 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider { } /** - * Escape a string so it can be used as an action text without '&' - * being interpreted as a mnemonic. Specifically, turn each '&' into '&&'. + * Escape a string so it can be used as an action text without '&' + * being interpreted as a mnemonic. Specifically, turn each '&' into '&&'. */ /* package */static String escapeActionText(String x) { // Loosely based on org.eclipse.jface.action.LegacyActionTools#removeMnemonics diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java index 55c630c0f..bcda4a1ee 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java @@ -39,7 +39,7 @@ import org.eclipse.ui.PlatformUI; * @author Administrator * * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments + * Window>Preferences>Java>Code Generation>Code and Comments */ public class CheckoutAsLocationSelectionPage extends CVSWizardPage { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java index 946ae0f5c..762dcad51 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java @@ -59,6 +59,7 @@ import org.eclipse.ui.actions.ActionGroup; * viewer can be configured to show object contributions for random id schemes. * To enable declarative action contributions for a configuration there are two * steps required: + * </p> * <ul> * <li>Create a viewer contribution with a <code>targetID</code> that groups * sets of actions that are related. A common practice for synchronize view @@ -74,7 +75,7 @@ import org.eclipse.ui.actions.ActionGroup; * <li>Create a configuration instance with a <code>menuID</code> that * matches the targetID in the viewer contribution. * </ul> - * </p><p> + * <p> * Clients may subclass to add behavior for concrete structured viewers. * </p> * diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java index 472bcd309..bbc3e5fc8 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java @@ -76,25 +76,31 @@ import org.eclipse.ui.XMLMemento; * of dynamic participants, and the re-creation of persisted participants. * <p> * A participant is defined in a plugin manifest and can have several properties: - * - static: means that they always exist and don't have to be added to the manager - * - dynamic: will be added to the manager at some later time + * <ul> + * <li>static: means that they always exist and don't have to be added to the manager + * <li>dynamic: will be added to the manager at some later time + * </ul> * * Part (title, id, icon, composite) - described in plugin.xml (IPartInstance) - * Can have multiple parts of the same type at runtime -> (IPart) - * - must acquire a part (IPartInstance.createPart()) - * - must released to part when done (IPartInstance.releasePart()) + * Can have multiple parts of the same type at runtime -> (IPart) + * <ul> + * <li>must acquire a part (IPartInstance.createPart()) + * <li>must released to part when done (IPartInstance.releasePart()) + * </ul> * Some parts can added dynamically to the registry and events are fired to listeners. Listeners can create the newly added part via * the #createPart() method. * Parts can be persisted/restored with some state * * - * + * <p> * Lifecycle: - * startup -> registry read and stored in a participant instance - * createParticipant(id) -> - * releaseParticipant(IParticipantDescriptor) -> - * getParticipantRegistry -> return IParticipantDescriptors that describe the participants - * shutdown -> persist all settings + * </p><p> + * startup -> registry read and stored in a participant instance + * createParticipant(id) -> + * releaseParticipant(IParticipantDescriptor) -> + * getParticipantRegistry -> return IParticipantDescriptors that describe the participants + * shutdown -> persist all settings + * </p> * * @see ISynchronizeView * @see ISynchronizeParticipant @@ -118,7 +124,7 @@ public class SynchronizeManager implements ISynchronizeManager { /** * Contains a table of the state saved between sessions for a participant. The set is keyed - * as such {String key -> ISynchronizeParticipantReference}. + * as such {String key -> ISynchronizeParticipantReference}. */ private Map<String, ISynchronizeParticipantReference> participantReferences = Collections.synchronizedMap(new HashMap<>(10)); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java index d8e6532b7..fef25a7f6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java @@ -39,7 +39,7 @@ public class ImportProjectSetOperation extends TeamOperation { * * @param context * a runnable context, - * <code>null</null> for running in background + * <code>null</code> for running in background * @param psfFileContents * the psf file content to load * @param urlString diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java index 74ec241be..3a40b5c43 100644 --- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java +++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java @@ -42,7 +42,6 @@ import org.osgi.framework.BundleContext; /** * This class is the plug-in runtime class for the * <code>"org.eclipse.compare.xml"</code> plug-in. - * </p> */ public final class XMLPlugin extends AbstractUIPlugin { diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/MessageLine.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/MessageLine.java index a22427702..61564954c 100644 --- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/MessageLine.java +++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/MessageLine.java @@ -89,7 +89,7 @@ public class MessageLine extends CLabel { /** * Get the currently displayed message. - * @return The message. If no message is displayed <code>null<code> is returned. + * @return The message. If no message is displayed <code>null</code> is returned. */ public String getMessage() { return fMessageText; diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java index f7a8b7e41..6c296c7bb 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java @@ -68,7 +68,7 @@ public class PessimisticFilesystemProvider extends RepositoryProvider { private FileModificationValidator validator; /** * The cache of resources that are currently controlled. - * The cache is a map of parent resource -> set of controlled children. + * The cache is a map of parent resource -& set of controlled children. */ Map<IContainer, Set<IResource>> fControlledResources; diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java index 8b5f16e11..febf0aa3a 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java @@ -87,7 +87,7 @@ public class WorkspaceTest extends ResourceTest { /** * Creates filesystem 'resources' with the given names and fills them with random text. * @param container An object that can hold the newly created resources. - * @param hierarchy A list of files & folder names to use as resources + * @param hierarchy A list of files & folder names to use as resources * @param includeContainer A flag that controls whether the container is included in the list of resources. * @return IResource[] An array of resources filled with variable amounts of random text * @throws CoreException diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/TestConnection.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/TestConnection.java index 862a45934..bcf457daa 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/TestConnection.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/TestConnection.java @@ -29,7 +29,7 @@ import org.eclipse.team.internal.ccvs.core.connection.CVSAuthenticationException * @author Administrator * * To change this generated comment go to - * Window>Preferences>Java>Code Generation>Code and Comments + * Window>Preferences>Java>Code Generation>Code and Comments */ public class TestConnection implements IServerConnection { public static TestConnection currentConnection; |