Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-06-07 14:17:32 -0400
committerjames2002-06-07 14:17:32 -0400
commit8c5a66b11fc2412cb73df5c03c229264558c2e38 (patch)
tree05d6835490ed24c5bc998e75f88e7f969b6efbf4
parent355f654bec143502a8c8a19d5e6feacf697d73e5 (diff)
downloadeclipse.platform.team-8c5a66b11fc2412cb73df5c03c229264558c2e38.tar.gz
eclipse.platform.team-8c5a66b11fc2412cb73df5c03c229264558c2e38.tar.xz
eclipse.platform.team-8c5a66b11fc2412cb73df5c03c229264558c2e38.zip
15470: "Whoever is not with us is against us"
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/IIgnoreInfo.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/target/Site.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StringMatcher.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/StringMatcher.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/plugin.properties2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestSetup.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/Util.java4
10 files changed, 11 insertions, 11 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IIgnoreInfo.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IIgnoreInfo.java
index 9c5c8260f..a35e684c3 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IIgnoreInfo.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IIgnoreInfo.java
@@ -32,7 +32,7 @@ public interface IIgnoreInfo {
/**
* Return whether or not this ignore info is enabled. A disabled ignore
* info remains in the global ignore list, but no attempt is made to match
- * against it to determine resource ignore state.
+ * with it to determine resource ignore state.
*
* @return whether the ignore info is enabled
*/
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/target/Site.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/target/Site.java
index f67030832..ee1e0eb73 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/target/Site.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/target/Site.java
@@ -87,7 +87,7 @@ public abstract class Site {
* represents the same Site as this object. Two Site objects are equal
* if they have the same types and URLs.
*
- * @param other the Site to compare against
+ * @param other the Site to compare with
*
* @return <code>true</code> if the Sites are the same; <code>false</code>
* otherwise
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StringMatcher.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StringMatcher.java
index 015a2ae15..0f0c8ad5a 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StringMatcher.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StringMatcher.java
@@ -110,7 +110,7 @@ public class StringMatcher {
* If invoking the StringMatcher with string literals in Java, don't forget
* escape characters are represented by "\\".
*
- * @param aPattern the pattern to match text against
+ * @param aPattern the pattern to match text with
* @param ignoreCase if true, case is ignored
* @param ignoreWildCards if true, wild cards and their escape sequences are ignored
* (everything is taken literally).
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 2b2044993..31f9b8002 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
@@ -418,7 +418,7 @@ public class CVSTeamProvider extends RepositoryProvider {
}
/**
- * Diff the resources against the repository and write the output to the provided
+ * Diff the resources with the repository and write the output to the provided
* PrintStream in a form that is usable as a patch. The patch is rooted at the
* project.
*/
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java
index 03eb6d141..2ae43b476 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java
@@ -137,7 +137,7 @@ public class CVSWorkspaceRoot {
}
/**
- * Sync the given unshared project against the given repository and module.
+ * Sync the given unshared project with the given repository and module.
*/
public static IRemoteSyncElement getRemoteSyncTree(IProject project, ICVSRepositoryLocation location, String moduleName, CVSTag tag, IProgressMonitor progress) throws TeamException {
if (CVSWorkspaceRoot.getCVSFolderFor(project).isCVSFolder()) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java
index df1f6f7d4..0ee11f494 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java
@@ -143,7 +143,7 @@ abstract class EclipseResource implements ICVSResource, Comparable {
}
}
- // check against all the registered patterns
+ // check with all the registered patterns
boolean ignored = matcher.match(getName());
// check the parent, if the parent is ignored then this resource
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/StringMatcher.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/StringMatcher.java
index b6c84ef2d..59fdc9ed7 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/StringMatcher.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/StringMatcher.java
@@ -110,7 +110,7 @@ public class StringMatcher {
* If invoking the StringMatcher with string literals in Java, don't forget
* escape characters are represented by "\\".
*
- * @param aPattern the pattern to match text against
+ * @param aPattern the pattern to match text with
* @param ignoreCase if true, case is ignored
* @param ignoreWildCards if true, wild cards and their escape sequences are ignored
* (everything is taken literally).
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.properties b/bundles/org.eclipse.team.cvs.ui/plugin.properties
index ad0340d03..905c5589d 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.properties
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.properties
@@ -111,7 +111,7 @@ ShowHistoryAction.label=Show in Resource &History
ShowHistoryAction.tooltip=Show in Resource History
GenerateDiff.label=Create &Patch...
-GenerateDiff.tooltip=Compare your workspace contents against the server and generate a diff file that can be used as a patch file.
+GenerateDiff.tooltip=Compare your workspace contents with the server and generate a diff file that can be used as a patch file.
RefreshFromLocal.label=&Refresh from local CVS state
RefreshFromLocal.tooltip=Refresh the workbench with changes made to CVS projects from outside the workbench.
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestSetup.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestSetup.java
index d6850bc89..86b55c353 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestSetup.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestSetup.java
@@ -159,7 +159,7 @@ public class CVSTestSetup extends TestSetup {
protected CVSRepositoryLocation setupRepository(String location) throws CVSException {
- // Give some info about which repository the tests are running against
+ // Give some info about which repository the tests are running with
System.out.println("Connecting to: " + location);
// Validate that we can connect, also creates and caches the repository location. This
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/Util.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/Util.java
index ea6c78c6a..a5a85defc 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/Util.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/Util.java
@@ -607,7 +607,7 @@ import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
* @param display the root display
* @param pollingPeriod the number of milliseconds to wait between polls
* @param value a value used for matching
- * @param criteria a strategy for matching the controls against a value,
+ * @param criteria a strategy for matching the controls with a value,
* or null to match any Shell.
* @param waiter the waiter to be notified
*/
@@ -670,7 +670,7 @@ import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
* @param root the root of the hierarchy to search
* @param clazz the Class representing the precise type of Control to find
* @param value a value used for matching
- * @param criteria a strategy for matching the controls against a value,
+ * @param criteria a strategy for matching the controls with a value,
* or null to match anything of the right class.
* @return the first matching Control, or null if none found.
*/

Back to the top