[jboss-svn-commits] JBL Code SVN: r35173 - labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils.

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

Author: dennyxu
Date: 2010-09-17 01:58:57 -0400 (Fri, 17 Sep 2010)
New Revision: 35173

Modified:
   labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java
Log:
JBIDE-6093: merget the fix into branch 5.1.x

Modified: labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java	2010-09-17 05:57:00 UTC (rev 35172)
+++ labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java	2010-09-17 05:58:57 UTC (rev 35173)
@@ -215,6 +215,15 @@
 	}
 	
 	public static GuvnorMetadataProps loadGuvnorMetadata(IFile mdFile) throws Exception {
+		if(!mdFile.isTeamPrivateMember()){
+			mdFile.setTeamPrivateMember(true);
+			mdFile.setDerived(true, null);
+			if(mdFile.getParent().getName().endsWith(".guvnorinfo")){
+				mdFile.getParent().setTeamPrivateMember(true);
+				mdFile.getParent().setDerived(true, null);
+			}
+		}
+		
 		Properties props = new Properties();
 		InputStream contents = mdFile.getContents();
 		
@@ -266,15 +275,23 @@
 							controlledFile.removeLastSegments(1).append(".guvnorinfo")); //$NON-NLS-1$
 		if (!mdFolder.exists()) {
 			mdFolder.create(true, true, null);
+			mdFolder.setTeamPrivateMember(true);
+			mdFolder.setDerived(true, null);
 		}
+		
 		IFile mdFile = root.getFile(
 						mdFolder.getFullPath().append("." + controlledFile.lastSegment())); //$NON-NLS-1$
+		
 		Properties props = new Properties();
 		if (!mdFile.exists()) {
 			mdFile.create(new ByteArrayInputStream(new byte[] {}), true, null);
+			mdFile.setTeamPrivateMember(true);
+			mdFile.setDerived(true, null);
 		} else {
 			props.load(mdFile.getContents());
 		}
+		
+		
 		if (mdProps.getRepository() != null) {
 			props.put("repository", mdProps.getRepository()); //$NON-NLS-1$
 		}