Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2005-05-17 15:14:13 +0000
committerMichael Valenta2005-05-17 15:14:13 +0000
commitcf715431baa6a21c7d4e2c9376f144f82aeedf37 (patch)
tree116f08e07975eff5aec3795e27cc0057e1284d60
parent8110ddf5eb91d7679bfe7341dd71746919009caa (diff)
downloadeclipse.platform.team-cf715431baa6a21c7d4e2c9376f144f82aeedf37.tar.gz
eclipse.platform.team-cf715431baa6a21c7d4e2c9376f144f82aeedf37.tar.xz
eclipse.platform.team-cf715431baa6a21c7d4e2c9376f144f82aeedf37.zip
Bug 95406 Poor progress during a Team>Share Project
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java1
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties1
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java41
3 files changed, 29 insertions, 14 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java
index f9f7c01ed..cb0819222 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java
@@ -187,6 +187,7 @@ public class CVSMessages extends NLS {
public static String EclipseFile_Problem_writing_resource;
public static String EclipseFolder_problem_creating;
public static String EclipseFolder_isModifiedProgress;
+ public static String EclipseFolder_0;
public static String EclipseSynchronizer_UpdatingSyncEndOperation;
public static String EclipseSynchronizer_UpdatingSyncEndOperationCancelled;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
index ceef0d8d3..8323e89ca 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
@@ -249,3 +249,4 @@ CVSRepositoryLocation_74=Error retrieving preferences for CVS repository locatio
CVSRepositoryLocation_75=Error flushing preferences for CVS repository location {0}
SyncFileWriter_0=An invalid entry was found in the CVS/Entries file for folder {0}. The entry has been ignored.
ResponseHandler_0=Could not create resource {0}: {1}
+EclipseFolder_0=Disconnecting {0}.
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java
index d69532f29..ceca1834a 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java
@@ -49,19 +49,32 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
boolean includePhantoms = (((flags & PHANTOM_MEMBERS) != 0) || ((flags & (EXISTING_MEMBERS | PHANTOM_MEMBERS)) == 0));
for (int i = 0; i < resources.length; i++) {
IResource resource = resources[i];
- ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
- if ((includeFiles && (resource.getType()==IResource.FILE))
- || (includeFolders && (resource.getType()==IResource.FOLDER))) {
- boolean isManaged = cvsResource.isManaged();
- boolean isIgnored = cvsResource.isIgnored();
- if ((isManaged && includeManaged)|| (isIgnored && includeIgnored)
- || ( ! isManaged && ! isIgnored && includeUnmanaged)) {
- boolean exists = cvsResource.exists();
- if ((includeExisting && exists) || (includePhantoms && !exists && isManaged)) {
- result.add(cvsResource);
- }
- }
-
+ int type = resource.getType();
+ if ((includeFiles && (type==IResource.FILE))
+ || (includeFolders && (type==IResource.FOLDER))) {
+ boolean exists = resource.exists();
+ if ((includeExisting && exists) || (includePhantoms && !exists)) {
+ ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
+ boolean includeResource = false;
+ if ((includeManaged && includeUnmanaged && includeIgnored)) {
+ includeResource = true;
+ } else {
+ boolean isManaged = cvsResource.isManaged();
+ if (isManaged && includeManaged) {
+ includeResource = true;
+ } else {
+ boolean isIgnored = cvsResource.isIgnored();
+ if (isIgnored && includeIgnored) {
+ includeResource = true;
+ } else if ( ! isManaged && ! isIgnored && includeUnmanaged) {
+ includeResource = true;
+ }
+ }
+ }
+ if (includeResource) {
+ result.add(cvsResource);
+ }
+ }
}
}
return (ICVSResource[]) result.toArray(new ICVSResource[result.size()]);
@@ -230,7 +243,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
/* private */ static void recursiveUnmanage(IContainer container, IProgressMonitor monitor) {
try {
monitor.beginTask(null, 10);
- monitor.subTask(container.getFullPath().toOSString());
+ monitor.subTask(NLS.bind(CVSMessages.EclipseFolder_0, new String[] {container.getFullPath().toString() }));
EclipseSynchronizer.getInstance().deleteFolderSync(container);
IResource[] members = container.members(true);

Back to the top