[jboss-svn-commits] JBL Code SVN: r33641 - in labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools: utils and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: bfitzpat
Date: 2010-06-25 09:31:34 -0400 (Fri, 25 Jun 2010)
New Revision: 33641

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorDecorator.java
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java
Log:
[JBIDE-5265] Delivered Denny's patch to solve the issue with deleting potentially unavailable resources

Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorDecorator.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorDecorator.java	2010-06-25 13:05:17 UTC (rev 33640)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorDecorator.java	2010-06-25 13:31:34 UTC (rev 33641)
@@ -30,6 +30,11 @@
 	private void decorateResource(IResource resource, IDecoration decoration) {
 		try {	
 			if (resource instanceof IFile) {
+				
+				if(!((IFile)resource).exists()){
+					return ;
+				}
+				
 				addGuvnorOverlay(decoration);
 				addChangeIndicator(resource, decoration);
 				addResourceDetails(resource, decoration);

Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java	2010-06-25 13:05:17 UTC (rev 33640)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java	2010-06-25 13:31:34 UTC (rev 33641)
@@ -3,6 +3,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
 import java.text.MessageFormat;
@@ -199,12 +200,19 @@
 	
 	public static GuvnorMetadataProps loadGuvnorMetadata(IFile mdFile) throws Exception {
 		Properties props = new Properties();
-		props.load(mdFile.getContents());
-		return new GuvnorMetadataProps(props.getProperty("filename"), //$NON-NLS-1$
+		InputStream contents = mdFile.getContents();
+		
+		try{
+			props.load(contents);
+			return new GuvnorMetadataProps(props.getProperty("filename"), //$NON-NLS-1$
 				                       props.getProperty("repository"), //$NON-NLS-1$
 				                       props.getProperty("fullpath"), //$NON-NLS-1$
 				                       props.getProperty("lastmodified"), //$NON-NLS-1$
 				                       props.getProperty("revision")); //$NON-NLS-1$
+		}
+		finally{
+			contents.close();
+		}
 	}
 	
 	public static GuvnorMetadataProps getGuvnorMetadata(IResource resource) throws Exception {