Merge lp:~xaav/bzr-eclipse/import-wizard into lp:~verterok/bzr-eclipse/trunk

[xaav]

Fixes the related bug.

[Guillermo Gonzalez (verterok)]

review: Approve

=== modified file 'org.vcs.bazaar.eclipse.ui/plugin.xml'
--- org.vcs.bazaar.eclipse.ui/plugin.xml	2009-06-01 15:50:48 +0000
+++ org.vcs.bazaar.eclipse.ui/plugin.xml	2011-06-02 00:44:27 +0000
@@ -4,6 +4,7 @@
 
 	<!--            Team exstension points                     -->
 
+
 	<extension point="org.eclipse.team.ui.configurationWizards">
 		<wizard name="%SharingWizard_name" icon="icons/bzrlogo.png"
 			class="org.vcs.bazaar.eclipse.ui.wizards.configuration.BazaarConfigurationWizard"
@@ -389,15 +390,29 @@
         name="%CheckoutNewWizard_Name"
         project="true"/>
 	</extension>
-	<!--extension point="org.eclipse.ui.importWizards">
-		<wizard category="org.vcs.bazaar.eclipse.ui.wizards.import"
-			class="org.vcs.bazaar.eclipse.ui.wizards.project.BranchWizard"
-			icon="icons/bzrlogo.png"
-			id="org.vcs.bazaar.eclipse.ui.wizards.CloneRepoWizard"
-			name="%ImportWizard_Name" />
-		<category id="org.vcs.bazaar.eclipse.ui.wizards.import"
-			name="%ImportWizard_categoryName" />
-	</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"/>
+	</extension>
 	<extension point="org.eclipse.ui.console.consoleFactories">
 		<consoleFactory
 			class="org.vcs.bazaar.eclipse.ui.console.BzrOutputConsoleFactory"