Merge lp:~alex-idereal/bzr-eclipse/bzr-eclipse into lp:bzr-eclipse

[Alexander Taler]

== New project creation wizard ==

The primary change was to replace the two project creation wizards (checkout
vs. branch) with a single one. The user experience was simplified by moving
many options into an advanced tab and by providing clearer explanation of what
is required. Additionally, the new wizard will discover Eclipse projects and
add them automatically.

== Other user facing changes ==

Modify menu options for resolving conflicts to be more intuitive:
  + Rename "Resolve" to "Mark Resolved"
  + Add an "Edit Conflicts" option

== Under the hood changes ==

Add documentation on how to create an update site.

Modify these Branch objects, to support other changes:
  + BranchFactory
  + LocalBranch
  + BranchLocationManager

[Piotr Piastucki (piastucki)]

On 02/19/2013 08:31 AM, Alexander Taler wrote:
> Alexander Taler has proposed merging lp:~alex-idereal/bzr-eclipse/bzr-eclipse into lp:bzr-eclipse.
>
> Requested reviews:
> bzr-eclipse developers (bzr-eclipse)
>
> For more details, see:
> https://code.launchpad.net/~alex-idereal/bzr-eclipse/bzr-eclipse/+merge/149207
>
> == New project creation wizard ==
>
> The primary change was to replace the two project creation wizards (checkout
> vs. branch) with a single one. The user experience was simplified by moving
> many options into an advanced tab and by providing clearer explanation of what
> is required. Additionally, the new wizard will discover Eclipse projects and
> add them automatically.
>
> == Other user facing changes ==
>
> Modify menu options for resolving conflicts to be more intuitive:
> + Rename "Resolve" to "Mark Resolved"
> + Add an "Edit Conflicts" option
>
> == Under the hood changes ==
>
> Add documentation on how to create an update site.
>
> Modify these Branch objects, to support other changes:
> + BranchFactory
> + LocalBranch
> + BranchLocationManager
>

Hi Alex,

I am planning to merge a branch I create based on
lp:~alex-idereal/bzr-eclipse/bzr-eclipse some time ago.
The branch is named
lp:~piastucki/bzr-eclipse/history-and-compare.<https://code.launchpad.net/%7Epiastucki/bzr-eclipse/history-and-compare>
I kept all your changes intact, but the BzrBranchLocator. I moved most
of the code from BzrBranchLocator to BranchLocation class
(bzr-java-lib), simplified BranchFactory as much as possible and removed
BzrBranchLocator. This way no changes are required in the existing code
yet the branch creation/validation code still looks better than before.
BTW, please let me know if you plan to work on further improvements in
project creation wizards.

Cheers,
Piotr

[Piotr Piastucki (piastucki)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-02-02 06:40:31 +0000
+++ .bzrignore	2013-02-19 07:30:34 +0000
@@ -7,15 +7,8 @@
 org.eclipse.pde.core.prefs
 .DS_Store
 *.jar
-org.vcs.bazaar.eclipse.core.tests/bin
 org.vcs.bazaar.eclipse.client/plugins/*
-org.apache.commons.logging/target
-org.kxml2/target
-org.vcs.bazaar.eclipse.client/target
-org.vcs.bazaar.eclipse.core/target
-org.vcs.bazaar.eclipse.core.tests/target
-org.vcs.bazaar.eclipse.feature/target
-org.vcs.bazaar.eclipse.site/target
-org.vcs.bazaar.eclipse.tests-feature/target
-org.vcs.bazaar.eclipse.ui/target
-redstone.xmlrpc/target
+**/target
+org.vcs.bazaar.eclipse.site/features
+org.vcs.bazaar.eclipse.site/plugins
+org.vcs.bazaar.eclipse.site/logs.zip
 
=== modified file 'HowToCompileAndRun.txt'
--- HowToCompileAndRun.txt	2011-07-19 05:36:44 +0000
+++ HowToCompileAndRun.txt	2013-02-19 07:30:34 +0000
@@ -32,4 +32,44 @@
 
    ''Replace Run with Debug for debug mode''
 
- 
+4) Creating Plugin import site
+  4.1) Open the org.vcs.bazaar.eclipse.site project
+
+  4.2) Run Build All  - this creates some files and directories
+
+  4.3) Upload created features, plugins, and site.xml
+
+
+5) Update the version
+  5.1) Open org.vcs.bazaar.eclipse.core plugin overview
+    Update version and save
+    This modifies: org.vcs.bazaar.eclipse.core/META-INF/MANIFEST.MF
+
+  5.2) Open org.vcs.bazaar.eclipse.core.tests plugin overview
+    Update dependencies for org.vcs.bazaar.eclipse.core
+    Update version and save
+    This modifies: org.vcs.bazaar.eclipse.core.tests/META-INF/MANIFEST.MF
+
+  5.3) Open org.vcs.bazaar.eclipse.core.ui plugin overview
+    Update dependencies for org.vcs.bazaar.eclipse.core
+    Update version and save
+    This modifies: org.vcs.bazaar.eclipse.core.ui/META-INF/MANIFEST.MF
+
+  5.4) Open org.vcs.bazaar.eclipse.feature plugin overview
+    Update version and save
+    This modifies: org.vcs.bazaar.eclipse.feature/feature.xml
+
+  5.5) Open org.vcs.bazaar.eclipse.tests-feature plugin overview
+    Update version and save
+    This modifies: org.vcs.bazaar.eclipse.tests-feature/feature.xml
+
+  5.6) Open org.vcs.bazaar.eclipse.site Site Map
+    Add a feature for the new version  (Synchronize didn't work for me)
+    Remove the feature for the old version
+    This modifies: org.vcs.bazaar.eclipse.site/site.xml
+
+
+  5.7) Update the version in each of the pom.xml
+    find . -name pom.xml | xargs sed -i 's/1.1.1-SNAPSHOT/1.2.0-SNAPSHOT/'
+    This modifies all of the pom.xml -- check they are correct.
+
 
=== modified file 'org.apache.commons.logging/pom.xml'
--- org.apache.commons.logging/pom.xml	2011-03-22 15:05:45 +0000
+++ org.apache.commons.logging/pom.xml	2013-02-19 07:30:34 +0000
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.vcs.bazaar.eclipse</groupId>
     <artifactId>org.vcs.bazaar.eclipse</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.commons.logging</groupId>
 
=== modified file 'org.kxml2/pom.xml'
--- org.kxml2/pom.xml	2011-03-22 15:05:45 +0000
+++ org.kxml2/pom.xml	2013-02-19 07:30:34 +0000
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.vcs.bazaar.eclipse</groupId>
     <artifactId>org.vcs.bazaar.eclipse</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.kxml2</groupId>
 
=== modified file 'org.vcs.bazaar.eclipse.client/pom.xml'
--- org.vcs.bazaar.eclipse.client/pom.xml	2011-03-22 15:05:45 +0000
+++ org.vcs.bazaar.eclipse.client/pom.xml	2013-02-19 07:30:34 +0000
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.vcs.bazaar.eclipse</groupId>
     <artifactId>org.vcs.bazaar.eclipse</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.vcs.bazaar.eclipse.client</groupId>
 
=== modified file 'org.vcs.bazaar.eclipse.core.tests/META-INF/MANIFEST.MF'
--- org.vcs.bazaar.eclipse.core.tests/META-INF/MANIFEST.MF	2011-07-30 22:37:22 +0000
+++ org.vcs.bazaar.eclipse.core.tests/META-INF/MANIFEST.MF	2013-02-19 07:30:34 +0000
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.vcs.bazaar.eclipse.core.test;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.2.0.idereal-3
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
@@ -10,7 +10,7 @@
  org.eclipse.core.resources,
  org.eclipse.core.filesystem,
  org.vcs.bazaar.eclipse.client;bundle-version="0.5.3",
- org.vcs.bazaar.eclipse.core;bundle-version="1.1.1",
+ org.vcs.bazaar.eclipse.core;bundle-version="1.2.0",
  org.junit4
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
 
=== modified file 'org.vcs.bazaar.eclipse.core.tests/pom.xml'
--- org.vcs.bazaar.eclipse.core.tests/pom.xml	2011-07-19 05:32:49 +0000
+++ org.vcs.bazaar.eclipse.core.tests/pom.xml	2013-02-19 07:30:34 +0000
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.vcs.bazaar.eclipse</groupId>
     <artifactId>org.vcs.bazaar.eclipse</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.vcs.bazaar.eclipse.core.test</groupId>
@@ -38,7 +38,7 @@
                             <artifactItem>
                                 <groupId>org.vcs.bazaar.client</groupId>
                                 <artifactId>bzr-java-lib</artifactId>
-	                            <classifier>tests</classifier>
+	                            <!-- <classifier>tests</classifier> -->
                                 <type>jar</type>
                                 <overWrite>false</overWrite>
                             </artifactItem>
 
=== modified file 'org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/repository/BranchFactoryTest.java'
--- org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/repository/BranchFactoryTest.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/repository/BranchFactoryTest.java	2013-02-19 07:30:34 +0000
@@ -43,7 +43,7 @@
 	 */
 	@Test
 	public void testFindOrCreateForURI() {
-		IBzrBranch branch = BranchFactory.getInstance().findOrCreateFor(theFile.toURI());
+		IBzrBranch branch = BranchFactory.findOrCreateFor(theFile.toURI());
 		assertNotNull(branch);
 		assertEquals(theFile.toURI(), branch.getLocation());
 	}
@@ -54,7 +54,7 @@
 	 */
 	@Test
 	public void testFindOrCreateForString() throws URISyntaxException {
-		IBzrBranch branch = BranchFactory.getInstance().findOrCreateFor(theFile.getAbsolutePath());
+		IBzrBranch branch = BranchFactory.findOrCreateFor(theFile.getAbsolutePath());
 		assertNotNull(branch);
 		assertEquals(theFile.getAbsolutePath().replace(" ", "%20"), branch.getBranchLocation().toString());
 	}
 
=== modified file 'org.vcs.bazaar.eclipse.core/META-INF/MANIFEST.MF'
--- org.vcs.bazaar.eclipse.core/META-INF/MANIFEST.MF	2011-07-30 22:37:22 +0000
+++ org.vcs.bazaar.eclipse.core/META-INF/MANIFEST.MF	2013-02-19 07:30:34 +0000
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.vcs.bazaar.eclipse.core;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.2.0.idereal-3
 Bundle-Activator: org.vcs.bazaar.eclipse.EclipseBazaarCore
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 
=== modified file 'org.vcs.bazaar.eclipse.core/pom.xml'
--- org.vcs.bazaar.eclipse.core/pom.xml	2011-03-22 15:05:45 +0000
+++ org.vcs.bazaar.eclipse.core/pom.xml	2013-02-19 07:30:34 +0000
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.vcs.bazaar.eclipse</groupId>
     <artifactId>org.vcs.bazaar.eclipse</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.vcs.bazaar.eclipse.core</groupId>
 
