Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-03-20 03:04:48 +0000
committerJean Michel-Lemieux2004-03-20 03:04:48 +0000
commit114941d9819de5e79a12d8df38d0b4c53e86cd97 (patch)
tree34bc4e7d9b82dc24e7b737d81497ebfab30d7941
parentef342d2905e0e7d214ded5461ffe6e06bf4f2c8f (diff)
downloadeclipse.platform.team-114941d9819de5e79a12d8df38d0b4c53e86cd97.tar.gz
eclipse.platform.team-114941d9819de5e79a12d8df38d0b4c53e86cd97.tar.xz
eclipse.platform.team-114941d9819de5e79a12d8df38d0b4c53e86cd97.zip
Bug 55407 ResourceException opening compare editor on incoming change
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java
index 4ea6fa6f0..114278588 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java
@@ -148,4 +148,13 @@ public class LocalResourceTypedElement extends ResourceNode {
}
return bos.toByteArray();
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.compare.ResourceNode#getContents()
+ */
+ public InputStream getContents() throws CoreException {
+ if(getResource().exists())
+ return super.getContents();
+ return null;
+ }
}

Back to the top