diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse')
24 files changed, 72 insertions, 63 deletions
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); |