Changeset 816:ebf9c3f0b052

Timestamp:

08/08/08 16:47:50 (4 months ago)

Author:

Bastian Doetsch <bastian.doetsch@gmx.de>

branch:

default

Message:

"Cleanup of Share... functionality

Now uses asynchronous operation, so the wizard gives

a) progress indication and
b) doesn't freeze the GUI."

Files:

• src/com/vectrace/MercurialEclipse/commands/HgInitClient.java (added)
• src/com/vectrace/MercurialEclipse/operations/InitOperation.java (added)
• src/com/vectrace/MercurialEclipse/team/MercurialConfigurationWizard.java (modified) (7 diffs)

src/com/vectrace/MercurialEclipse/team/MercurialConfigurationWizard.java

@@ -11 +11 @@
- *     Stefan Groschupf          - logError
- *     Stefan C                  - Code cleanup
+ *     Bastian Doetsch           - make map operation asynchronous
- *******************************************************************************/
-
@@ -27 +28 @@
-package com.vectrace.MercurialEclipse.team;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
@@ -45 +43 @@
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.team.core.RepositoryProvider;
-import org.eclipse.team.core.TeamException;
-import org.eclipse.team.ui.IConfigurationWizard;
-import org.eclipse.ui.IWorkbench;
-
-import com.vectrace.MercurialEclipse.MercurialEclipsePlugin;
-import com.vectrace.MercurialEclipse.commands.HgClients;
-import com.vectrace.MercurialEclipse.exception.HgException;
-team.cache.MercurialStatusCache
+operations.InitOperation
-
-/**
@@ -62 +57 @@
-public class MercurialConfigurationWizard extends Wizard implements
-        IConfigurationWizard {
-ublic
+rivate
-        Button changeDirButton;
-        Button restoreDefaultDirButton;
@@ -158 +153 @@
-
-    private IProject project;
-// TODO: Not sure if this is required.
+
-    private String hgPathOrginal;
-    private String foundhgPath;
-    private Text directoryText;
+    private NewWizardPage page;
-
-    public MercurialConfigurationWizard() {
-        setWindowTitle("MercurialConfigurationWizard");
+        setNeedsProgressMonitor(true);
-    }
-
@@ -182 +179 @@
-            hgPathOrginal = project.getLocation().toString();
-            hgPath = hgPathOrginal;
-
+
+
-        } else {
-            foundhgPath = mercurialRootDir;
@@ -199 +197 @@
-            hgPath = directoryText.getText();
-        }
-        if ((foundhgPath == null) || (!foundhgPath.equals(hgPath))) {
-            String launchCmd[] = { MercurialUtilities.getHGExecutable(true),
-                    "init", hgPath };
-            try {
-                String line;
-                Process process = Runtime.getRuntime().exec(launchCmd);
-                BufferedReader input = new BufferedReader(
-                        new InputStreamReader(process.getInputStream()));
-                while ((line = input.readLine()) != null) {
-                    HgClients.getConsole().printMessage(line, null);
-                }
-                input.close();
-                process.waitFor();
-                project.refreshLocal(IResource.DEPTH_INFINITE, null);
-            } catch (Exception e) {
-                MercurialEclipsePlugin.logError(e);
-                return false;
-            }
-                        
-        }
-        try {
-
-
-
+
+
+
+
-            MercurialEclipsePlugin.logError(e);
+            page.setErrorMessage(e.getCause().getLocalizedMessage());
-            return false;
-        }
-
-        try {
-            MercurialStatusCache.getInstance().refresh(project);
-        } catch (TeamException e) {
-            MercurialEclipsePlugin.logError("Unable to refresh project: ", e);
-        }
-        return true;