Bug 87959 Commit on out-of-sync new resources has no effectI20050314

1 files changed, 42 insertions, 0 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
index ab689ae24..5c10399ea 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.team.internal.ccvs.core;
  
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 	
 public class CVSStatus extends Status {
@@ -68,4 +69,45 @@ public class CVSStatus extends Status {
 		return message;
 	}
 
+    /**
+     * Return whether this status is wrapping an internal error.
+     * An internal error is any error for which the wrapped exception 
+     * is not a CVS exception. Check deeply to make sure there isn't
+     * an internal error buried deep down.
+     * @return whether this status is wrapping an internal error
+     */
+    public boolean isInternalError() {
+        Throwable ex = getException();
+        if (ex instanceof CVSException) {
+            CVSException cvsEx = (CVSException) ex;
+            IStatus status = cvsEx.getStatus();
+            return isInternalError(status);
+        }
+        return ex != null;
+    }
+
+    /**
+     * Return whether this status is wrapping an internal error.
+     * An internal error is any error for which the wrapped exception 
+     * is not a CVS exception. Check deeply to make sure there isn't
+     * an internal error buried deep down.
+     * @return whether this status is wrapping an internal error
+     */
+    public static boolean isInternalError(IStatus status) {
+        if (status instanceof CVSStatus) {
+            return ((CVSStatus)status).isInternalError();
+        }
+        if (status.isMultiStatus()) {
+            IStatus[] children = status.getChildren();
+            for (int i = 0; i < children.length; i++) {
+                IStatus child = children[i];
+                if (isInternalError(child)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        return true;
+    }
+
 }