=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/model/IBzrBranch.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/model/IBzrBranch.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/model/IBzrBranch.java	2013-02-19 07:30:34 +0000
@@ -10,6 +10,8 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.vcs.bazaar.client.core.BranchLocation;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
+import org.vcs.bazaar.eclipse.internal.core.model.BzrBranchLocator;
 
 /**
  * <p>
@@ -80,12 +82,21 @@
 
 	/**
 	 * Returns a branch location object
+	 * @deprecated Use getBranchLocator() instead
 	 * @return
 	 * BranchLocation
 	 */
 	public BranchLocation getBranchLocation();
 
 	/**
+	 * Get a locator for this branch.
+	 * @return
+	 * BranchLocation
+	 * @throws BazaarException 
+	 */
+	public BzrBranchLocator getBranchLocator() throws BazaarException;
+
+	/**
 	 * <p>
 	 * returns if this is a branch binded to a Eclipse Project, which means that a number of operations can be
 	 * performed on it which would not be possible or advisible on remote or local branches.
 
=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/repository/BranchFactory.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/repository/BranchFactory.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/repository/BranchFactory.java	2013-02-19 07:30:34 +0000
@@ -19,25 +19,19 @@
 import org.vcs.bazaar.eclipse.internal.core.model.RemoteBranch;
 
 /**
+ * Contributor: Alexander Taler
+ * 
  * @author Guillermo Gonzalez
- *
  */
 public class BranchFactory {
 
-	private static final BranchFactory instance = new BranchFactory();
-
-	private BranchFactory(){}
-	public static BranchFactory getInstance() {
-		return instance;
-	}
-
 	/**
 	 * @param URI
 	 *
 	 * @return IBzrBranch for the given URI (or null if there is no branch)
 	 * TODO: this method should only return RemoteBranch instances?
 	 */
-	public IBzrBranch findOrCreateFor(URI uri) {
+	public static IBzrBranch findOrCreateFor(URI uri) {
 		if (uri != null) {
 			if(uri.getScheme() == null) {
 				// asume it's a raw path
@@ -63,7 +57,7 @@
 	 *            as String
 	 * @return IBzrBranch for the given URI (or null if there is no branch)
 	 */
-	public IBzrBranch findOrCreateFor(String uri) {
+	public static IBzrBranch findOrCreateFor(String uri) {
 		Assert.isTrue(validateBranch(uri));
 		if (uri != null && uri.startsWith(LP_SCHEME)) {
 			return new LpBranch(uri);
@@ -91,40 +85,32 @@
 	 * @return boolean
 	 */
 	public static boolean validateBranch(String uri) {
-		return URIValidator.validateBranchLocation(uri);
-	}
-
-	private static class URIValidator {
-
-		private static boolean validateBranchLocation(String uri) {
+		try {
+			if (uri == null || uri.trim().length() == 0) {
+				return false;
+			}
+            if (uri != null && uri.startsWith(LP_SCHEME)) {
+				return true;
+			}
+			URI locationURI = StringUtil.getAbsoluteURI(uri);
 			try {
-				if (uri == null || uri.trim().length() == 0) {
-					return false;
-				}
-	            if (uri != null && uri.startsWith(LP_SCHEME)) {
-					return true;
-				}
-				URI locationURI = StringUtil.getAbsoluteURI(uri);
-				try {
-					if(locationURI != null) {
-						// try to create a branch from the URI
-						getInstance().findOrCreateFor(locationURI);
-					}
-					// if a IBzrBranchcan be created, it's ok
-					return true;
-				} catch(Exception e) {
-					return false;
-				}
-			} catch (Exception e) {
-				// this is a malformed uri or a local file
-				// now we try to check if this is a valid folder location
-				File file = new File(uri);
-				if(file.exists()) {
-					return true;
-				}
+				if(locationURI != null) {
+					// try to create a branch from the URI
+					findOrCreateFor(locationURI);
+				}
+				// if a IBzrBranchcan be created, it's ok
+				return true;
+			} catch(Exception e) {
 				return false;
 			}
+		} catch (Exception e) {
+			// this is a malformed uri or a local file
+			// now we try to check if this is a valid folder location
+			File file = new File(uri);
+			if(file.exists()) {
+				return true;
+			}
+			return false;
 		}
 	}
-
 }
 
=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/repository/BranchLocationManager.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/repository/BranchLocationManager.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/repository/BranchLocationManager.java	2013-02-19 07:30:34 +0000
@@ -121,6 +121,7 @@
 	 * Add a repository location to the database.
 	 */
 	public boolean addRepoLocation(IBzrBranch branch) {
+		if (branch == null) return false;
 		return branches.add(branch);
 	}
 
 
=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/BzrBranch.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/BzrBranch.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/BzrBranch.java	2013-02-19 07:30:34 +0000
@@ -6,6 +6,7 @@
 import org.vcs.bazaar.client.core.BranchLocation;
 import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
 import org.vcs.bazaar.eclipse.core.model.IBzrResource;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
 
 /**
  * @author Guillermo Gonzalez
@@ -32,6 +33,10 @@
 		return new BranchLocation(getLocation());
 	}
 
+    public BzrBranchLocator getBranchLocator() throws BazaarException {
+    	return new BzrBranchLocator(getLocation());
+    }
+
 	@Override
 	public boolean equals(final Object otherRepo) {
 		// make sure wrong types
 
=== added file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/BzrBranchLocator.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/BzrBranchLocator.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/BzrBranchLocator.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,188 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Taler
+ *******************************************************************************/
+package org.vcs.bazaar.eclipse.internal.core.model;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
+/**
+ * Like a URL for Bazaar Branches.
+ * 
+ * Unfortunately the java.net.URI class isn't appropriate because 
+ * LaunchPad locators, lp:, aren't valid URIs, and because Windows
+ * filenames starting with a drive letter don't parse properly. 
+ *
+ * This class is a reimplementation of functionality from BranchLocation,
+ * BranchFactory, and StringUtil, because the branch locating code is spread
+ * between those classes, making it hard to understand and hard to fix.  (In
+ * fact that code includes latent bugs.)  This class should be moved to
+ * bzr-java-lib and replace BranchFactory and BranchLocation.
+ *
+ * @author Alexander Taler
+ */
+public class BzrBranchLocator {
+
+    Scheme scheme;  // The Locator scheme
+    URI uri = null;    // For schemes that have URIs, this is used.
+    String raw = null; // Otherwise the raw creation string is used.
+
+    private static class Scheme {
+    	Scheme(String i, boolean w) {
+    		id = i;
+    		writeable = w;
+    	}
+    	String id;
+    	boolean writeable;
+    }
+    private static final Scheme[] SCHEMES = {
+    	new Scheme("file", true),
+    	new Scheme("bzr+ssh", true),
+    	new Scheme("lp", true),
+    	new Scheme("sftp", true),
+    	new Scheme("ftp", true),
+    	new Scheme("rsync", true),
+    	new Scheme("http", false),
+    	new Scheme("https", false),
+    	new Scheme("bzr+http", false),
+    	new Scheme("bzr+https", false),
+    	new Scheme("https+urllib", false),
+    };
+    private static Scheme lookupScheme(String schemeId) throws BazaarException {
+        for (Scheme s : SCHEMES) {
+        	if (s.id.equals(schemeId)) {
+        		return s;
+        	}
+        }
+        throw new BazaarException("Unsupported Scheme");
+    }
+
+    /**
+     * Create a new Locator object for the given string.
+     *
+     * The string can be a path to the local filesystem, or a URI string which
+     * Bazaar would accept.  The windows drive letter prefix [A-Z]: will be
+     * treated as a local file instead of a URL.
+     * 
+     * @param raw
+     * @throws BazaarException if the string was not a valid locator
+     */
+    public BzrBranchLocator(String raw) throws BazaarException {
+        if (raw == null || raw.length() == 0) {
+        	throw new BazaarException("Branch Not Specified");
+        }
+
+    	this.raw = raw;
+        
+        if (raw.startsWith("lp:")) {
+        	scheme = lookupScheme("lp");
+        	return;
+        }
+        if (!raw.matches("^[a-zA-Z]:")) {
+            // Try it as a URI
+        	try {
+                uri = new URI(raw);
+                if (uri.getScheme() != null) {
+                	scheme = lookupScheme(uri.getScheme());
+                	return;
+                }
+            } catch (URISyntaxException e) {
+                // Fallback to file
+        	}
+        }
+        initAsFile(raw);
+    }
+    
+    /**
+     * Create a new Locator object for the given URI.
+     *
+     * If the URI has no scheme, or looks like a Windows drive letter scheme
+     * [A-Z]: then it will be treated as a local file reference.
+     * 
+     * TODO: Check for the existence of file: URIs on local filesystem
+     *
+     * @param uri
+     * @throws BazaarException if the URI is not appropriate
+     */
+    public BzrBranchLocator(URI uri) throws BazaarException {
+        this.uri = uri;
+
+        if (uri == null) {
+        	throw new BazaarException("Branch Not Specified");
+        }
+
+        String schemeId = uri.getScheme();
+        // If the URI is relative or looks like a Windows file, fallback to file:
+        if ((schemeId == null) || (schemeId.matches("^[a-zA-Z]$"))) {
+            initAsFile(uri.getPath());
+        } else {
+            scheme = lookupScheme(schemeId);
+        }
+    }
+
+    /**
+     * Initialise a new object as a local file reference
+     * @return 
+     */
+    private void initAsFile(String path) throws BazaarException {
+        // Don't modify the object if an error is found
+
+        // Try and find the file on local filesystem
+        File file = new File(path);
+        File parent = file.getParentFile();
+        if (!file.exists() && (parent == null || !parent.exists())) {
+            throw new BazaarException("File not found");
+        }
+        scheme = lookupScheme("file");
+        raw = path;
+
+        // Create an appropriate URI for the path
+        path = path.replace(java.io.File.separator, "/");
+        // Do some URL encoding, java.net.URLEncoder seems to encode the "/"
+        // which isn't what we want.
+        path = path.replace(" ", "%20");
+        try {
+            uri = new URI("file", null, path, null);
+        } catch (URISyntaxException use) {
+            throw new BazaarException("Internal Exception", use);
+        }
+    }
+
+    public boolean isWriteable() {
+    	return scheme.writeable;
+    }
+    
+    /**
+     * Get a branch object for this location.
+     * @return
+     */
+    public IBzrBranch getBranch() {
+    	if (scheme.id == "file") {
+            return new LocalBranch(uri);
+        }
+    	if (scheme.id == "lp") {
+            return new LpBranch(raw);
+        }
+        return new RemoteBranch(uri);
+    }
+    
+    /**
+     * Return a string representation of the locator which can be used to create it again.
+     */
+    public String toString() {
+    	if (scheme.id == "lp" || uri == null) {
+            return raw;
+        }
+        return uri.toString();
+    }
+}
 
=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/LocalBranch.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/LocalBranch.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/LocalBranch.java	2013-02-19 07:30:34 +0000
@@ -40,7 +40,7 @@
 public class LocalBranch extends BzrBranch implements IBzrLocalBranch {
 
 	private static final long serialVersionUID = -6363525810607144655L;
-	private final URI location;
+	private final URI location;  // May be ignored by subclasses, use getLocation()
 
 
 	public LocalBranch(final URI location) {
@@ -69,7 +69,7 @@
 
 	@Override
 	public IPath getPath() {
-		return new Path(location.toString());
+		return new Path(location.getPath());
 	}
 
 	public String getNick() {
@@ -113,7 +113,7 @@
 		}
 		if(info == null || info.getRelatedBranches() == null || info.getRelatedBranches().getParentBranch() == null)
 			return null;
-		return BranchFactory.getInstance().findOrCreateFor(info.getRelatedBranches().getParentBranch());
+		return BranchFactory.findOrCreateFor(info.getRelatedBranches().getParentBranch());
 	}
 
 	public IBzrBranch getPushBranch() {
@@ -124,7 +124,7 @@
 		if(info == null || info.getRelatedBranches() == null)
 			return null;
 		if(info.getRelatedBranches().getPushBranch() != null && !"".equals(info.getRelatedBranches().getPushBranch().trim())) {
-			return BranchFactory.getInstance().findOrCreateFor(info.getRelatedBranches().getPushBranch());
+			return BranchFactory.findOrCreateFor(info.getRelatedBranches().getPushBranch());
 		} else {
 			return null;
 		}
 
=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/RemoteBranch.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/RemoteBranch.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/RemoteBranch.java	2013-02-19 07:30:34 +0000
@@ -9,6 +9,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.vcs.bazaar.client.core.BranchLocation;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
 
 /**
  * <p>
@@ -72,4 +73,13 @@
 	public BranchLocation getBranchLocation() {
 		return location;
 	}
-}
 \ No newline at end of file
+
+    @Override
+    public BzrBranchLocator getBranchLocator() {
+        try {
+            return new BzrBranchLocator(location.toString());
+        } catch (BazaarException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
 
=== modified file 'org.vcs.bazaar.eclipse.feature/feature.xml'
--- org.vcs.bazaar.eclipse.feature/feature.xml	2009-09-05 15:17:53 +0000
+++ org.vcs.bazaar.eclipse.feature/feature.xml	2013-02-19 07:30:34 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.vcs.bazaar.eclipse.feature"
-      label="Eclipse plugin for Bazaar"
-      version="1.1.1.qualifier"
+      label="Eclipse plugin for Bazaar VCS"
+      version="1.2.0.idereal-3"
       provider-name="Guillermo Gonzalez"
       plugin="org.vcs.bazaar.eclipse.ui">
 
@@ -73,17 +73,19 @@
          download-size="0"
          install-size="0"
          version="0.0.0"/>
-         
+
    <plugin
          id="org.apache.commons.logging"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
+
    <plugin
          id="org.kxml2"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
+
    <plugin
          id="redstone.xmlrpc"
          download-size="0"
 
=== modified file 'org.vcs.bazaar.eclipse.feature/pom.xml'
--- org.vcs.bazaar.eclipse.feature/pom.xml	2011-03-22 15:05:45 +0000
+++ org.vcs.bazaar.eclipse.feature/pom.xml	2013-02-19 07:30:34 +0000
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.vcs.bazaar.eclipse</groupId>
     <artifactId>org.vcs.bazaar.eclipse</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.vcs.bazaar.eclipse.feature</groupId>
 
=== modified file 'org.vcs.bazaar.eclipse.site/pom.xml'
--- org.vcs.bazaar.eclipse.site/pom.xml	2011-03-22 15:05:45 +0000
+++ org.vcs.bazaar.eclipse.site/pom.xml	2013-02-19 07:30:34 +0000
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.vcs.bazaar.eclipse</groupId>
     <artifactId>org.vcs.bazaar.eclipse</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.vcs.bazaar.eclipse.site</groupId>
 
=== modified file 'org.vcs.bazaar.eclipse.site/site.xml'
--- org.vcs.bazaar.eclipse.site/site.xml	2011-03-22 15:05:45 +0000
+++ org.vcs.bazaar.eclipse.site/site.xml	2013-02-19 07:30:34 +0000
@@ -3,15 +3,8 @@
    <description url="http://verterok.com.ar/bzr-eclipse/update-site/">
       Update site for the Eclipse plugin for Bazaar
    </description>
-   <feature url="features/org.vcs.bazaar.eclipse.feature_1.1.1.qualifier.jar" id="org.vcs.bazaar.eclipse.feature" version="1.1.1.qualifier">
-      <category name="bzr-eclipse (dev snapshot)"/>
+   <feature url="features/org.vcs.bazaar.eclipse.feature_1.2.0.idereal-3.jar" id="org.vcs.bazaar.eclipse.feature" version="1.2.0.idereal-3">
+      <category name="Collaboration"/>
    </feature>
-   <!--feature url="features/org.vcs.bazaar.eclipse.tests-feature_1.1.1.qualifier.jar" id="org.vcs.bazaar.eclipse.tests-feature" version="1.1.1.qualifier">
-      <category name="bzr-eclipse (dev snapshot)"/>
-   </feature-->
-   <category-def name="bzr-eclipse (dev snapshot)" label="bzr-eclipse (Eclipse-3.3 dev snapshot)">
-      <description>
-         Here you can find snapshots of the current development trunk.
-      </description>
-   </category-def>
+   <category-def name="Collaboration" label="Collaboration"/>
 </site>
 
=== modified file 'org.vcs.bazaar.eclipse.tests-feature/feature.xml'
--- org.vcs.bazaar.eclipse.tests-feature/feature.xml	2010-02-02 06:40:31 +0000
+++ org.vcs.bazaar.eclipse.tests-feature/feature.xml	2013-02-19 07:30:34 +0000
@@ -2,7 +2,7 @@
 <feature
       id="org.vcs.bazaar.eclipse.tests_feature"
       label="Eclipse Tests Plugin for Bazaar"
-      version="1.1.1.qualifier"
+      version="1.2.0.idereal-3"
       provider-name="Guillermo Gonzalez">
 
    <description url="https://launchpad.net/bzr-eclipse">
 
=== modified file 'org.vcs.bazaar.eclipse.tests-feature/pom.xml'
--- org.vcs.bazaar.eclipse.tests-feature/pom.xml	2011-03-22 15:05:45 +0000
+++ org.vcs.bazaar.eclipse.tests-feature/pom.xml	2013-02-19 07:30:34 +0000
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.vcs.bazaar.eclipse.tests-feature</groupId>
   <artifactId>org.vcs.bazaar.eclipse.tests-feature</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-test-feature</packaging>
 </project>
 
=== modified file 'org.vcs.bazaar.eclipse.ui/META-INF/MANIFEST.MF'
--- org.vcs.bazaar.eclipse.ui/META-INF/MANIFEST.MF	2011-07-30 00:28:03 +0000
+++ org.vcs.bazaar.eclipse.ui/META-INF/MANIFEST.MF	2013-02-19 07:30:34 +0000
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.vcs.bazaar.eclipse.ui;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.2.0.idereal-3
 Bundle-Activator: org.vcs.bazaar.eclipse.ui.EclipseBazaarUI
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
-Require-Bundle: org.vcs.bazaar.eclipse.core;bundle-version="1.1.1";visibility:=reexport,
+Require-Bundle: org.vcs.bazaar.eclipse.core;bundle-version="1.2.0";visibility:=reexport,
  org.eclipse.ui,
  org.eclipse.core.runtime;bundle-version="3.3.0",
  org.eclipse.core.resources,
@@ -39,7 +39,7 @@
  org.vcs.bazaar.eclipse.ui.views,
  org.vcs.bazaar.eclipse.ui.wizards,
  org.vcs.bazaar.eclipse.ui.wizards.configuration,
- org.vcs.bazaar.eclipse.ui.wizards.project
+ org.vcs.bazaar.eclipse.ui.wizards.createproject
 Bundle-ClassPath: .,
  icons/,
  images/
 
=== modified file 'org.vcs.bazaar.eclipse.ui/plugin.properties'
--- org.vcs.bazaar.eclipse.ui/plugin.properties	2009-05-05 16:55:55 +0000
+++ org.vcs.bazaar.eclipse.ui/plugin.properties	2013-02-19 07:30:34 +0000
@@ -41,6 +41,8 @@
 #Commit changes into a new revision
 ActionDiff_label=L&atest from branch
 ActionDiff_tooltip=Show unsubmitted changes in the selected resource
+ActionEditConflicts_label=&Edit Conflicts
+ActionEditConflicts_tooltip=Open file in conflict editor
 ActionLog_label=&Log...
 ActionLog_tooltip=Show log of a branch, file, or directory
 ActionNick_label=Nick...
@@ -49,7 +51,7 @@
 ActionRemove_tooltip=Make a file unversioned.
 ActionIgnore_label=&Ignore...
 ActionIgnore_tooltip=Make a file ignored by Bazaar
-ActionResolve_label=Resolv&e...
+ActionResolve_label=Mark Resolv&ed
 ActionResolve_tooltip=Mark a conflict as resolved.
 ActionRevert_label=&Revert
 ActionRevert_tooltip=Revert files to a previous revision
@@ -134,4 +136,4 @@
 #others
 quickDiff_label=Latest bazaar revision
 
-BzrCommandCategory_description=Bazaar
 \ No newline at end of file
+BzrCommandCategory_description=Bazaar
 
=== modified file 'org.vcs.bazaar.eclipse.ui/plugin.xml'
--- org.vcs.bazaar.eclipse.ui/plugin.xml	2011-06-02 00:41:16 +0000
+++ org.vcs.bazaar.eclipse.ui/plugin.xml	2013-02-19 07:30:34 +0000
@@ -96,6 +96,15 @@
 				label="%ActionResolve_label" menubarPath="team.main/group3"
 				tooltip="%ActionResolve_tooltip">
 			</action>
+   <action
+         class="org.vcs.bazaar.eclipse.ui.actions.EditConflictsAction"
+         definitionId="org.vcs.bazaar.eclipse.ui.actions.ActionEditConflicts"
+         icon="icons/bzrlogo.png"
+         id="org.vcs.bazaar.eclipse.ui.actions.ActionEditConflicts"
+         label="%ActionEditConflicts_label"
+         menubarPath="team.main/group3"
+         tooltip="%ActionEditConflicts_tooltip">
+   </action>
 		</objectContribution>
 
 		<!--            Project Team menu                     -->
@@ -371,47 +380,31 @@
 	<extension point="org.eclipse.ui.newWizards">
 		<category id="org.vcs.bazaar.eclipse.ui.wizards.new"
 			name="%NewWizard_categoryName" />
-		<wizard
-        canFinishEarly="false"
-        category="org.vcs.bazaar.eclipse.ui.wizards.new"
-        class="org.vcs.bazaar.eclipse.ui.wizards.project.BranchWizard"
-        hasPages="true"
-        icon="icons/bzrlogo.png"
-        id="org.vcs.bazaar.eclipse.ui.wizards.project.BranchWizard"
-        name="%BranchNewWizard_Name"
-        project="true"/>
-		<wizard
-        canFinishEarly="false"
-        category="org.vcs.bazaar.eclipse.ui.wizards.new"
-        class="org.vcs.bazaar.eclipse.ui.wizards.project.CheckoutWizard"
-        hasPages="true"
-        icon="icons/bzrlogo.png"
-        id="org.vcs.bazaar.eclipse.ui.wizards.project.CheckOutWizard"
-        name="%CheckoutNewWizard_Name"
-        project="true"/>
+  <wizard
+        canFinishEarly="false"
+        category="org.vcs.bazaar.eclipse.ui.wizards.new"
+        class="org.vcs.bazaar.eclipse.ui.wizards.createproject.CreateProjectWizard"
+        hasPages="true"
+        icon="icons/bzrlogo.png"
+        id="org.vcs.bazaar.eclipse.ui.wizards.project.CreateProjectWizard"
+        name="Project From Bazaar"
+        project="true">
+  </wizard>
 	</extension>
 	
 	<extension point="org.eclipse.ui.importWizards">
 		<category id="org.vcs.bazaar.eclipse.ui.wizards.new"
 			name="%NewWizard_categoryName" />
-		<wizard
-        canFinishEarly="false"
-        category="org.vcs.bazaar.eclipse.ui.wizards.new"
-        class="org.vcs.bazaar.eclipse.ui.wizards.project.BranchWizard"
-        hasPages="true"
-        icon="icons/bzrlogo.png"
-        id="org.vcs.bazaar.eclipse.ui.wizards.project.BranchWizard"
-        name="%BranchNewWizard_Name"
-        project="true"/>
-		<wizard
-        canFinishEarly="false"
-        category="org.vcs.bazaar.eclipse.ui.wizards.new"
-        class="org.vcs.bazaar.eclipse.ui.wizards.project.CheckoutWizard"
-        hasPages="true"
-        icon="icons/bzrlogo.png"
-        id="org.vcs.bazaar.eclipse.ui.wizards.project.CheckOutWizard"
-        name="%CheckoutNewWizard_Name"
-        project="true"/>
+  <wizard
+        canFinishEarly="false"
+        category="org.vcs.bazaar.eclipse.ui.wizards.new"
+        class="org.vcs.bazaar.eclipse.ui.wizards.createproject.CreateProjectWizard"
+        hasPages="true"
+        icon="icons/bzrlogo.png"
+        id="org.vcs.bazaar.eclipse.ui.wizards.project.CreateProjectWizard"
+        name="Project From Bazaar"
+        project="true">
+  </wizard>
 	</extension>
 	<extension point="org.eclipse.ui.console.consoleFactories">
 		<consoleFactory
 
=== modified file 'org.vcs.bazaar.eclipse.ui/pom.xml'
--- org.vcs.bazaar.eclipse.ui/pom.xml	2011-03-22 15:05:45 +0000
+++ org.vcs.bazaar.eclipse.ui/pom.xml	2013-02-19 07:30:34 +0000
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.vcs.bazaar.eclipse</groupId>
     <artifactId>org.vcs.bazaar.eclipse</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.vcs.bazaar.eclipse.ui</groupId>
 
=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/EclipseBazaarUI.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/EclipseBazaarUI.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/EclipseBazaarUI.java	2013-02-19 07:30:34 +0000
@@ -60,6 +60,7 @@
 	 */
 	public EclipseBazaarUI() {
 		plugin = this;
+		console = new BzrOutputConsole();
 	}
 
     /**
@@ -237,6 +238,10 @@
 		getDefault().getLog().log(ex.getStatus());
 	}
 
+    public static void log(Throwable t) {
+        log(t.getMessage(), t);
+    }
+
 	public static boolean isTracing(final String optionId) {
 		final String option = getPluginId() + "/trace/" + optionId; //$NON-NLS-1$
 		final String value = Platform.getDebugOption(option);
@@ -266,9 +271,6 @@
 	}
 
 	public synchronized BzrOutputConsole getConsole() {
-		if(console == null){
-			console = new BzrOutputConsole();
-		}
 		return console;
 	}
 
 
=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/BindAction.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/BindAction.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/BindAction.java	2013-02-19 07:30:34 +0000
@@ -58,7 +58,7 @@
 		LocationInputDialog dialog = LocationInputDialog.remoteBindLocationDialog(getShell(), locations, dialogInfo);
 		dialog.setBlockOnOpen(true);
 		if (dialog.open() == LocationInputDialog.OK) {
-			return BranchFactory.getInstance().findOrCreateFor(dialogInfo.getLocation());
+            return BranchFactory.findOrCreateFor(dialogInfo.getLocation());
 		}
 		return null;
 	}
 
=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/BranchAction.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/BranchAction.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/BranchAction.java	2013-02-19 07:30:34 +0000
@@ -3,11 +3,8 @@
  */
 package org.vcs.bazaar.eclipse.ui.actions;
 
-import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.action.IAction;
-import org.vcs.bazaar.eclipse.BzrWorkspaceRoot;
-import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
-import org.vcs.bazaar.eclipse.ui.wizards.project.BranchFromProjectWizard;
+import org.vcs.bazaar.eclipse.ui.wizards.createproject.CreateProjectWizard;
 
 /**
  * @author Guillermo Gonzalez
@@ -23,12 +20,7 @@
 	 */
 	@Override
     public void execute(IAction action) {
-		IProject[] projects = getSelectedProjects();
-		if(projects != null && projects.length == 1) {
-			IProject project = projects[0];
-			IBzrBranch branch = BzrWorkspaceRoot.getBzrWorkspaceRootFor(project).getBranch();
-			BranchFromProjectWizard.open(getShell(), branch);
-		}
+        new CreateProjectWizard(getSelection()).show(getShell());
 	}
 
 	@Override
 
=== added file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/EditConflictsAction.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/EditConflictsAction.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/EditConflictsAction.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Taler
+ *******************************************************************************/
+package org.vcs.bazaar.eclipse.ui.actions;
+
+import org.eclipse.compare.CompareConfiguration;
+import org.eclipse.compare.CompareUI;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.action.IAction;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
+import org.vcs.bazaar.eclipse.ui.compare.ConflictingFileEditorInput;
+
+/**
+ * @author Alexander Taler
+ */
+public class EditConflictsAction extends WorkbenchAction {
+
+    @Override
+    public void execute(IAction action) throws BazaarException {
+
+        IFile local = (IFile) getSelectedResources()[0];
+
+        // Find the base, other and this files
+        IContainer parent = local.getParent();
+        IFile MrgBase = (IFile) parent.findMember(local.getName() + ".BASE");
+        IFile MrgOthr = (IFile) parent.findMember(local.getName() + ".OTHER");
+        IFile MrgThis = (IFile) parent.findMember(local.getName() + ".THIS");
+
+        CompareConfiguration cc = new CompareConfiguration();
+        ConflictingFileEditorInput compare =
+            new ConflictingFileEditorInput(cc, local, local, MrgOthr, MrgBase);
+        CompareUI.openCompareEditor(compare);
+    }
+
+    @Override
+    protected boolean isEnabledForUnmanagedResources() {
+        return false;
+    }
+
+    @Override
+    protected boolean isEnabledForManagedResources() {
+        return true;
+    }
+
+    @Override
+    protected boolean isEnabledForAddedResources() {
+        return false;
+    }
+
+    @Override
+    protected boolean isEnabledForMultipleResources() {
+        return false;
+    }
+
+    @Override
+    protected boolean isEnabledForConflictedResources() {
+        return true;
+    }
+
+    @Override
+    protected boolean isEnabledForUnmodifiedResources() {
+        return false;
+    }
+
+    @Override
+    protected boolean isEnabledForModifiedResources() {
+        return false;
+    }
+
+}
 
=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/MergeAction.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/MergeAction.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/MergeAction.java	2013-02-19 07:30:34 +0000
@@ -58,7 +58,7 @@
 		MergeDialog dialog = new MergeDialog(getShell(), locations, dialogInfo);
 		dialog.setBlockOnOpen(true);
 		if (dialog.open() == MergeDialog.OK) {
-			return BranchFactory.getInstance().findOrCreateFor(dialogInfo.getLocation());
+            return BranchFactory.findOrCreateFor(dialogInfo.getLocation());
 		}
 		return null;
 	}
 
=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/MissingAction.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/MissingAction.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/MissingAction.java	2013-02-19 07:30:34 +0000
@@ -123,7 +123,7 @@
 			if("".equals(dialogInfo.getLocation()) && parent != null) {
 				return parent;
 			} else {
-				return BranchFactory.getInstance().findOrCreateFor(dialogInfo.getLocation());
+                return BranchFactory.findOrCreateFor(dialogInfo.getLocation());
 			}
 		}
 		return null;
 
=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/PullAction.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/PullAction.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/PullAction.java	2013-02-19 07:30:34 +0000
@@ -36,7 +36,7 @@
 		final IProject[] projects = getEnclosingProjectsForSelectedResources();
 		final LocationDialogInfo dialogInfo = getRemoteLocation(projects[0]);
 		if (dialogInfo != null && dialogInfo.getLocation() != null && !"".equals(dialogInfo.getLocation().trim())) {
-			final IBzrBranch location = BranchFactory.getInstance().findOrCreateFor(dialogInfo.getLocation());
+            final IBzrBranch location = BranchFactory.findOrCreateFor(dialogInfo.getLocation());
 			run(new WorkspaceModifyOperation() {
 				@Override
                 public void execute(IProgressMonitor monitor) throws InvocationTargetException {
 
=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/PushAction.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/PushAction.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/PushAction.java	2013-02-19 07:30:34 +0000
@@ -38,7 +38,7 @@
 	protected void execute(final IProject aProject) throws InvocationTargetException, InterruptedException {
 		final LocationDialogInfo dialogInfo = getRemoteLocation(aProject);
 		if (dialogInfo != null && dialogInfo.getLocation() != null && !"".equals(dialogInfo.getLocation().trim())) {
-			IBzrBranch branch = BranchFactory.getInstance().findOrCreateFor(dialogInfo.getLocation().trim());
+            IBzrBranch branch = BranchFactory.findOrCreateFor(dialogInfo.getLocation().trim());
 			new PushOperation(getTargetPart(), aProject, branch.getBranchLocation(), dialogInfo.isRemember(), dialogInfo.isUseExistingDir()).run();
 		}
 	}
 
=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/SwitchAction.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/SwitchAction.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/SwitchAction.java	2013-02-19 07:30:34 +0000
@@ -34,7 +34,7 @@
 		// popup a input dialog to get the remote location
 		String remoteLocation = getRemoteLocation(project, dialogInfo);
 		if (remoteLocation != null) {
-			final IBzrBranch location = BranchFactory.getInstance().findOrCreateFor(remoteLocation);
+            final IBzrBranch location = BranchFactory.findOrCreateFor(remoteLocation);
 			run(new IRunnableWithProgress() {
 				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
 					try {
 
=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/UpdateAction.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/UpdateAction.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/UpdateAction.java	2013-02-19 07:30:34 +0000
@@ -7,6 +7,7 @@
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -35,19 +36,44 @@
 	protected void execute(IAction action) throws BazaarException, InvocationTargetException, InterruptedException {
 		IProject project = getSelectedProjects()[0];
 		final UpdateCommand cmd = new UpdateCommand(project);
-		run(new WorkspaceModifyOperation() {
-			@Override
-            public void execute(IProgressMonitor monitor) throws InvocationTargetException {
-				try {
-					cmd.run(monitor);
-				} catch (BazaarException e) {
-					handle(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		}, false /* no cancelable */, PROGRESS_DIALOG);
-		MessageDialog.openInformation(getShell(), "Update finished", cmd.getOutputMessage());
+        String updMsg = null;
+        try {
+            run(new WorkspaceModifyOperation() {
+                @Override
+                public void execute(IProgressMonitor monitor)
+                    throws InvocationTargetException, BazaarException
+                {
+                    try {
+                        cmd.run(monitor);
+                    } finally {
+                        monitor.done();
+                    }
+                }
+            }, false /* no cancelable */, PROGRESS_DIALOG);
+        } catch (InvocationTargetException ite) {
+            Throwable ie = ite.getCause();
+            if (ie instanceof BazaarException) {
+                if (ie.getCause() != null) {
+                    ie = ie.getCause();
+                }
+                if (ie.getMessage().contains("conflicts encountered")) {
+                    updMsg = "Conflicts occurred during update.\n\n" + ie.getMessage();
+                    ite = null;
+                }
+            }
+            if (ite != null) {
+                throw ite;
+            }
+        }
+        try {
+            project.refreshLocal(IResource.DEPTH_INFINITE, null);
+        } catch (CoreException e) {
+            throw new BazaarException(e);
+        }
+        if (updMsg == null) {
+            updMsg = cmd.getOutputMessage();
+        }
+        MessageDialog.openInformation(getShell(), "Update finished", updMsg);
 	}
 
 	@Override
 
=== added file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/compare/ConflictingFileEditorInput.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/compare/ConflictingFileEditorInput.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/compare/ConflictingFileEditorInput.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,165 @@
+/*******************************************************************************
+ * Copyright (c) 2005-2008 Polarion Software.
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Gurov - Initial API and implementation
+ *    Alexander Taler - Copied from Subversive project to bzr-eclipse
+ *******************************************************************************/
+
+package org.vcs.bazaar.eclipse.ui.compare;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.compare.CompareConfiguration;
+import org.eclipse.compare.CompareEditorInput;
+import org.eclipse.compare.CompareUI;
+import org.eclipse.compare.ITypedElement;
+import org.eclipse.compare.internal.BufferedResourceNode;
+import org.eclipse.compare.structuremergeviewer.Differencer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Conflicting files merger editor input implementation
+ * 
+ * @author Alexander Gurov
+ */
+public class ConflictingFileEditorInput extends CompareEditorInput {
+    protected IFile target;
+    protected IFile left;
+    protected IFile right;
+    protected IFile ancestor;
+
+    protected MergeElement targetElement;
+
+    public ConflictingFileEditorInput(CompareConfiguration configuration,
+        IFile target,
+        IFile left,
+        IFile right,
+        IFile ancestor)
+    {
+        super(configuration);
+        this.target = target;
+        this.left = left;
+        this.right = right;
+        this.ancestor = ancestor;
+    }
+
+    protected Object prepareInput(IProgressMonitor monitor)
+        throws InvocationTargetException, InterruptedException
+    {
+        CompareConfiguration cc = this.getCompareConfiguration();
+        Image img = CompareUI.getImage(this.target);
+        cc.setLeftImage(img);
+        cc.setRightImage(img);
+        cc.setAncestorImage(img);
+        cc.setLeftLabel(this.target.getName() + " Local Revision"); //$NON-NLS-1$
+        cc.setLeftEditable(true);
+        cc.setRightLabel(this.target.getName() + " Incoming Revision"); //$NON-NLS-1$
+        cc.setRightEditable(false);
+        cc.setAncestorLabel(this.target.getName() + " Common Base"); //$NON-NLS-1$
+
+        this.setTitle(this.target.getName() + " Conflicts"); //$NON-NLS-1$
+
+        InputStream stream = null;
+        try {
+            stream = this.left.getContents();
+            byte[] buf = new byte[2048];
+            int len = 0;
+            ByteArrayOutputStream output = new ByteArrayOutputStream();
+            while ((len = stream.read(buf)) > 0) {
+                output.write(buf, 0, len);
+            }
+            this.targetElement = new MergeElement(this.target, output.toByteArray(), true);
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new InvocationTargetException(e);
+        } finally {
+            if (stream != null) {
+                try {
+                    stream.close();
+                } catch (Exception ex) {
+                }
+            }
+        }
+
+        try {
+            MergeElement rightRef = new MergeElement(this.right);
+            rightRef.setCharsetReference(this.targetElement);
+            MergeElement ancestorRef = new MergeElement(this.ancestor);
+            ancestorRef.setCharsetReference(this.targetElement);
+            return new Differencer().findDifferences(true, monitor, null, ancestorRef,
+                this.targetElement, rightRef);
+        } finally {
+            monitor.done();
+        }
+    }
+
+    public Object getAdapter(Class adapter) {
+        if (IFile.class.equals(adapter)) {
+            // disallow auto-flush of editor content
+            return this.target;
+        }
+        return super.getAdapter(adapter);
+    }
+
+    public void saveChanges(IProgressMonitor pm) throws CoreException {
+        // flush editor content...
+        super.saveChanges(pm);
+        // ...and save it
+        this.targetElement.commit(pm);
+
+        this.setDirty(false);
+    }
+
+    protected class MergeElement extends BufferedResourceNode {
+        protected boolean editable;
+        protected BufferedResourceNode charsetReference;
+
+        public BufferedResourceNode getCharsetReference() {
+            return this.charsetReference;
+        }
+
+        public void setCharsetReference(BufferedResourceNode charsetReference) {
+            this.charsetReference = charsetReference;
+        }
+
+        public MergeElement(IResource resource) {
+            this(resource, null, false);
+        }
+
+        public MergeElement(IResource resource, byte[] initialContent, boolean editable) {
+            super(resource);
+            this.editable = editable;
+            if (initialContent != null) {
+                this.setContent(initialContent);
+            }
+        }
+
+        public String getCharset() {
+            return this.charsetReference != null ? this.charsetReference.getCharset() : super
+                .getCharset();
+        }
+
+        public String getType() {
+            String extension = ConflictingFileEditorInput.this.target.getFileExtension();
+            return extension == null ? ITypedElement.UNKNOWN_TYPE : extension;
+        }
+
+        public boolean isEditable() {
+            return this.editable;
+        }
+    }
+
+}
 
=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/MergeDialog.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/MergeDialog.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/MergeDialog.java	2013-02-19 07:30:34 +0000
@@ -101,7 +101,7 @@
 		if(url == null || "".equals(url.trim())) {
 			return;
 		}
-		IBzrBranch branch = BranchFactory.getInstance().findOrCreateFor(url);
+        IBzrBranch branch = BranchFactory.findOrCreateFor(url);
 		if(branch != null) {
 			ShowLogDialog dialog = new ShowLogDialog(getShell(), branch);
 			if(dialog.open() == Dialog.OK && dialog.getSelectedRevision() != null) {
 
=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/SendDialog.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/SendDialog.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/SendDialog.java	2013-02-19 07:30:34 +0000
@@ -268,7 +268,7 @@
 		if(url == null || "".equals(url.trim())) {
 			return;
 		}
-		IBzrBranch branch = BranchFactory.getInstance().findOrCreateFor(url);
+        IBzrBranch branch = BranchFactory.findOrCreateFor(url);
 		if(branch != null) {
 			ShowLogDialog dialog = new ShowLogDialog(getShell(), branch);
 			if(dialog.open() == Dialog.OK && dialog.getSelectedRevision() != null) {
 
=== removed file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/operations/BranchAsProjectOperation.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/operations/BranchAsProjectOperation.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/operations/BranchAsProjectOperation.java	1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-/**
- * LICENSE + COPYRIGHT
- */
-package org.vcs.bazaar.eclipse.ui.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.vcs.bazaar.eclipse.core.commands.BranchCommand;
-import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
-import org.vcs.bazaar.eclipse.core.repository.BazaarTeamProviderType;
-import org.vcs.bazaar.eclipse.core.repository.BranchLocationManager;
-import org.vcs.bazaar.eclipse.internal.core.BazaarException;
-import org.vcs.bazaar.eclipse.ui.EclipseBazaarUI;
-
-/**
- * @author Guillermo Gonzalez
- *
- * TODO: Test me
- */
-public class BranchAsProjectOperation extends BzrOperation {
-	private final IBzrBranch fromLocation;
-	private final IProject project;
-	private final String revno;
-	private final IProjectDescription projectDescription;
-
-	/**
-	 *
-	 * @param fromLocation The parent of the project
-	 * @param project
-	 * @param revno
-	 */
-	public BranchAsProjectOperation(IRunnableContext context, IBzrBranch fromLocation, IProject project, String revno) {
-		this(context, fromLocation, project, null, revno);
-	}
-
-	public BranchAsProjectOperation(IRunnableContext context, IBzrBranch fromLocation, IProjectDescription description, String revno) {
-		this(context, fromLocation, null, description, revno);
-	}
-
-	public BranchAsProjectOperation(IRunnableContext context, IBzrBranch fromLocation, IProject project, IProjectDescription description, String revno) {
-		super(context);
-		this.fromLocation = fromLocation;
-		if(project == null) {
-			this.project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName());
-		} else {
-			this.project = project;
-		}
-		this.projectDescription = description;
-		this.revno = revno!=null&&"".equals(revno.trim())?null:revno;
-	}
-
-	/**
-	 * The action has been activated. The argument of the method represents the
-	 * 'real' action sitting in the workbench UI.
-	 *
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		try {
-			runCommand(monitor);
-			if(getProjectDescription() == null) {
-				getProject().create(monitor);
-			} else {
-				getProject().create(getProjectDescription(), monitor);
-			}
-			getProject().open(monitor);
-			// Register the project with Team. This will bring all the files
-			// that we cloned into the project.
-			BazaarTeamProviderType.registerProject(getProject());
-			if (getFromLocation() != null && !BranchLocationManager.getInstance().getAllBranches().contains(getFromLocation())) {
-			   BranchLocationManager.getInstance().addRepoLocation(getFromLocation());
-			}
-		} catch (BazaarException e) {
-			EclipseBazaarUI.log(e);
-			throw new InvocationTargetException(e, e.getMessage());
-		} catch (CoreException e) {
-			EclipseBazaarUI.log(e);
-			throw new InvocationTargetException(e, e.getMessage());
-		} finally {
-			monitor.done();
-		}
-	}
-
-	/**
-	 * @param monitor
-	 * @throws BazaarException
-	 */
-	protected void runCommand(IProgressMonitor monitor) throws BazaarException {
-		BranchCommand op = null;
-		if(getProjectDescription() == null)
-			op = new BranchCommand(getFromLocation(), getProject().getWorkspace().getRoot().getLocation().append(getProject().getName()).toFile().toURI(), getRevno());
-		else
-			op = new BranchCommand(getFromLocation(), getProjectDescription().getLocationURI(), getRevno());
-		op.run(monitor);
-	}
-
-	@Override
-	protected boolean canRunAsJob() {
-		return true;
-	}
-
-	/**
-	 * @return the projectDescription
-	 */
-	protected IProjectDescription getProjectDescription() {
-		return projectDescription;
-	}
-
-	/**
-	 * @return the fromLocation
-	 */
-	protected IBzrBranch getFromLocation() {
-		return fromLocation;
-	}
-
-	/**
-	 * @return the project
-	 */
-	protected IProject getProject() {
-		return project;
-	}
-
-	/**
-	 * @return the revno
-	 */
-	protected String getRevno() {
-		return revno;
-	}
-
-}
 
=== removed file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/operations/CheckoutAsProjectOperation.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/operations/CheckoutAsProjectOperation.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/operations/CheckoutAsProjectOperation.java	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/**
- * LICENSE + COPYRIGHT
- */
-package org.vcs.bazaar.eclipse.ui.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.vcs.bazaar.client.BazaarRevision;
-import org.vcs.bazaar.client.commandline.commands.options.Option;
-import org.vcs.bazaar.client.commandline.syntax.ICheckoutOptions;
-import org.vcs.bazaar.eclipse.core.commands.CheckoutCommand;
-import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
-import org.vcs.bazaar.eclipse.internal.core.BazaarException;
-
-/**
- * @author Guillermo Gonzalez <[e-mail]>
- *
- */
-public class CheckoutAsProjectOperation extends BranchAsProjectOperation {
-
-	private Option[] options;
-
-	/**
-	 *
-	 * @param fromLocation The parent of the project
-	 * @param description
-	 * @param revno
-	 */
-	public CheckoutAsProjectOperation(IRunnableContext context, IBzrBranch fromLocation, IProjectDescription description, String revno, boolean lightweight) {
-		this(context, fromLocation, null, description, revno, lightweight);
-	}
-
-	public CheckoutAsProjectOperation(IRunnableContext context, IBzrBranch fromLocation, IProject project, String revno, boolean lightweight) {
-		this(context, fromLocation, project, null, revno, lightweight);
-	}
-
-	public CheckoutAsProjectOperation(IRunnableContext context, IBzrBranch fromLocation, IProject project, IProjectDescription description, String revno, boolean lightweight) {
-		super(context, fromLocation, project, description, revno);
-		List<Option> options = new ArrayList<Option>(0);
-		if(lightweight) {
-			options.add(ICheckoutOptions.LIGHTWEIGHT);
-		}
-		if(revno != null && !"".equals(revno.trim())) {
-			options.add(ICheckoutOptions.REVISION.setArgument(BazaarRevision.getRevision(BazaarRevision.Prefix.REVNO, revno).toString()));
-		}
-		this.options = options.toArray(new Option[0]);
-	}
-
-	@Override
-    protected void runCommand(IProgressMonitor monitor) throws BazaarException {
-		CheckoutCommand op = null;
-		if(getProjectDescription() == null) {
-			op = new CheckoutCommand(getFromLocation(), getProject().getWorkspace().getRoot().getLocation().append(getProject().getName()).toFile().toURI(), options);
-		} else {
-			op = new CheckoutCommand(getFromLocation(), getProjectDescription().getLocationURI(), options);
-		}
-		op.run(monitor);
-	}
-
-	@Override
-	protected boolean canRunAsJob() {
-		return true;
-	}
-
-}
 
=== added file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/operations/CreateBazaarProjectOperation.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/operations/CreateBazaarProjectOperation.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/operations/CreateBazaarProjectOperation.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,198 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Taler
+ *******************************************************************************/
+package org.vcs.bazaar.eclipse.ui.operations;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.operation.IRunnableContext;
+import org.eclipse.team.ui.TeamOperation;
+import org.vcs.bazaar.client.BazaarRevision;
+import org.vcs.bazaar.client.commandline.commands.options.Option;
+import org.vcs.bazaar.client.commandline.syntax.ICheckoutOptions;
+import org.vcs.bazaar.eclipse.core.commands.BranchCommand;
+import org.vcs.bazaar.eclipse.core.commands.CheckoutCommand;
+import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
+import org.vcs.bazaar.eclipse.core.repository.BazaarTeamProviderType;
+import org.vcs.bazaar.eclipse.core.repository.BranchLocationManager;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
+
+/**
+ * Operation for creating project(s) from a Bazaar branch.
+ * 
+ * Influenced by earlier implementation by Guillermo Gonzalez.
+ * 
+ * @author Alexander Taler alex <@> idereal <.> co <.> nz
+ */
+public class CreateBazaarProjectOperation extends TeamOperation {
+
+    public static int TYPE_CHECKOUT = 1;
+    public static int TYPE_LIGHTWEIGHT = 2;
+    public static int TYPE_BRANCH = 3;
+
+    String projectName;
+    IBzrBranch remoteBranch;
+    String projectLocation;
+    int type;
+    String revision;
+    
+    /**
+     * 
+     * @param context  Found with getContainer()
+     * @param projectName  The project to be created
+     * @param remoteBranch  The branch to get code from
+     * @param projectLocation Where on disk to check out the project
+     * @param type The type of operation, one of TYPE_CHECKOUT, TYPE_LIGHTWEIGHT, TYPE_BRANCH
+     * @param revision Optional revision, null means use tip
+     */
+    public CreateBazaarProjectOperation(IRunnableContext context,
+        String projectName,
+        IBzrBranch remoteBranch,
+        String projectLocation,
+        int type,
+        String revision)
+    {
+        super(context);
+        this.projectName = projectName;
+        this.remoteBranch = remoteBranch;
+        this.projectLocation = projectLocation;
+        this.type = type;
+        this.revision = revision;
+    }
+
+    public void run(IProgressMonitor monitor)
+        throws InvocationTargetException, InterruptedException
+    {
+        try {
+            URI toDir = new URI("file", projectLocation, null);
+
+            if (type == TYPE_BRANCH) {
+                BranchCommand op = new BranchCommand(remoteBranch, toDir, revision);
+                op.run(monitor);
+            } else {
+                List<Option> options = new ArrayList<Option>(0);
+                if (type == TYPE_LIGHTWEIGHT) {
+                    options.add(ICheckoutOptions.LIGHTWEIGHT);
+                }
+                if ((revision != null) && revision.trim().length() > 0) {
+                    String s = BazaarRevision.getRevision(BazaarRevision.Prefix.REVNO, revision).toString();
+                    options.add(ICheckoutOptions.REVISION.setArgument(s));
+                }
+                CheckoutCommand op = new CheckoutCommand(remoteBranch, toDir, options.toArray(new Option[0]));
+                op.run(monitor);
+            }
+
+            // Search the resulting checked out directory for existing Eclipse projects.
+            List<File> projDirs = findProjects(new File(projectLocation));
+
+            // If no projects were found, then just create a single project at the root.
+            if (projDirs.isEmpty()) {
+                projDirs.add(new File(projectLocation));
+            }
+
+            // Go through the list of project directories and add them all
+            for (File projDir : projDirs) {
+                createProject(projDir, monitor);
+            }
+        } catch (BazaarException e) {
+            throw new InvocationTargetException(e);
+        } catch (CoreException e) {
+            throw new InvocationTargetException(e);
+        } catch (URISyntaxException e) {
+            throw new InvocationTargetException(e);
+        }
+    }
+
+    /**
+     * Search the given location for Eclipse projects.
+     * 
+     * This is done after the location has been fetched from Bazaar. The
+     * function performs the search recursively, stopping when it finds a
+     * project file.
+     * 
+     * @return List of File objects, the directories containing Bazaar projects.
+     */
+    private List<File> findProjects(File location) {
+        List<File> ps = new LinkedList<File>();
+        File dotProj = new File(location, ".project");
+        if (dotProj.exists()) {
+            ps.add(location);
+            return ps;
+        }
+        // Search directories
+        File[] dirs = location.listFiles(new FileFilter() {
+            public boolean accept(File pathname) {
+                return pathname.isDirectory() && !pathname.getName().equals(".bzr");
+            }
+        });
+
+        for (File dir : dirs) {
+            ps.addAll(findProjects(dir));
+        }
+
+        return ps;
+    }
+    
+    /**
+     * Create an Eclipse project at the given location.
+     *
+     * Eclipse throws an exception if a ProjectDescription is used to create
+     * a project at a location directly in the workspace root. However, if
+     * the project location has the same name as the project itself, then
+     * creating the project without a description will not throw an
+     * exception.
+     * 
+     * So, as a special case if the directory is in the workspace root, but
+     * matches the project name, create is used without a description.
+     * 
+     * The other error case is not checked for here, in case this
+     * undocumented Eclipse behaviour changes.
+     */
+    private void createProject(File projDir, IProgressMonitor monitor) throws CoreException {
+        IWorkspace ws = ResourcesPlugin.getWorkspace();
+        IPath projPath = new Path(projDir.toString());
+        IPath parentPath = projPath.removeLastSegments(1);
+        IProject projectHandle = null;
+
+        if (parentPath.equals(ws.getRoot().getLocation())
+            && projPath.lastSegment().equals(projectName)) {
+
+            projectHandle = ws.getRoot().getProject(projectName);
+            projectHandle.create(monitor);
+
+        } else {
+
+            // Derive a new project name based on the directory
+            String newProjectName = projectName + "-" + projPath.lastSegment();
+            projectHandle = ws.getRoot().getProject(newProjectName);
+            IProjectDescription projDesc = ws.newProjectDescription(newProjectName);
+            projDesc.setLocation(projPath);
+            projectHandle.create(projDesc, monitor);
+        }
+        projectHandle.open(monitor);
+        BazaarTeamProviderType.registerProject(projectHandle);
+        BranchLocationManager.getInstance().addRepoLocation(remoteBranch);
+    }
+}
 
=== added directory 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject'
=== added file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectAdvancedPage.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectAdvancedPage.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectAdvancedPage.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Taler
+ *******************************************************************************/
+package org.vcs.bazaar.eclipse.ui.wizards.createproject;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.vcs.bazaar.eclipse.ui.EclipseBazaarUI;
+
+/**
+ * Advanced options for Bazaar project creation Wizard.
+ * 
+ * Allows selection of:
+ *  - Detached branch, checkout, or lightweight checkout
+ *  - revision to fetch
+ * 
+ * @author Alexander Taler alex <@> idereal <.> co <.> nz
+ */
+public class CreateProjectAdvancedPage extends WizardPage {
+
+    // The parent wizard to act as a reference
+    public CreateProjectWizard wiz;
+
+    CreateProjectBranchType branchTypeEntry = null;
+    CreateProjectRevision revision = null;
+
+    public CreateProjectAdvancedPage(String pageName, CreateProjectWizard wiz) {
+		super(pageName);
+        this.wiz = wiz;
+        setTitle("Eclipse Project from Bazaar");
+        setDescription("Advanced options for creating project from Bazaar repository");
+        ImageDescriptor titleImage = EclipseBazaarUI.getImageDescriptor("icons/bzr-eclipse.jpg");
+        setImageDescriptor(titleImage);
+	}
+
+	public void createControl(Composite parent) {
+        final Composite topComposite = new Composite(parent, SWT.NONE);
+        topComposite.setLayout(new GridLayout(1, false));
+
+        branchTypeEntry = new CreateProjectBranchType(topComposite, this, wiz, 425);
+        revision = new CreateProjectRevision(topComposite, this, wiz, 425);
+
+        setControl(topComposite);
+        setPageComplete(true);
+	}
+
+	@Override
+	public boolean isPageComplete() {
+        return true;
+	}
+
+    public int getBranchType() {
+        return branchTypeEntry.getBranchType();
+    }
+
+    public String getRevision() {
+        return revision.getValue();
+    }
+}
 
=== added file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectBranchType.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectBranchType.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectBranchType.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Taler
+ *******************************************************************************/
+package org.vcs.bazaar.eclipse.ui.wizards.createproject;
+
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Scrollable;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
+import org.vcs.bazaar.eclipse.ui.operations.CreateBazaarProjectOperation;
+
+/**
+ * A specialization of CreateProjectEntry.
+ * 
+ * Provides a multi selection box to choose the branch type, Branch, Checkout or
+ * Lightweight Checkout.
+ * 
+ * @author Alexander Taler
+ */
+public class CreateProjectBranchType extends CreateProjectEntry {
+
+    private static String labelText = "Branch Type";
+
+    protected Button coButton;
+    protected Button lwcoButton;
+    protected Button brButton;
+
+    public CreateProjectBranchType(Composite parent,
+                                   WizardPage page,
+                                   CreateProjectWizard wiz,
+                                   int width) {
+        super(parent, page, wiz, labelText, width, "");
+    }
+
+    @Override
+    protected Scrollable createWidget(Composite parent) {
+        Composite compo = new Composite(parent, SWT.NONE);
+        compo.setLayout(new GridLayout(1, false));
+
+        coButton = new Button(compo, SWT.RADIO);
+        coButton.setText("Checkout");
+        coButton.setSelection(true);
+
+        lwcoButton = new Button(compo, SWT.RADIO);
+        lwcoButton.setText("Lightweight Checkout");
+
+        brButton = new Button(compo, SWT.RADIO);
+        brButton.setText("Branch");
+
+        return compo;
+    }
+
+    @Override
+    public void isValid() throws BazaarException {
+        return;
+    }
+
+    @Override
+    public String getValue() {
+        return "";
+    }
+
+    public int getBranchType() {
+        if (coButton.getSelection()) {
+            return CreateBazaarProjectOperation.TYPE_CHECKOUT;
+        }
+        if (lwcoButton.getSelection()) {
+            return CreateBazaarProjectOperation.TYPE_LIGHTWEIGHT;
+        }
+        if (brButton.getSelection()) {
+            return CreateBazaarProjectOperation.TYPE_BRANCH;
+        }
+        throw new RuntimeException("No Branch Type selected");
+    }
+
+    @Override
+    public void setValue(String newValue) {
+        throw new RuntimeException("setValue not supported");
+    }
+}
 
=== added file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectEntry.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectEntry.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectEntry.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Taler
+ *******************************************************************************/
+package org.vcs.bazaar.eclipse.ui.wizards.createproject;
+
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Scrollable;
+import org.eclipse.swt.widgets.Text;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
+
+/**
+ * A set of widgets and functionality on the project wizard page.
+ * 
+ * Provides layout: creating a label and single line text box.
+ * 
+ * Manages page completion by listening for events, providing isComplete()
+ * method and calling setPageComplete().
+ * 
+ * Can "cascade" text to another text entry box. This allows user input to
+ * update several entries simultaneously. This is suppressed for entries which
+ * the user has edited manually.
+ * 
+ * @author Alexander Taler alex <@> idereal <.> co <.> nz
+ */
+public class CreateProjectEntry implements Listener {
+
+    Scrollable textWidget; // The widget holding the text.
+    WizardPage page; // The parent page
+    CreateProjectWizard wiz; // The parent wizard to act as a reference
+    boolean touched = false; // true when the user has directly edited the field
+    CreateProjectEntry cascadeTo = null; // An entry object to cascade text to
+    String baseValue = ""; // The base value, modifiable but a useful start
+
+    protected Text text; // The text widget which holds user input.  It may be null in sub classes
+
+    /**
+     * A new text entry box on a CreateProjectPage.
+     * 
+     * @param parent The SWT Composite holds this.
+     * @param page The CreateProjectPage containing this.
+     * @param labelText String to display to user explaining what to enter.
+     * @param width Suggested width for the text entry box.
+     * @param baseValue Optional base value.
+     */
+    public CreateProjectEntry(Composite parent,
+        WizardPage page,
+        CreateProjectWizard wiz,
+        String labelText,
+        int width,
+        String baseValue)
+    {
+        this.page = page;
+        this.wiz = wiz;
+        if (baseValue != null) {
+            this.baseValue = baseValue;
+        }
+
+        Label label = new Label(parent, SWT.LEFT);
+        label.setText(labelText);
+
+        textWidget = createWidget(parent);
+        final GridData gridData = new GridData(SWT.VERTICAL);
+        gridData.widthHint = width;
+        textWidget.setLayoutData(gridData);
+
+        textWidget.addListener(SWT.Modify, this);
+    }
+
+    protected Scrollable createWidget(Composite parent) {
+        text = new Text(parent, SWT.SINGLE | SWT.BORDER);
+        text.setText(baseValue);
+        return text;
+    }
+
+    public void handleEvent(Event event) {
+        if (textWidget.isFocusControl()) {
+            touched = isModified();
+            page.setMessage(null);
+        }
+        if (cascadeTo != null) {
+            cascadeTo.cascade(getValue());
+        }
+        try {
+            isValid();
+            page.setPageComplete(true);
+        } catch (BazaarException be) {
+            page.setPageComplete(false);
+            // SetErrorMessage is not displaying. I have not investigated.
+            String message = be.getStatus().getMessage();
+            if ((message != null) && (message.length() > 0)) {
+                page.setMessage(message, IMessageProvider.WARNING);
+            }
+        }
+    }
+
+    public void setCascadeTo(CreateProjectEntry cascadeTo) {
+        this.cascadeTo = cascadeTo;
+    }
+
+    /**
+     * Receive text from another element used to populate this field.
+     * 
+     * @param cascadeText
+     */
+    private void cascade(String cascadeText) {
+        if (touched) {
+            return;
+        }
+        // Only use the last segment assuming it's a file name or similar
+        String[] parts = cascadeText.split("[\\\\/]");
+        if (parts.length > 0) {
+            cascadeText = parts[parts.length - 1];
+        }
+        setValue(baseValue + cascadeText);
+        if (cascadeTo != null) {
+            cascadeTo.cascade(getValue());
+        }
+    }
+
+    /**
+     * Check if this field is modified from it's original value.
+     */
+    public boolean isModified() {
+        return (getValue().length() > 0) && (!getValue().equals(baseValue));
+    }
+    
+    /**
+     * Check if this field is complete and valid.
+     * 
+     * The default implementation just checks if it's modified. The thrown
+     * exception message explains the issue, or is empty if there's nothing
+     * interesting to say.
+     * 
+     * @throws BazaarException including a message.
+     */
+    public void isValid() throws BazaarException {
+        if (!isModified()) {
+            throw new BazaarException("");
+        }
+    }
+    
+    // This method is used internally in order to allow subclasses to override text
+    public String getValue() {
+        return text.getText();
+    }
+
+    // This method is used internally in order to allow subclasses to override text
+    public void setValue(String newValue) {
+        text.setText(newValue);
+    }
+
+}
 
=== added file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectLocation.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectLocation.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectLocation.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Taler
+ *******************************************************************************/
+package org.vcs.bazaar.eclipse.ui.wizards.createproject;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.widgets.Composite;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
+
+/**
+ * A widget for entering a project location.
+ * 
+ * This means checking the validity.
+ * 
+ * @author Alexander Taler
+ */
+public class CreateProjectLocation extends CreateProjectEntry {
+    public CreateProjectLocation(Composite parent,
+        WizardPage page,
+        CreateProjectWizard wiz,
+        String labelText,
+        int width,
+        String baseValue)
+    {
+        super(parent, page, wiz, labelText, width, baseValue);
+    }
+
+    @Override
+    public void isValid() throws BazaarException {
+        // Ensure that it's modified.
+        super.isValid();
+        IPath loc = new Path(getValue());
+        IPath locParent = loc.removeLastSegments(1);
+        IPath workBase = new Path(baseValue);
+        IPath locDefault = new Path(baseValue + wiz.getProjectName());
+        if (loc.equals(workBase)) {
+            throw new BazaarException("Project Location cannot be directly in the workspace root");
+        }
+        if (locParent.equals(workBase) && !loc.equals(locDefault)) {
+            throw new BazaarException(
+                "Project Location cannot be a folder in the workspace root with a different name from the project.");
+        }
+    }
+}
 
=== added file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectName.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectName.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectName.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Taler
+ *******************************************************************************/
+package org.vcs.bazaar.eclipse.ui.wizards.createproject;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.widgets.Composite;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
+
+/**
+ * A specialization of CreateProjectEntry.
+ * 
+ * This boils down to one line of code: checking validity of project name. A
+ * whole class for that one line seems a bit excessive.
+ * 
+ * @author Alexander Taler
+ */
+public class CreateProjectName extends CreateProjectEntry {
+    public CreateProjectName(Composite parent,
+                                     WizardPage page,
+                                     CreateProjectWizard wiz,
+                                     String labelText,
+                                     int width,
+                                     String baseValue) {
+        super(parent, page, wiz, labelText, width, baseValue);
+    }
+
+    @Override
+    public void isValid() throws BazaarException {
+        // Ensure that it's modified.
+        super.isValid();
+        try {
+            IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(getValue());
+            if (project.exists()) {
+                throw new BazaarException("Project name already taken");
+            }
+        } catch (IllegalArgumentException iae) {
+            throw new BazaarException("Illegal project name");
+        }
+    }
+
+}
 
=== added file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectPage.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectPage.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectPage.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Taler
+ *******************************************************************************/
+package org.vcs.bazaar.eclipse.ui.wizards.createproject;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.vcs.bazaar.eclipse.ui.EclipseBazaarUI;
+
+/**
+ * The basic page for the Bazaar project creation Wizard.
+ *
+ * The page is has these entries, in order:
+ *  - Remote Bazaar URL
+ *  - Project Name
+ *  - Local directory location
+ *
+ * @author Alexander Taler alex <@> idereal <.> co <.> nz
+ */
+public class CreateProjectPage extends WizardPage {
+
+    // The parent wizard to act as a reference
+    public CreateProjectWizard wiz;
+
+    CreateProjectRemoteBranch remoteBranch = null;
+    CreateProjectName projName = null;
+    CreateProjectLocation projLoc = null;
+
+    public CreateProjectPage(String pageName, CreateProjectWizard wiz) {
+        super(pageName);
+        this.wiz = wiz;
+        setTitle("Eclipse Project from Bazaar");
+        setDescription("Create a local Eclipse project connected to a remote Bazaar branch");
+        ImageDescriptor titleImage = EclipseBazaarUI.getImageDescriptor("icons/bzr-eclipse.jpg");
+        setImageDescriptor(titleImage);
+	}
+
+	public void createControl(Composite parent) {
+        final Composite topComposite = new Composite(parent, SWT.NONE);
+        topComposite.setLayout(new GridLayout(1, false));
+
+        ///////////////
+        // Repository Location
+        remoteBranch = new CreateProjectRemoteBranch(topComposite, this, wiz, 425, "");
+        setRepoLocation(wiz.getInitialBranch());
+
+        // Space
+        Label space1Label = new Label(topComposite, SWT.LEFT);
+        space1Label.setText("");
+
+        ///////////////
+        // Project Name
+        projName = new CreateProjectName(topComposite, this, wiz, "Name of Eclipse Project", 150, "");
+
+        // Space
+        Label space2Label = new Label(topComposite, SWT.LEFT);
+        space2Label.setText("");
+
+        ///////////////
+        // Project Location
+        String bv = Platform.getLocation().addTrailingSeparator().toOSString();
+
+        projLoc = new CreateProjectLocation(topComposite, this, wiz, "Location for Eclipse Project", 425, bv);
+
+        // Set up the connections
+        remoteBranch.setCascadeTo(projName);
+        projName.setCascadeTo(projLoc);
+
+        setControl(topComposite);
+		setPageComplete(false);
+	}
+
+	@Override
+	public boolean isPageComplete() {
+        try {
+            remoteBranch.isValid();
+            projName.isValid();
+            projLoc.isValid();
+        } catch (Exception e) {
+            // NullPointerException and BazaarException
+            return false;
+        }
+        return true;
+	}
+
+    public String getProjectName() {
+        return projName.getValue();
+    }
+
+    public String getRepoLocation() {
+        return remoteBranch.getValue();
+    }
+
+    public void setRepoLocation(String newValue) {
+        if (newValue != null) {
+            remoteBranch.setValue(newValue);
+        }
+    }
+
+    public String getProjectLocation() {
+        return projLoc.getValue();
+    }
+}
 
=== added file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectRemoteBranch.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectRemoteBranch.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectRemoteBranch.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Taler
+ *******************************************************************************/
+package org.vcs.bazaar.eclipse.ui.wizards.createproject;
+
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Scrollable;
+import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
+import org.vcs.bazaar.eclipse.core.repository.BranchLocationManager;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
+import org.vcs.bazaar.eclipse.internal.core.model.BzrBranchLocator;
+import org.vcs.bazaar.eclipse.ui.EclipseBazaarUI;
+
+/**
+ * A specialization of CreateProjectEntry.
+ * 
+ * It uses a Combo widget instead of a Text widget, validates that input is
+ * correctly formatted and adds a button to browse the file system for branches.
+ * 
+ * @author Alexander Taler
+ */
+public class CreateProjectRemoteBranch extends CreateProjectEntry {
+
+    protected Combo combo;
+
+    private static String labelText =
+        "Repository Location\nProvide a URL to a remote repository and branch, or browse for a branch on the local machine";
+
+    public CreateProjectRemoteBranch(Composite parent,
+                                     WizardPage page,
+                                     CreateProjectWizard wiz,
+                                     int width,
+                                     String baseValue) {
+        super(parent, page, wiz, labelText, width, baseValue);
+    }
+
+    @Override
+    protected Scrollable createWidget(Composite parent) {
+        Composite compo = new Composite(parent, SWT.NONE);
+        compo.setLayout(new GridLayout(2, false));
+
+        combo = new Combo(compo, SWT.SINGLE | SWT.BORDER);
+
+        for (IBzrBranch br : BranchLocationManager.getInstance().getAllBranches()) {
+            try {
+                combo.add(br.getBranchLocator().toString());
+            } catch (BazaarException e1) {
+                // A broken branch is not critical, just log it
+                EclipseBazaarUI.log(e1);
+            }
+        }
+
+        final Button browse = new Button(compo, SWT.PUSH);
+        browse.setText("Browse for folder");
+        browse.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                final DirectoryDialog dialog = new DirectoryDialog(page.getShell());
+                dialog.setMessage("Select folder");
+                final String seldir = dialog.open();
+                if (seldir != null) {
+                    combo.setText(seldir);
+                }
+            }
+        });
+
+        return combo;
+    }
+
+    @Override
+    public void isValid() throws BazaarException {
+        // Ensure that it's modified.
+        super.isValid();
+        new BzrBranchLocator(getValue());
+    }
+
+    @Override
+    public String getValue() {
+        return combo.getText();
+    }
+
+    @Override
+    public void setValue(String newValue) {
+        combo.setText(newValue);
+    }
+}
 
=== added file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectRevision.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectRevision.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectRevision.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Taler
+ *******************************************************************************/
+package org.vcs.bazaar.eclipse.ui.wizards.createproject;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Scrollable;
+import org.eclipse.swt.widgets.Text;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
+import org.vcs.bazaar.eclipse.ui.dialogs.ShowLogDialog;
+
+/**
+ * Allow selection of older revisions
+ * 
+ * Provides an entry box to provide an older revision number.
+ * 
+ * TODO: Add support for symbolic tags.
+ * TODO: Replace with org.vcs.bazaar.eclipse.ui.widgets.RevisionNumber 
+ * 
+ * @author Alexander Taler
+ */
+public class CreateProjectRevision extends CreateProjectEntry {
+
+    private static String labelText = "Fetch a specific revision";
+
+    private Button checkBox;
+    private Button showLog;
+
+    public CreateProjectRevision(Composite parent,
+                                 WizardPage page,
+                                 CreateProjectWizard wiz,
+                                 int width) {
+        super(parent, page, wiz, labelText, width, "");
+    }
+
+    @Override
+    protected Scrollable createWidget(Composite parent) {
+        Composite compo = new Composite(parent, SWT.NONE);
+        compo.setLayout(new GridLayout(3, false));
+
+        checkBox = new Button(compo, SWT.CHECK);
+        checkBox.setText("Use older revision");
+        checkBox.setSelection(false);
+
+        text = new Text(compo, SWT.BORDER);
+        GridData gridData = new GridData(SWT.VERTICAL);
+        gridData.widthHint = 50;
+        text.setLayoutData(gridData);
+        text.setEnabled(false);
+
+        // Enable revision text box iff it's enabled.
+        checkBox.addListener(SWT.Selection, new Listener() {
+            public void handleEvent(Event event) {
+                text.setEnabled(checkBox.getSelection());
+            }
+        });
+
+        // Add the showlog button
+        showLog = new Button(compo, SWT.PUSH);
+        showLog.setText("View Revision Log");
+        showLog.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                try {
+                    checkBox.setSelection(true);
+                    final ShowLogDialog dialog =
+                        new ShowLogDialog(page.getShell(), wiz.getRemoteBranch());
+                    if (dialog.open() == Dialog.OK && dialog.getSelectedRevision() != null) {
+                        text.setText(dialog.getSelectedRevision().getValue());
+                    }
+                } catch (BazaarException be) {
+                    // SetErrorMessage is not displaying. I have not investigated.
+                    String message = be.getStatus().getMessage();
+                    if ((message != null) && (message.length() > 0)) {
+                        page.setMessage(message, IMessageProvider.WARNING);
+                    }
+                }
+            }
+        });
+
+        return compo;
+    }
+
+    @Override
+    public void isValid() throws BazaarException {
+        return;
+    }
+}
 
=== added file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectWizard.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectWizard.java	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectWizard.java	2013-02-19 07:30:34 +0000
@@ -0,0 +1,176 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Idereal Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Taler
+ *******************************************************************************/
+package org.vcs.bazaar.eclipse.ui.wizards.createproject;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.vcs.bazaar.eclipse.BzrWorkspaceRoot;
+import org.vcs.bazaar.eclipse.EclipseBazaarCore;
+import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
+import org.vcs.bazaar.eclipse.internal.core.BazaarException;
+import org.vcs.bazaar.eclipse.internal.core.model.BzrBranchLocator;
+import org.vcs.bazaar.eclipse.ui.EclipseBazaarUI;
+import org.vcs.bazaar.eclipse.ui.operations.CreateBazaarProjectOperation;
+import org.vcs.bazaar.eclipse.ui.team.BazaarUtilities;
+
+/**
+ * A Wizard for creating a local Eclipse project from a remote Bazaar branch.
+ * 
+ * It can be called from the create project and import project menus. It can
+ * also be called from the Branch action, in which case the selection is used to
+ * determine the remote Bazaar branch.
+ * 
+ * @author Alexander Taler alex <@> idereal <.> co <.> nz
+ */
+public class CreateProjectWizard extends Wizard implements INewWizard {
+
+    private CreateProjectPage cpPage;
+    private CreateProjectAdvancedPage cpaPage;
+
+    // Initial branch
+    protected String initialBranch = null;
+
+    public CreateProjectWizard() {
+        super();
+    }
+
+    public CreateProjectWizard(IStructuredSelection ss) {
+        super();
+        init(null, null);
+
+        if ((ss == null) || (ss.size() < 0)) {
+            throw new RuntimeException("Selection required");
+        }
+        if (ss.size() > 1) {
+            throw new RuntimeException("Single Selection only supported");
+        }
+        if (!(ss.getFirstElement() instanceof IProject)) {
+            throw new RuntimeException("Selection must be a Project");
+        }
+        IProject project = (IProject) ss.getFirstElement();
+        IBzrBranch branch = BzrWorkspaceRoot.getBzrWorkspaceRootFor(project).getBranch();
+        try {
+            initialBranch = branch.getBranchLocator().toString();
+        } catch (BazaarException e) {
+            EclipseBazaarUI.log(e);
+        }
+    }
+
+    /**
+     * The branch that this wizard was created with.
+     */
+    String getInitialBranch() {
+        return initialBranch;
+    }
+
+    /**
+     * Display this wizard to the user.
+     * 
+     * @param shell
+     */
+    public void show(Shell shell) {
+        new WizardDialog(shell, this).open();
+    }
+
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+        setWindowTitle("Bazaar Create Project Wizard");
+        setNeedsProgressMonitor(true);
+        cpPage = new CreateProjectPage("BazaarCreateProjectPage", this);
+        addPage(cpPage);
+        cpaPage = new CreateProjectAdvancedPage("BazaarCreateProjectPage", this);
+        addPage(cpaPage);
+
+		if (!EclipseBazaarCore.getDefault().isClientAvailable()) {
+			BazaarUtilities.configureExecutable();
+		}
+	}
+
+    /**
+     * Display a useful error message to the user.
+     * 
+     * The message is shown on both pages of the wizard.
+     * 
+     * @param e The exception to show to the user.
+     */
+    protected void setErrorMessage(Throwable e) {
+        String message = "";
+        if (e instanceof InvocationTargetException) {
+            e = e.getCause();
+        }
+        if (e instanceof BazaarException) {
+            message = ((BazaarException) e).getStatus().getMessage();
+        } else if (e instanceof CoreException) {
+            if (((CoreException) e).getStatus() != null) {
+                message = ((CoreException) e).getStatus().getMessage();
+                for (IStatus i : ((CoreException) e).getStatus().getChildren()) {
+                    message += i.getMessage();
+                }
+            } else {
+                message = e.getMessage();
+            }
+        }
+        EclipseBazaarUI.log(e);
+        cpPage.setErrorMessage(message);
+        cpaPage.setErrorMessage(message);
+	}
+
+    /**
+     * Return a branch object for the branch this wizard will use.
+     * 
+     * @return A branch object of the appropriate type
+     * @throws BazaarException if the user specified branch is invalid
+     */
+    public IBzrBranch getRemoteBranch() throws BazaarException {
+        return new BzrBranchLocator(cpPage.getRepoLocation()).getBranch();
+    }
+
+    /**
+     * Return the project name currently entered.
+     * 
+     * @return String containing the project name
+     */
+    public String getProjectName() {
+        return cpPage.getProjectName();
+    }
+
+    @Override
+    public boolean performFinish() {
+        try {
+            CreateBazaarProjectOperation op =
+                new CreateBazaarProjectOperation(
+                    this.getContainer(),
+                    cpPage.getProjectName(),
+                    getRemoteBranch(),
+                    cpPage.getProjectLocation(),
+                    cpaPage.getBranchType(),
+                    cpaPage.getRevision());
+            op.run();
+            return true;
+        } catch (InvocationTargetException e) {
+            setErrorMessage(e);
+        } catch (InterruptedException e) {
+            setErrorMessage(e);
+        } catch (BazaarException e) {
+            setErrorMessage(e);
+        }
+        return false;
+    }
+}
+
 
=== removed directory 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project'
=== removed file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchFromProjectWizard.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchFromProjectWizard.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchFromProjectWizard.java	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-/**
- * LICENSE + COPYRIGHT
- */
-package org.vcs.bazaar.eclipse.ui.wizards.project;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
-import org.vcs.bazaar.eclipse.ui.EclipseBazaarUI;
-import org.vcs.bazaar.eclipse.ui.operations.BranchAsProjectOperation;
-
-/**
- * This class implements the branch from project wizard
- *
- * @author Guillermo Gonzalez <guillo.gonzo at gmail dot com>
- */
-public class BranchFromProjectWizard extends BranchWizard {
-
-	public BranchFromProjectWizard(Shell shell, IBzrBranch branch) {
-		super();
-		setRemoteLocation(branch);
-		init(null, null);
-	}
-
-	public static BranchFromProjectWizard open(Shell shell, IBzrBranch branch) {
-		BranchFromProjectWizard wizard = new BranchFromProjectWizard(shell, branch);
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-		dialog.open();
-		return wizard;
-	}
-
-
-	@Override
-    protected boolean performOperation(IProject project) {
-		BranchAsProjectOperation branchOp = null;
-		if(project == null) {
-			IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(getNewProjectPage().getProjectName());
-			description.setLocation(getNewProjectPage().getLocationPath());
-			branchOp = new BranchAsProjectOperation(this.getContainer(), getRemoteLocation(), description, getProjectPage().getRevision());
-		} else {
-			branchOp = new BranchAsProjectOperation(this.getContainer(), getRemoteLocation(), project, getProjectPage().getRevision());
-		}
-		try {
-			branchOp.run();
-		} catch (Exception e) {
-			MessageDialog.openError(this.getShell(), "Error while executing branch operation", e.getMessage());
-			EclipseBazaarUI.log(e.getMessage(), e);
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	public void addPages() {
-		//super.addPages();
-		addPage(getProjectPage());
-		addPage(getNewProjectPage());
-	}
-
-	@Override
-	public IWizardPage getNextPage(IWizardPage page) {
-		if(page != null) {
-			if(page.getName().equals(getProjectPage().getName())) {
-				if(getProjectPage().useNewProjectWizard()) {
-					setUseNewProjectWizard(true);
-					return null;
-				} else {
-					setUseNewProjectWizard(false);
-					return getNewProjectPage();
-				}
-			} else if(page.getName().equals(getNewProjectPage().getName())) {
-				return null;
-			}
-		}
-		return super.getNextPage(page);
-	}
-
-	@Override
-	public IWizardPage getPreviousPage(IWizardPage page) {
-		if(page != null) {
-			if(page.getName().equals(getNewProjectPage().getName())) {
-				return getProjectPage();
-			}
-		}
-		return super.getPreviousPage(page);
-	}
-
-}
 
=== removed file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizard.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizard.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizard.java	1970-01-01 00:00:00 +0000
@@ -1,250 +0,0 @@
-/**
- * LICENSE + COPYRIGHT
- */
-package org.vcs.bazaar.eclipse.ui.wizards.project;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.NewProjectAction;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-import org.vcs.bazaar.eclipse.EclipseBazaarCore;
-import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
-import org.vcs.bazaar.eclipse.ui.EclipseBazaarUI;
-import org.vcs.bazaar.eclipse.ui.UITexts;
-import org.vcs.bazaar.eclipse.ui.operations.BranchAsProjectOperation;
-import org.vcs.bazaar.eclipse.ui.team.BazaarUtilities;
-import org.vcs.bazaar.eclipse.ui.wizards.BzrWizardPage;
-
-/**
- * This class implements the new wizard extension.
- *
- * @author Guillermo Gonzalez <guillo.gonzo at gmail dot com>
- */
-public class BranchWizard extends Wizard implements INewWizard {
-
-	private BranchWizardBranchLocationPage createRepoLocationPage;
-	private BranchWizardSelectionPage selectBranchPage;
-	private WizardNewProjectCreationPage newProjectPage;
-	private BranchWizardProjectPage projectPage;
-
-	private IBzrBranch remoteLocation;
-	private boolean useNewProjectWizard;
-
-	@Override
-	public boolean canFinish() {
-		if(useNewProjectWizard) {
-			return (getRemoteLocation() != null);
-		} else if(getProjectHandle() == null){
-			return getRemoteLocation() != null && getNewProjectPage().isPageComplete();
-		} else {
-			return getRemoteLocation() != null && getProjectHandle() != null;
-		}
-	}
-
-	protected IProject getProjectHandle() {
-		try {
-			if(!getProjectPage().useNewProjectWizard() && getNewProjectPage().useDefaults())
-				return getNewProjectPage().getProjectHandle();
-		} catch(IllegalArgumentException iae) {
-			return null;
-		}
-		return null;
-	}
-
-	@Override
-    public boolean performFinish() {
-		IProject project = null;
-		if(useNewProjectWizard) {
-			ProjectListener listener = new ProjectListener();
-			ResourcesPlugin.getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE);
-			(new NewProjectAction(PlatformUI.getWorkbench().getActiveWorkbenchWindow())).run();
-			ResourcesPlugin.getWorkspace().removeResourceChangeListener(listener);
-			project = listener.getProject();
-		} else {
-			project = getProjectHandle();
-		}
-		return performOperation(project);
-	}
-
-	/**
-	 * Perform the real stuff (in this case branching)
-	 * @param project
-	 * @return
-	 */
-	protected boolean performOperation(IProject project) {
-		BranchAsProjectOperation branchOp = null;
-		if(project == null) {
-			IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(getNewProjectPage().getProjectName());
-			description.setLocation(getNewProjectPage().getLocationPath());
-			branchOp = new BranchAsProjectOperation(this.getContainer(), getRemoteLocation(), description, getProjectPage().getRevision());
-		} else {
-			branchOp = new BranchAsProjectOperation(this.getContainer(), getRemoteLocation(), project, getProjectPage().getRevision());
-		}
-		try {
-			branchOp.run();
-		} catch (Exception e) {
-			MessageDialog.openError(this.getShell(), "Error while executing branch operation", e.getMessage());
-			EclipseBazaarUI.log(e.getMessage(), e);
-			return false;
-		}
-		return true;
-	}
-
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		setWindowTitle(UITexts.ImportWizard_wizardTitle);
-		setNeedsProgressMonitor(true);
-		selectBranchPage = new BranchWizardSelectionPage("selectBranch", "Source branch");
-		projectPage = new BranchWizardProjectPage("projectPage", isCheckout());
-		createRepoLocationPage = new BranchWizardBranchLocationPage("CreateRepoPage", "Source branch");
-		setNewProjectPage(new WizardNewProjectCreationPage("newProjectPage"));
-		getNewProjectPage().setTitle("Project");
-		getNewProjectPage().setDescription("Create a new project resource");
-		getNewProjectPage().setImageDescriptor(BzrWizardPage.getTitleImage());
-
-		if (!EclipseBazaarCore.getDefault().isClientAvailable()) {
-			BazaarUtilities.configureExecutable();
-		}
-	}
-
-	protected boolean isCheckout() {
-		return false;
-	}
-
-	@Override
-	public void addPages() {
-		super.addPages();
-		addPage(selectBranchPage);
-		addPage(createRepoLocationPage);
-		addPage(getProjectPage());
-		addPage(getNewProjectPage());
-	}
-
-	@Override
-	public IWizardPage getNextPage(IWizardPage page) {
-		if(page != null) {
-			if(page.getName().equals(selectBranchPage.getName())) {
-				if(selectBranchPage.isCreateNewBranchLocation()) {
-					return createRepoLocationPage;
-				} else {
-					setRemoteLocation(selectBranchPage.getLocation());
-					getProjectPage().setLocation(getRemoteLocation());
-					return getProjectPage();
-				}
-			} else if(page.getName().equals(getProjectPage().getName())) {
-				if(getProjectPage().useNewProjectWizard()) {
-					useNewProjectWizard = true;
-					return null;
-				} else {
-					useNewProjectWizard = false;
-					return getNewProjectPage();
-				}
-			} else if(page.getName().equals(createRepoLocationPage.getName())) {
-				setRemoteLocation(createRepoLocationPage.getLocation());
-				getProjectPage().setLocation(getRemoteLocation());
-				return super.getNextPage(page);
-			}
-		}
-		return super.getNextPage(page);
-	}
-
-	@Override
-	public IWizardPage getPreviousPage(IWizardPage page) {
-		if(page != null) {
-			if(page.getName().equals(createRepoLocationPage.getName())) {
-				return selectBranchPage;
-			} else if(page.getName().equals(getProjectPage().getName())) {
-				if(selectBranchPage.isCreateNewBranchLocation()) {
-					return createRepoLocationPage;
-				}
-			} else if(page.getName().equals(getNewProjectPage().getName())) {
-				return getProjectPage();
-			}
-		}
-		return super.getPreviousPage(page);
-	}
-
-
-	protected boolean isUseNewProjectWizard() {
-		return useNewProjectWizard;
-	}
-
-	protected void setUseNewProjectWizard(boolean useNewProjectWizard) {
-		this.useNewProjectWizard = useNewProjectWizard;
-	}
-
-	/**
-	 * @param remoteLocation the remoteLocation to set
-	 */
-	protected void setRemoteLocation(IBzrBranch remoteLocation) {
-		this.remoteLocation = remoteLocation;
-	}
-
-	/**
-	 * @return the remoteLocation
-	 */
-	protected IBzrBranch getRemoteLocation() {
-		return remoteLocation;
-	}
-
-	/**
-	 * @param newProjectPage the newProjectPage to set
-	 */
-	protected void setNewProjectPage(WizardNewProjectCreationPage newProjectPage) {
-		this.newProjectPage = newProjectPage;
-	}
-
-	/**
-	 * @return the newProjectPage
-	 */
-	protected WizardNewProjectCreationPage getNewProjectPage() {
-		return newProjectPage;
-	}
-
-	/**
-	 * @param projectPage the projectPage to set
-	 */
-	protected void setProjectPage(BranchWizardProjectPage projectPage) {
-		this.projectPage = projectPage;
-	}
-
-	/**
-	 * @return the projectPage
-	 */
-	protected BranchWizardProjectPage getProjectPage() {
-		return projectPage;
-	}
-
-	private static final class ProjectListener implements IResourceChangeListener {
-		private IProject project = null;
-
-		public void resourceChanged(IResourceChangeEvent event) {
-			IResourceDelta[] deltas = event.getDelta().getAffectedChildren();
-			for (int i = 0; i < deltas.length; i++) {
-				IResource resource = deltas[i].getResource();
-				if (resource instanceof IProject) {
-					if (deltas[i].getKind() == IResourceDelta.ADDED) {
-						project = (IProject) resource;
-					} else if (deltas[i].getKind() == IResourceDelta.REMOVED && project == resource) {
-						project = null;
-					}
-				}
-			}
-		}
-
-		public IProject getProject() {
-			return project;
-		}
-	}
-}
 
=== removed file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizardBranchLocationPage.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizardBranchLocationPage.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizardBranchLocationPage.java	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Software Balm Consulting Inc.
- *
- * This software is licensed under the zlib/libpng license.
- *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the authors be held liable for any damages arising from the
- * use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it freely,
- * subject to the following restrictions:
- *
- *  1. The origin of this software must not be misrepresented; you must not
- *            claim that you wrote the original software. If you use this
- *            software in a product, an acknowledgment in the product
- *            documentation would be appreciated but is not required.
- *
- *   2. Altered source versions must be plainly marked as such, and must not be
- *            misrepresented as being the original software.
- *
- *   3. This notice may not be removed or altered from any source distribution.
- *******************************************************************************/
-package org.vcs.bazaar.eclipse.ui.wizards.project;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
-import org.vcs.bazaar.eclipse.core.repository.BranchFactory;
-import org.vcs.bazaar.eclipse.ui.UITexts;
-import org.vcs.bazaar.eclipse.ui.wizards.BzrWizardPage;
-
-/*
- * @author Peter Hunnisett <peter_hge at softwarebalm dot com>
- *
- * This file implements a wizard page which will allow the user to create a
- * repository location.
- *
- */
-public class BranchWizardBranchLocationPage extends BzrWizardPage implements IWizardPage {
-	private String location;
-	/**
-	 *
-	 * @param pageName
-	 * @param title
-	 */
-	public BranchWizardBranchLocationPage(String pageName, String title) {
-		super(pageName);
-		setTitle(title);
-		setDescription(UITexts.Branch_Wizard_page_description);
-	}
-
-	@Override
-    public boolean canFlipToNextPage() {
-		return isPageComplete() && (getWizard().getNextPage(this) != null);
-	}
-
-	public void createControl(Composite parent) {
-		final Composite outerContainer = new Composite(parent, SWT.NONE);
-		outerContainer.setLayout(new GridLayout(1,false));
-		outerContainer.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
-
-		// Three columns for the location + browse + revno
-		final Composite locationContainer = new Composite(outerContainer, SWT.NONE);
-		locationContainer.setLayout(new GridLayout(3,false));
-		locationContainer.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-
-		// Box to enter the repo location
-		final Composite repoLocationContainer = new Composite(locationContainer, SWT.NONE);
-		repoLocationContainer.setLayout(new GridLayout(2,false));
-		repoLocationContainer.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
-
-		final Label locationLabel = new Label(repoLocationContainer, SWT.NONE);
-		locationLabel.setText(UITexts.Branch_Wizard_page_branch_location_label);
-		final GridData locationData = new GridData(SWT.VERTICAL);
-		locationData.widthHint = 500;
-		final Combo locationCombo = new Combo(repoLocationContainer, SWT.DROP_DOWN);
-		locationCombo.setLayoutData(locationData);
-
-		final Button browseButton = new Button(locationContainer, SWT.PUSH);
-		browseButton.setText(UITexts.Branch_Wizard_page_branch_location_browse_button);
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-            public void widgetSelected(SelectionEvent e) {
-				final DirectoryDialog dialog = new DirectoryDialog(getShell());
-				dialog.setMessage(UITexts.Branch_Wizard_page_branch_location_dialog_message);
-				final String dir = dialog.open();
-				if (dir != null){
-					locationCombo.setText(dir);
-				}
-			}
-		});
-
-		locationCombo.addSelectionListener(new SelectionAdapter(){
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				location = locationCombo.getText();
-				setPageComplete(isPageComplete());
-			}
-		});
-		locationCombo.addModifyListener(new ModifyListener(){
-
-			public void modifyText(ModifyEvent e) {
-				location = locationCombo.getText();
-				setPageComplete(isPageComplete());
-			}
-		});
-
-		setControl(outerContainer);
-		locationCombo.setFocus();
-		setPageComplete(false);
-	}
-
-	@Override
-	public boolean isPageComplete() {
-		if(location == null || location.length() == 0){
-			setMessage(UITexts.Branch_Wizard_page_branch_location_error_location_notspecified);
-			return false;
-		}
-		if(!BranchFactory.validateBranch(location)){
-			setMessage(UITexts.Branch_Wizard_page_branch_location_error_location_invalid);
-			return false;
-		}
-		setMessage(null);
-		return true;
-	}
-
-	public IBzrBranch getLocation() {
-		return BranchFactory.getInstance().findOrCreateFor(location);
-	}
-
-}
 
=== removed file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizardProjectPage.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizardProjectPage.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizardProjectPage.java	1970-01-01 00:00:00 +0000
@@ -1,176 +0,0 @@
-/**
- * LICENSE + COPYRIGHT
- */
-package org.vcs.bazaar.eclipse.ui.wizards.project;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowData;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
-import org.vcs.bazaar.eclipse.ui.UITexts;
-import org.vcs.bazaar.eclipse.ui.dialogs.ShowLogDialog;
-import org.vcs.bazaar.eclipse.ui.widgets.RevisionNumber;
-import org.vcs.bazaar.eclipse.ui.wizards.BzrWizardPage;
-
-/**
- * @author "Guillermo Gonzalez <guillo.gonzo at gmail dot com>"
- *
- */
-public class BranchWizardProjectPage extends BzrWizardPage implements IWizardPage {
-
-	private Label textLabel;
-	private Button wizardButton;
-	private Button projectsButton;
-	private Group revisionGroup;
-	private RevisionNumber revision;
-	private IBzrBranch remoteLocation;
-	private final boolean isCheckout;
-	private Button lightWegithButton;
-
-	protected BranchWizardProjectPage(String pageName, boolean isCheckout) {
-		super(pageName);
-		this.isCheckout = isCheckout;
-	}
-
-	public void createControl(Composite parent) {
-		Composite outerContainer = new Composite(parent,SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		outerContainer.setLayout(layout);
-		outerContainer.setLayoutData(
-		new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
-
-		textLabel = new Label(outerContainer, SWT.NONE);
-		GridData data = new GridData();
-		data.widthHint = 300;
-		textLabel.setLayoutData(data);
-
-		wizardButton = new Button(outerContainer, SWT.RADIO);
-		wizardButton.setText(UITexts.BranchWizardProjectPage_wizard); //$NON-NLS-1$
-		wizardButton.setEnabled(true);
-
-		projectsButton = new Button(outerContainer, SWT.RADIO);
-		projectsButton.setText(UITexts.BranchWizardProjectPage_projects); //$NON-NLS-1$
-
-		SelectionListener projectWizardTypeListener = new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				setPageComplete(isPageComplete());
-			}
-		};
-
-		projectsButton.addSelectionListener(projectWizardTypeListener);
-		wizardButton.addSelectionListener(projectWizardTypeListener);
-
-		if(isCheckout) {
-			lightWegithButton = new Button(outerContainer, SWT.CHECK);
-			lightWegithButton.setText(UITexts.CheckoutWizardProjectPage_lightweight);
-			lightWegithButton.setSelection(false);
-			lightWegithButton.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					BranchWizardProjectPage.this.revision.setEnabled(!lightWegithButton.getSelection());
-				}
-			});
-		}
-
-		createRevisionGroup(outerContainer);
-
-		setControl(outerContainer);
-		projectsButton.setSelection(true);
-		projectsButton.setFocus();
-		/* FIXME: TODO: Enable the project wizard
-		 * temprary disabled. Until I can create the project but not the folder
-		 * and can branch previous to the project folder creation
-		 */
-		wizardButton.setEnabled(false);
-		setPageComplete(false);
-	}
-
-	private void createRevisionGroup(Composite parent) {
-		revisionGroup = new Group(parent, SWT.NULL);
-		revisionGroup.setText(UITexts.BranchWizardProjectPage_revision); //$NON-NLS-1$
-		GridData data = new GridData(GridData.FILL_BOTH);
-		revisionGroup.setLayoutData(data);
-		revisionGroup.setLayout(new RowLayout(SWT.VERTICAL));
-
-		revision = new RevisionNumber(revisionGroup);
-		revision.setLayoutData(new RowData());
-		revision.addShowLogButtonSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				showLog();
-			}
-		});
-	}
-
-	protected void showLog() {
-		if(this.remoteLocation != null && !isLigthWeight()) {
-			ShowLogDialog dialog = new ShowLogDialog(getShell(), this.remoteLocation);
-			if(dialog.open() == Dialog.OK && dialog.getSelectedRevision() != null) {
-				revision.setRevision(dialog.getSelectedRevision().getValue());
-			}
-		}
-	}
-
-	protected void setLocation(IBzrBranch remoteLocation) {
-		this.remoteLocation = remoteLocation;
-	}
-
-	@Override
-	public boolean isPageComplete() {
-		if(revision.isRevisionSelected()) {
-			if(revision.getRevision().trim().length() != 0){
-				setMessage(null);
-				return true;
-			}
-			setMessage("specify a revision number",IMessageProvider.ERROR);
-			return false;
-		} else if(revision.isTipSelected()) {
-			setMessage(null);
-			return true;
-		}
-		return false;
-	}
-
-	public String getRevision() {
-		return revision.getRevision();
-	}
-
-	public boolean useSpecificRevision() {
-		return revision.isRevisionSelected();
-	}
-
-	public boolean useNewProjectWizard() {
-		return wizardButton.getSelection();
-	}
-
-	public boolean isLigthWeight() {
-		if(isCheckout) {
-			return lightWegithButton.getSelection();
-		}
-		return false;
-	}
-	@Override
-	public void dispose() {
-		textLabel.dispose();
-		wizardButton.dispose();
-		projectsButton.dispose();
-		revision.dispose();
-		revisionGroup.dispose();
-		super.dispose();
-	}
-
-}
 
=== removed file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizardSelectionPage.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizardSelectionPage.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizardSelectionPage.java	1970-01-01 00:00:00 +0000
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Software Balm Consulting Inc.
- *
- * This software is licensed under the zlib/libpng license.
- *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the authors be held liable for any damages arising from the
- * use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it freely,
- * subject to the following restrictions:
- *
- *  1. The origin of this software must not be misrepresented; you must not
- *            claim that you wrote the original software. If you use this
- *            software in a product, an acknowledgment in the product
- *            documentation would be appreciated but is not required.
- *
- *   2. Altered source versions must be plainly marked as such, and must not be
- *            misrepresented as being the original software.
- *
- *   3. This notice may not be removed or altered from any source distribution.
- *******************************************************************************/
-package org.vcs.bazaar.eclipse.ui.wizards.project;
-
-import java.util.Set;
-
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
-import org.vcs.bazaar.eclipse.core.repository.BranchLocationManager;
-import org.vcs.bazaar.eclipse.ui.UITexts;
-import org.vcs.bazaar.eclipse.ui.wizards.BzrWizardPage;
-
-/**
- * @basedOn Peter Hunnisett <peter_hge at softwarebalm dot com>
- * @author Guillermo Gonzalez <guillo.gonzo at gmail dot com>
- * This file implements a wizard page which will have the user choose a
- * repository location or opt to create one. The creation of a repository
- * location, if desired, is left to another wizard page.
- *
- */
-public class BranchWizardSelectionPage extends BzrWizardPage implements IWizardPage, ISelectionChangedListener {
-	private Button useExistingBranchLocation;
-	private Button createNewBranchLocation;
-	private ListViewer branchList;
-
-	public BranchWizardSelectionPage(String pageName, String title) {
-		super(pageName);
-		setTitle(title);
-		setDescription(UITexts.Branch_Wizard_page_description_select_source_branch);
-		setPageComplete(false);
-	}
-
-	@Override
-    public boolean canFlipToNextPage() {
-		if(useExistingBranchLocation.getSelection()) {
-			return branchList.getSelection() != null && !branchList.getSelection().isEmpty();
-		}
-		return (createNewBranchLocation != null) && (createNewBranchLocation.getSelection());
-	}
-
-	public void createControl(Composite parent) {
-		Composite outerContainer = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		outerContainer.setLayout(layout);
-		outerContainer.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
-
-		createNewBranchLocation = new Button(outerContainer, SWT.RADIO);
-		createNewBranchLocation.setText(UITexts.Branch_Wizard_page_init_new_branch);
-
-		useExistingBranchLocation = new Button(outerContainer, SWT.RADIO);
-		useExistingBranchLocation.setText(UITexts.Branch_Wizard_page_use_existing_branch);
-
-		createNewBranchLocation.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (createNewBranchLocation.getSelection()) {
-					setPageComplete(true);
-					branchList.getControl().setEnabled(false);
-				}
-			}
-		});
-
-		useExistingBranchLocation.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (useExistingBranchLocation.getSelection()) {
-					boolean isPageComplete = false;
-					if(branchList.getSelection() != null && !branchList.getSelection().isEmpty()) {
-						isPageComplete = true;
-					}
-					setPageComplete(isPageComplete);
-					branchList.getControl().setEnabled(true);
-				}
-			}
-		});
-
-		branchList = createBranchList(outerContainer);
-
-		setControl(outerContainer);
-
-		// This will trigger a setPageComplete call to set the next button
-		// appropriately.
-		createNewBranchLocation.setSelection(true);
-		createNewBranchLocation.setFocus();
-		useExistingBranchLocation.setSelection(false);
-		branchList.getControl().setEnabled(false);
-	}
-
-	private ListViewer createBranchList(Composite parent) {
-		ListViewer viewer = new ListViewer(parent);
-		viewer.setLabelProvider(new LabelProvider() {
-			@Override
-            public String getText(Object element) {
-				IBzrBranch branch = (IBzrBranch)element;
-				return branch.getBranchLocation().toString();
-			}
-		});
-		viewer.addSelectionChangedListener(this);
-		viewer.setComparator(new ViewerComparator() {
-			@Override
-            public int compare(Viewer viewer, Object e1, Object e2) {
-				IBzrBranch b1 = (IBzrBranch)e1;
-				IBzrBranch b2 = (IBzrBranch)e2;
-				return b1.compareTo(b2);
-			}
-		});
-		List list = viewer.getList();
-		list.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Set<IBzrBranch> branchList = BranchLocationManager.getInstance().getAllBranches();
-		for (IBzrBranch bzrBranch : branchList) {
-			viewer.add(bzrBranch);
-		}
-		return viewer;
-	}
-
-	/*
-	 * For the moment only handle the change selection in the branch list
-	 *
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		if(event.getSelection() != null) {
-			setPageComplete(true);
-		}
-	}
-
-	public boolean isCreateNewBranchLocation() {
-		if(createNewBranchLocation != null) {
-			return createNewBranchLocation.getSelection();
-		}
-		return false;
-	}
-
-	public IBzrBranch getLocation() {
-		IStructuredSelection selection = (IStructuredSelection)branchList.getSelection();
-		return (IBzrBranch)selection.getFirstElement();
-	}
-
-	@Override
-	public void dispose() {
-		if(useExistingBranchLocation != null) {
-			useExistingBranchLocation.dispose();
-		}
-		if(createNewBranchLocation != null) {
-			createNewBranchLocation.dispose();
-		}
-		if(branchList != null) {
-			branchList.getList().dispose();
-		}
-		super.dispose();
-	}
-}
 
=== removed file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/CheckoutFromProjectWizard.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/CheckoutFromProjectWizard.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/CheckoutFromProjectWizard.java	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/**
- * LICENSE + COPYRIGHT
- */
-package org.vcs.bazaar.eclipse.ui.wizards.project;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
-import org.vcs.bazaar.eclipse.ui.EclipseBazaarUI;
-import org.vcs.bazaar.eclipse.ui.operations.CheckoutAsProjectOperation;
-
-/**
- * This class implements the checkout(and lightweight) from project wizard
- *
- * @author Guillermo Gonzalez <guillo.gonzo at gmail dot com>
- */
-public class CheckoutFromProjectWizard extends BranchFromProjectWizard {
-
-	private boolean lightweight;
-
-	public CheckoutFromProjectWizard(Shell shell, IBzrBranch branch, boolean lightweight) {
-		super(shell, branch);
-		this.lightweight = lightweight;
-	}
-
-	public static CheckoutFromProjectWizard open(Shell shell, IBzrBranch branch, boolean lightweight) {
-		CheckoutFromProjectWizard wizard = new CheckoutFromProjectWizard(shell, branch, lightweight);
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-		dialog.open();
-		return wizard;
-	}
-
-
-	@Override
-    public boolean performOperation(IProject project) {
-		CheckoutAsProjectOperation checkoutOp = null;
-		if(project == null) {
-			IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(getNewProjectPage().getProjectName());
-			description.setLocation(getNewProjectPage().getLocationPath());
-			checkoutOp = new CheckoutAsProjectOperation(this.getContainer(), getRemoteLocation(), description, getProjectPage().getRevision(), lightweight);
-		} else {
-			checkoutOp = new CheckoutAsProjectOperation(this.getContainer(), getRemoteLocation(), project, getProjectPage().getRevision(), lightweight);
-		}
-		try {
-			checkoutOp.run();
-		} catch (Exception e) {
-			MessageDialog.openError(this.getShell(), "Error while executing branch operation", e.getMessage());
-			EclipseBazaarUI.log(e.getMessage(), e);
-			return false;
-		}
-		return true;
-	}
-}
 
=== removed file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/CheckoutWizard.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/CheckoutWizard.java	2009-11-18 08:48:22 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/CheckoutWizard.java	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/**
- * LICENSE + COPYRIGHT
- */
-package org.vcs.bazaar.eclipse.ui.wizards.project;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.vcs.bazaar.eclipse.ui.EclipseBazaarUI;
-import org.vcs.bazaar.eclipse.ui.operations.CheckoutAsProjectOperation;
-
-/**
- * This class implements the new wizard extension.
- *
- * @author Guillermo Gonzalez <guillo.gonzo at gmail dot com>
- */
-public class CheckoutWizard extends BranchWizard {
-
-
-	@Override
-    protected boolean performOperation(IProject project) {
-		CheckoutAsProjectOperation checkoutOp = null;
-		if(project == null) {
-			IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(getNewProjectPage().getProjectName());
-			description.setLocation(getNewProjectPage().getLocationPath());
-			checkoutOp = new CheckoutAsProjectOperation(this.getContainer(), getRemoteLocation(), description, getProjectPage().getRevision(), getProjectPage().isLigthWeight());
-		} else {
-			checkoutOp = new CheckoutAsProjectOperation(this.getContainer(), getRemoteLocation(), project, getProjectPage().getRevision(), getProjectPage().isLigthWeight());
-		}
-		try {
-			checkoutOp.run();
-		} catch (Exception e) {
-			MessageDialog.openError(this.getShell(), "Error while executing checkout operation", e.getMessage());
-			EclipseBazaarUI.log(e.getMessage(), e);
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	protected boolean isCheckout() {
-		return true;
-	}
-}
 
=== modified file 'pom.xml'
--- pom.xml	2011-07-19 05:32:49 +0000
+++ pom.xml	2013-02-19 07:30:34 +0000
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>org.vcs.bazaar.eclipse</groupId>
   <artifactId>org.vcs.bazaar.eclipse</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <scm>
     <connection>scm:bazaar:lp:bzr-eclipse</connection>
@@ -17,7 +17,7 @@
     <url>http://bugs.launchpad.net/bzr-eclipse</url>
   </issueManagement>
   <properties>
-    <bzr-eclipse-version>1.1.1-SNAPSHOT</bzr-eclipse-version>
+    <bzr-eclipse-version>1.2.0-SNAPSHOT</bzr-eclipse-version>
     <tycho-version>0.10.0</tycho-version>
     <platform-version-name>helios</platform-version-name>
     <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
 
=== modified file 'redstone.xmlrpc/pom.xml'
--- redstone.xmlrpc/pom.xml	2011-03-22 15:05:45 +0000
+++ redstone.xmlrpc/pom.xml	2013-02-19 07:30:34 +0000
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.vcs.bazaar.eclipse</groupId>
     <artifactId>org.vcs.bazaar.eclipse</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>redstone.xmlrpc</groupId>