[jbosstools-commits] JBoss Tools SVN: r41846 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport.

[jbosstools-commits at lists.jboss.org]

Author: xcoulon
Date: 2012-06-08 18:16:49 -0400 (Fri, 08 Jun 2012)
New Revision: 41846

Modified:
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java
Log:
Fixed - JBIDE-12150
Git repository is sometimes corrupted after application creation

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java	2012-06-08 22:11:55 UTC (rev 41845)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java	2012-06-08 22:16:49 UTC (rev 41846)
@@ -101,7 +101,7 @@
 		addToModified(copyOpenshiftConfigurations(getApplication(), getRemoteName(), project, monitor));
 		addToModified(setupGitIgnore(project, monitor));
 		addToModified(setupOpenShiftMavenProfile(project, monitor));
-		addSettingsFile(project, monitor);
+		addToModified(addSettingsFile(project, monitor));
 
 		addRemote(getRemoteName(), getApplication().getUUID(), project);
 

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java	2012-06-08 22:11:55 UTC (rev 41845)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java	2012-06-08 22:16:49 UTC (rev 41846)
@@ -93,7 +93,7 @@
 		copyOpenshiftConfigurations(getApplication(), getRemoteName(), project, monitor);
 		setupGitIgnore(project, monitor);
 		setupOpenShiftMavenProfile(project, monitor);
-		addSettingsFile(project, monitor);
+		addToModified(addSettingsFile(project, monitor));
 		shareProject(project, monitor);
 		addRemoteRepo(getRemoteName(), getApplication().getGitUrl(), EGitUtils.getRepository(project));
 

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java	2012-06-08 22:11:55 UTC (rev 41845)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java	2012-06-08 22:16:49 UTC (rev 41846)
@@ -85,7 +85,7 @@
 		// TODO: handle multiple projects (is this really possible?)
 		IProject project = getSettingsProject(importedProjects);
 		addToModified(setupGitIgnore(project, monitor));
-		addSettingsFile(project, monitor);
+		addToModified(addSettingsFile(project, monitor));
 		addAndCommitModifiedResource(project, monitor);
 		
 		return getSettingsProject(importedProjects);