Author: adietish Date: 2011-12-08 06:41:39 -0500 (Thu, 08 Dec 2011) New Revision: 37106 Modified: branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/FileUtils.java branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java Log: [JBIDE-10171] cloning to tmp-folder and removing it afterwards Modified: branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/FileUtils.java =================================================================== --- branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/FileUtils.java 2011-12-08 11:36:01 UTC (rev 37105) +++ branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/FileUtils.java 2011-12-08 11:41:39 UTC (rev 37106) @@ -52,6 +52,16 @@ && file.isDirectory(); } + public static File getSystemTmpFolder() { + String tmpFolder = System.getProperty("java.io.tmpdir"); + return new File(tmpFolder); + } + + public static File getRandomTmpFolder() { + String randomName = String.valueOf(System.currentTimeMillis()); + return new File(getSystemTmpFolder(), randomName); + } + /** * Copies the ginve source to the given destination recursively. Overwrites * existing files/directory on the destination path if told so. Modified: branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java =================================================================== --- branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-12-08 11:36:01 UTC (rev 37105) +++ branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-12-08 11:41:39 UTC (rev 37106) @@ -287,8 +287,10 @@ // model.shareProject(monitor); // model.mergeWithApplicationRepository(repository, // monitor); - File repositoryFile = cloneRepository(monitor); + File tmpFolder = FileUtils.getRandomTmpFolder(); + File repositoryFile = cloneRepository(tmpFolder, monitor); copyOpenshiftConfiguration(repositoryFile, monitor); + FileUtil.safeDelete(tmpFolder); shareProject(monitor); createServerAdapterIfRequired(monitor); } @@ -350,8 +352,14 @@ private File cloneRepository(IProgressMonitor monitor) throws OpenShiftException, InvocationTargetException, InterruptedException, URISyntaxException { IApplication application = getApplication(); + File destination = new File(getRepositoryPath(), application.getName()); + return cloneRepository(destination, monitor); + } + + private File cloneRepository(File destination, IProgressMonitor monitor) + throws OpenShiftException, InvocationTargetException, InterruptedException, URISyntaxException { + IApplication application = getApplication(); monitor.subTask(NLS.bind("Cloning repository for application {0}...", application.getName())); - File destination = new File(getRepositoryPath(), application.getName()); cloneRepository(application.getGitUri(), destination, monitor); return destination; }