[jboss-svn-commits] JBL Code SVN: r35171 - labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils.

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

Author: dennyxu
Date: 2010-09-17 01:50:14 -0400 (Fri, 17 Sep 2010)
New Revision: 35171

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java
Log:
JBIDE-6093:Eclipse Guvnor Tooling causes validation errors on certain file types


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-09-17 05:44:34 UTC (rev 35170)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java	2010-09-17 05:50:14 UTC (rev 35171)
@@ -266,7 +266,9 @@
 							controlledFile.removeLastSegments(1).append(".guvnorinfo")); //$NON-NLS-1$
 		if (!mdFolder.exists()) {
 			mdFolder.create(true, true, null);
-			
+		}
+		
+		if(!mdFolder.isTeamPrivateMember() || !mdFolder.isDerived()){
 			mdFolder.setTeamPrivateMember(true);
 			mdFolder.setDerived(true, null);
 		}
@@ -277,15 +279,17 @@
 		Properties props = new Properties();
 		if (!mdFile.exists()) {
 			mdFile.create(new ByteArrayInputStream(new byte[] {}), true, null);
-			
-			mdFolder.setTeamPrivateMember(true);
-			mdFolder.setDerived(true, null);
 		} else {
 			props.load(mdFile.getContents());
 		}
 		
+		if(!mdFile.isTeamPrivateMember() || !mdFile.isDerived()){
+			mdFile.setTeamPrivateMember(true);
+			mdFile.setDerived(true, null);
+		}
 		
 		
+		
 		if (mdProps.getRepository() != null) {
 			props.put("repository", mdProps.getRepository()); //$NON-NLS-1$
 		}