Merge lp:~walles/bzr-eclipse/perf+logging+code+usability into lp:~verterok/bzr-eclipse/trunk

[Johan Walles]

[Johan Walles (walles)]

This branch:
* Cuts plugin initialization time from 15s to 3s.
* Passes the core unit tests (this is an improvement from trunk).
* Adds automatic code formatting for code readability.
* Uses commons logging and goes nicely with lp:~walles/bzr-java-lib/commons-logging
* Fixes new-version-of-Bazaar message for usability.

[Guillermo Gonzalez (verterok)]

Apologize the delay,
Looks awesome!!
Thanks a lot for working on this.

review: Approve

=== modified file 'org.vcs.bazaar.eclipse.client/.classpath'
--- org.vcs.bazaar.eclipse.client/.classpath	2009-04-20 18:28:32 +0000
+++ org.vcs.bazaar.eclipse.client/.classpath	2009-04-27 18:42:32 +0000
@@ -3,6 +3,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="bzr-java-lib-0.5.1-SNAPSHOT.jar" sourcepath="org.vcs.bazaar.eclipse.clientsrc.zip"/>
+	<classpathentry exported="true" kind="lib" path="commons-logging-1.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="kxml2-min-2.3.0.jar" sourcepath="org.vcs.bazaar.eclipse.clientsrc.zip"/>
 	<classpathentry exported="true" kind="lib" path="xmlrpc-1.1.jar" sourcepath="org.vcs.bazaar.eclipse.clientsrc.zip"/>
 	<classpathentry exported="true" kind="lib" path="xmlrpc-client-1.1.jar" sourcepath="org.vcs.bazaar.eclipse.clientsrc.zip"/>

=== modified file 'org.vcs.bazaar.eclipse.client/META-INF/MANIFEST.MF'
--- org.vcs.bazaar.eclipse.client/META-INF/MANIFEST.MF	2009-02-21 23:16:34 +0000
+++ org.vcs.bazaar.eclipse.client/META-INF/MANIFEST.MF	2009-04-18 17:37:48 +0000
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: Bazaar client library
 Bundle-ClassPath: bzr-java-lib-0.5.1-SNAPSHOT.jar,
+ commons-logging-1.1.1.jar,
  kxml2-min-2.3.0.jar,
  xmlrpc-1.1.jar,
  xmlrpc-client-1.1.jar

=== modified file 'org.vcs.bazaar.eclipse.client/build.properties'
--- org.vcs.bazaar.eclipse.client/build.properties	2009-01-17 23:34:36 +0000
+++ org.vcs.bazaar.eclipse.client/build.properties	2009-04-18 17:37:48 +0000
@@ -1,4 +1,5 @@
 bin.includes = META-INF/,\
+               commons-logging-1.1.1.jar,\
                kxml2-min-2.3.0.jar,\
                xmlrpc-1.1.jar,\
                xmlrpc-client-1.1.jar,\

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/EclipseBazaarCore.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/EclipseBazaarCore.java	2008-12-13 23:37:48 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/EclipseBazaarCore.java	2009-04-18 18:47:58 +0000
@@ -68,11 +68,8 @@
 		plugin = this;
 	}
 
-	/**
-	 * This method is called upon plug-in activation
-	 * @throws Exception 
-	 */
-	public void start(BundleContext context) throws Exception {
+	@Override
+    public void start(BundleContext context) throws Exception {
 		super.start(context);
 		getPluginPreferences().addPropertyChangeListener(preferenceListener);
 		inventoryCacheManager = new InventoryCacheManager();
@@ -91,24 +88,30 @@
 		}
 	}
 
+	/**
+	 * Set bazaar java library preferences from Eclipse preferences.
+	 */
 	public void updateClientPreferences() {
-		if (clientPreferences == null)
-			clientPreferences = BazaarClientPreferences.getInstance();
-		clientPreferences.set(BazaarPreference.EXECUTABLE, getPluginPreferences().getString(BazaarPreference.EXECUTABLE.name()));
+		if (clientPreferences == null) {
+            clientPreferences = BazaarClientPreferences.getInstance();
+        }
+		String bzrExeName = getPluginPreferences().getString(BazaarPreference.EXECUTABLE.name());
+		if (bzrExeName != null && ! "".equals(bzrExeName)) {
+		    // User has explicitly set a bazaar executable to use
+		    clientPreferences.set(BazaarPreference.EXECUTABLE, bzrExeName);
+		}
 		clientPreferences.set(BazaarPreference.BZR_EMAIL, getPluginPreferences().getString(BazaarPreference.BZR_EMAIL.name()));
 		clientPreferences.set(BazaarPreference.BZR_XMLRPC_PORT, getPluginPreferences().getString(BazaarPreference.BZR_XMLRPC_PORT.name()));
 		String pluginPath = getPluginPreferences().getString(BazaarPreference.BZR_PLUGIN_PATH.name());
-		if (pluginPath != null && pluginPath.length() > 0)
-			clientPreferences.set(BazaarPreference.BZR_PLUGIN_PATH, pluginPath);
-		else
-			clientPreferences.unset(BazaarPreference.BZR_PLUGIN_PATH);
+		if (pluginPath != null && pluginPath.length() > 0) {
+            clientPreferences.set(BazaarPreference.BZR_PLUGIN_PATH, pluginPath);
+        } else {
+            clientPreferences.unset(BazaarPreference.BZR_PLUGIN_PATH);
+        }
 	}
 
-	/**
-	 * This method is called when the plug-in is stopped
-	 * @throws Exception
-	 */
-	public void stop(BundleContext context) throws Exception {
+	@Override
+    public void stop(BundleContext context) throws Exception {
 		BranchLocationManager.getInstance().stop();
 		ResourcesPlugin.getWorkspace().removeResourceChangeListener(fileModificationManager);
 		ResourcesPlugin.getWorkspace().removeResourceChangeListener(metaDirChangeListener);
@@ -159,8 +162,9 @@
 		if (client != null) {
 			// to prevent adding a null listener (this happen when the core
 			// plugin is initialized before the ui plugin)
-			if (getConsoleListener() != null)
-				client.addNotifyListener(getConsoleListener());
+			if (getConsoleListener() != null) {
+                client.addNotifyListener(getConsoleListener());
+            }
 		}
 		return client;
 	}
@@ -252,12 +256,14 @@
 	 * @param monitor
 	 */
 	public static void checkCanceled(IProgressMonitor monitor) {
-		if (monitor != null && monitor.isCanceled())
-			throw new OperationCanceledException();
+		if (monitor != null && monitor.isCanceled()) {
+            throw new OperationCanceledException();
+        }
 	}
 	public static IProgressMonitor monitorFor(IProgressMonitor monitor) {
-		if (monitor == null)
-			return new NullProgressMonitor();
+		if (monitor == null) {
+            return new NullProgressMonitor();
+        }
 		return monitor;
 	}
 	
@@ -267,10 +273,12 @@
 	 * @return
 	 */
 	public static IProgressMonitor subProgressMonitorFor(IProgressMonitor monitor) {
-		if (monitor == null)
-			return new NullProgressMonitor();
-		if (monitor instanceof NullProgressMonitor)
-			return monitor;
+		if (monitor == null) {
+            return new NullProgressMonitor();
+        }
+		if (monitor instanceof NullProgressMonitor) {
+            return monitor;
+        }
 		return new SubProgressMonitor(monitor, 1000);
 	}
 	

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/log/LogCacheManager.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/log/LogCacheManager.java	2008-12-02 18:37:38 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/log/LogCacheManager.java	2009-04-27 18:40:39 +0000
@@ -52,8 +52,7 @@
 	 * Returns the last log of the given resource. If is not present in
 	 * cache, it will be retrieved using the actual strategy. 
 	 * 
-	 * @param resource
-	 *            whose last log is required.
+	 * @param resource whose last log is required.
 	 * @throws CoreException
 	 */
 	public IBazaarLogMessage getLastLog(IResource resource) throws CoreException {
@@ -65,8 +64,7 @@
 	 * Returns the logs of the given resource. If is not present in
 	 * cache, it will be retrieved using the actual strategy. 
 	 * 
-	 * @param resource
-	 *            whose last log is required.
+	 * @param resource whose last log is required.
 	 * @return a List<IBazaarLogMessage> for the corresponding resource 
 	 * (the size is dependent on the limit setup in the preferences)
 	 * @throws CoreException
@@ -77,9 +75,6 @@
 
 	/**
 	 * see {@link #getLogs(IResource)}
-	 * @param resource
-	 * @return
-	 * @throws CoreException
 	 */
 	public List<IBazaarLogMessage> getLogs(IBzrResource resource) throws CoreException {
 		return getLogs(resource, logUpdater, getLock(resource));
@@ -124,11 +119,6 @@
 
 	/**
 	 * refresh the cache and returns if the resource is in it.
-	 * 
-	 * @param resource
-	 * @param strategy
-	 * @return
-	 * @throws CoreException
 	 */
 	private List<IBazaarLogMessage> basicGetLog(IBzrResource resource, LogUpdater strategy) throws CoreException {
 		EclipseBazaarCore.trace(ITracingOptions.LOG_CACHE, "LogCacheManager.basicGetlog: " + resource.getName());
@@ -148,10 +138,6 @@
 
 	/**
 	 * Purge the cache of the spacified IProject from the cache
-	 * 
-	 * @param root
-	 * @param deep
-	 * @throws CoreException
 	 */
 	public void purgeCache(IProject root) throws CoreException {
 		logCache.purgeCache(root);
@@ -174,5 +160,4 @@
 			}
 		}
 	}
-
 }

=== added file 'org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.jdt.core.prefs'
--- org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.jdt.core.prefs	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.jdt.core.prefs	2009-04-29 05:52:15 +0000
@@ -0,0 +1,258 @@
+#Wed Apr 29 06:48:26 GMT+01:00 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=16
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=80
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=32
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=32
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=32
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=32
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line_on_wrap
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line_on_wrap
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_line_on_wrap
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line_on_wrap
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line_on_wrap
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line_on_wrap
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line_on_wrap
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line_on_wrap
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line_on_wrap
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=100
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

=== added file 'org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.jdt.ui.prefs'
--- org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.jdt.ui.prefs	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.jdt.ui.prefs	2009-04-29 06:02:45 +0000
@@ -0,0 +1,56 @@
+#Wed Apr 29 06:57:54 GMT+01:00 2009
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_Bzr Java
+formatter_settings_version=11
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=false
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=true
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=true
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=false
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=false
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

=== 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-01-01 05:01:52 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/EclipseBazaarUI.java	2009-04-28 16:09:12 +0000
@@ -43,8 +43,12 @@
 
 	private static final String LOGVIEW_ID = "org.vcs.bazaar.eclipse.ui.views.LogView";
 	private static final String MISSINGVIEW_ID = "org.vcs.bazaar.eclipse.ui.views.MissingView";
-	// The shared instance.
+
+	/**
+	 * The shared instance.
+	 */
 	private static EclipseBazaarUI plugin;
+	
 	private BzrOutputConsole console;
 	private final IPropertyChangeListener preferenceChangeListener = new PreferenceStoreChangeListener();
 	private BundleListener bundleListener;
@@ -58,12 +62,11 @@
 		plugin = this;		
 	}
 
-	/**
-	 * This method is called upon plug-in activation.
-	 * 
-	 * @throws Exception
-	 */
-	public void start(BundleContext context) throws Exception {
+    /**
+     * This method is called upon plug-in activation.
+     */
+    @Override
+    public void start(BundleContext context) throws Exception {
 		bundleListener = new BundleListener() {
 			public void bundleChanged(BundleEvent event) {
                 if (event.getBundle() == getBundle() 
@@ -95,8 +98,6 @@
 		};
 		context.addBundleListener(bundleListener);
 		super.start(context);
-		// looks like this is done in the constructor of the BzrOuputConsole, it might be safe to remove the following line.
-		EclipseBazaarCore.getDefault().setConsoleListener(getConsole());	
 		getPreferenceStore().addPropertyChangeListener(preferenceChangeListener);
 		if(!getWorkbench().getDecoratorManager().getEnabled(BazaarLightweightDecorator.class.getName())) {
 			getWorkbench().getDecoratorManager().setEnabled(BazaarLightweightDecorator.class.getName(), true);
@@ -108,10 +109,9 @@
 
 	/**
 	 * This method is called when the plug-in is stopped
-	 * 
-	 * @throws Exception
 	 */
-	public void stop(BundleContext context) throws Exception {
+	@Override
+    public void stop(BundleContext context) throws Exception {
 		refreshExecListener.removeFrom((ICommandService) this.getWorkbench().getService(ICommandService.class));
 		getPreferenceStore().removePropertyChangeListener(preferenceChangeListener);
 		getConsole().shutdown();
@@ -136,8 +136,7 @@
 	 * Returns an image descriptor for the image file at the given plug-in
 	 * relative path.
 	 * 
-	 * @param path
-	 *            the path
+	 * @param path the path
 	 * @return the image descriptor
 	 */
 	public static ImageDescriptor getImageDescriptor(String path) {
@@ -154,7 +153,9 @@
 	 */
 	public static IWorkbenchPage getActivePage() {
 		final IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
-		if (window == null) return null;
+		if (window == null) {
+            return null;
+        }
 		return window.getActivePage();
 	}
 	
@@ -207,7 +208,9 @@
 			}
 			//new TimeoutProgressMonitorDialog(parent, TIMEOUT).run(true /*fork*/, cancelable, runnable);
 		} finally {
-			if (createdShell && parent != null) parent.dispose();
+			if (createdShell && parent != null) {
+                parent.dispose();
+            }
 		}
 	}	
 

=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/console/BzrOutputConsole.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/console/BzrOutputConsole.java	2008-02-29 16:35:35 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/console/BzrOutputConsole.java	2009-04-28 15:58:48 +0000
@@ -32,6 +32,7 @@
 import org.vcs.bazaar.eclipse.core.client.IConsoleListener;
 import org.vcs.bazaar.eclipse.ui.EclipseBazaarUI;
 import org.vcs.bazaar.eclipse.ui.UITexts;
+import org.vcs.bazaar.eclipse.ui.console.ConsoleDocument.ConsoleLine;
 import org.vcs.bazaar.eclipse.ui.preferences.BazaarPreferenceConstants;
 
 /**
@@ -62,9 +63,13 @@
 
 	private ConsoleDocument document;
 
-	// Indicates whether the console is visible in the Console view
+	/**
+	 * Indicates whether the console is visible in the Console view
+	 */
 	private boolean visible = false;
-	// Indicates whether the console's streams have been initialized
+	/**
+	 * Indicates whether the console's streams have been initialized
+	 */
 	private boolean initialized = false;
 
 	/**
@@ -73,8 +78,7 @@
 	 */
 	class MyLifecycle implements org.eclipse.ui.console.IConsoleListener {
 		public void consolesAdded(IConsole[] consoles) {
-			for (int i = 0; i < consoles.length; i++) {
-				IConsole console = consoles[i];
+			for (IConsole console : consoles) {
 				if (console == BzrOutputConsole.this) {
 					init();
 				}
@@ -83,8 +87,7 @@
 		}
 
 		public void consolesRemoved(IConsole[] consoles) {
-			for (int i = 0; i < consoles.length; i++) {
-				IConsole console = consoles[i];
+			for (IConsole console : consoles) {
 				if (console == BzrOutputConsole.this) {
 					ConsolePlugin.getDefault().getConsoleManager().removeConsoleListener(this);
 					dispose();
@@ -108,12 +111,8 @@
 		EclipseBazaarUI.getDefault().getPreferenceStore().addPropertyChangeListener(BzrOutputConsole.this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.console.AbstractConsole#init()
-	 */
-	protected void init() {
+	@Override
+    protected void init() {
 		// Called when console is added to the console view
 		super.init();
 
@@ -167,8 +166,7 @@
 		synchronized (document) {
 			visible = true;
 			ConsoleDocument.ConsoleLine[] lines = document.getLines();
-			for (int i = 0; i < lines.length; i++) {
-				ConsoleDocument.ConsoleLine line = lines[i];
+			for (ConsoleLine line : lines) {
 				appendLine(line.type, line.line);
 			}
 			document.clear();
@@ -220,12 +218,8 @@
 		manager.showConsoleView(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.console.MessageConsole#dispose()
-	 */
-	protected void dispose() {
+	@Override
+    protected void dispose() {
 		// Here we can't call super.dispose() because we actually want the
 		// partitioner to remain
 		// connected, but we won't show lines until the console is added to the

=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/CommitDialog.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/CommitDialog.java	2008-12-02 14:43:35 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/CommitDialog.java	2009-04-29 05:35:40 +0000
@@ -74,466 +74,480 @@
 
 /**
  * <br>
- * A commit dialog box allowing choosing of what files to commit and a commit message for those files. Untracked files may also be chosen.
- * <br>
+ * A commit dialog box allowing choosing of what files to commit and a commit
+ * message for those files. Untracked files may also be chosen. <br>
  * 
- * @author
  * @author Peter Hunnisett <peter_hge at softwarebalm dot com> <br>
  * @modifiedBy Guillermo Gonzalez
  * 
  */
 public class CommitDialog extends TrayDialog {
 
-	private static String DEFAULT_COMMIT_MESSAGE = UITexts.CommitDialog_defaultCommitMessage;
-
-	private class CommittableFilesFilter extends ViewerFilter {
-
-		public CommittableFilesFilter() {
-			super();
-		}
-
-		/**
-		 * Filter out un commitable files (i.e. ! -> deleted but still tracked)
-		 */
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if (element instanceof IBzrResourceStatus) {
-				IBzrResourceStatus status = ((IBzrResourceStatus) element);
-				IBzrLocalResource bzrResource = status.getResource();
-				if (status.isUnchanged() || status.isIgnored() || (!status.isDeleted() && bzrResource.getIResource().getType() == IResource.PROJECT))
-					return false;
-			}
-			return true;
-		}
-	}
-
-	public class AdaptableCommitList implements IAdaptable, IWorkbenchAdapter {
-		private IBzrResourceStatus[] resources;
-
-		public AdaptableCommitList(List<IBzrResourceStatus> resources) {
-			this.resources = resources.toArray(new IBzrResourceStatus[0]);
-		}
-
-		public Object[] getChildren(Object o) {
-			return resources;
-		}
-
-		public ImageDescriptor getImageDescriptor(Object object) {
-			return null;
-		}
-
-		public String getLabel(Object o) {
-			if (o instanceof IBzrResourceStatus)
-				return ((IBzrResourceStatus) o).getStatus().toString();
-			return o == null ? "" : o.toString();//$NON-NLS-1$
-		}
-
-		public Object getParent(Object o) {
-			return null;
-		}
-
-		public Object getAdapter(Class adapter) {
-			if (adapter == IWorkbenchAdapter.class)
-				return this;
-			return null;
-		}
-	}
-	
-	private static Column[] columns  = new Column[]{Column.REVNO, Column.COMMITTER, Column.TIMESTAMP, Column.MESSAGE};
-
-	private StyledText commitTextBox;
-
-	private Label commitTextLabel;
-
-	private Button showUntrackedFilesButton;
-
-	private Button pushAfterCommitButton;
-
-	private Button localCommitButton;
-
-	private CommitableResources commitableResources;
-
-	private List<IResource> filesToAdd;
-
-	private List<IBzrLocalResource> filesToCommit;
-
-	private String commitMessage;
-
-	private MouseListener commitMouseListener;
-
-	private KeyListener commitKeyListener;
-
-	private boolean pushAfterCommit = false;
-	
-	private CommitableResources selectedResources;
-
-	private Text authorText;
-
-	private BzrResourceSelectionComposite resourceSelectionComposite;
-
-	private Text fixesText;
-
-	private ArrayList<Option> options = new ArrayList<Option>(0);
-
-	private Button authorButton;
-
-	private Button fixesButton;
-
-	private boolean pendingMerge;
-	
-	/**
-	 * 
-	 * @param shell
-	 * @param commitableResources
-	 * @param selectedResources
-	 */
-	public CommitDialog(Shell shell, CommitableResources commitableResources, CommitableResources selectedResources) {
-		this(shell);
-		this.commitableResources = commitableResources;
-		this.selectedResources = selectedResources; 
-	}
-
-	public CommitDialog(Shell shell) {
-		super(shell);
-		setShellStyle(SWT.RESIZE | SWT.MODELESS | SWT.CLOSE | SWT.MAX | SWT.BORDER | SWT.TITLE);
-		setBlockOnOpen(false);
-	}
-
-	public List<IBzrLocalResource> getFilesToCommit() {
-		return filesToCommit;
-	}
-
-	public String getCommitMessage() {
-		return commitMessage;
-	}
-
-	public List<IResource> getFilesToAdd() {
-		return filesToAdd;
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite container = (Composite) super.createDialogArea(parent);
-		getShell().setText(UITexts.CommitDialog_dialogTitle);
-		container.setLayout(new GridLayout(1, false));
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		commitTextLabel = new Label(container, SWT.NONE);
-		commitTextLabel.setText(UITexts.CommitDialog_commentsTitle);
-
-		commitTextBox = new StyledText(container, SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.WRAP);
-		GridData textBoxData = new GridData(GridData.FILL_HORIZONTAL);
-		textBoxData.heightHint = 150;
-		commitTextBox.setLayoutData(textBoxData);
-
-		createAuthorTextBox(container);
-		createFixesTextBox(container);
-
-		resourceSelectionComposite = new BzrResourceSelectionComposite(!pendingMerge) {
-			private HistoryTree logTree;
-
-			@Override
-			protected void createOption(Composite container) {
-				Group optionGroup = new Group(container, SWT.NONE);
-				optionGroup.setText("Options");
-				optionGroup.setLayout(new GridLayout(3, false));
-				
-				GridData data;
-		        data = new GridData();
-		        data.horizontalAlignment = GridData.FILL;
-		        data.verticalAlignment = GridData.CENTER;
-		        data.grabExcessHorizontalSpace = true;
-		        data.grabExcessVerticalSpace = true;
-		        optionGroup.setLayoutData(data);
-				
-		        if(!pendingMerge) {
-		        	showUntrackedFilesButton = new Button(optionGroup, SWT.CHECK);
-		        	showUntrackedFilesButton.setText(UITexts.CommitDialog_checkboxUntracked);
-				}
-
-				pushAfterCommitButton = new Button(optionGroup, SWT.CHECK);
-				pushAfterCommitButton.setText(UITexts.CommitDialog_pushAfterCommit);
-
-				localCommitButton = new Button(optionGroup, SWT.CHECK);
-				localCommitButton.setText(UITexts.CommitDialog_localCommit);
-			}
-			
-			@Override
-			protected void createUpperControls(Composite container) {
-				if(!pendingMerge) {
-					Label commitFilesLabel = new Label(container, GridData.FILL_BOTH);
-					commitFilesLabel.setText("Select Files:");
-				}
-			}
-			
-			@Override
-			protected void createMiddleControls(Composite container) {
-				if(pendingMerge) {
-					TabFolder folder = new TabFolder(container, SWT.NONE);
-					folder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-					TabItem fileListItem = new TabItem(folder, SWT.NONE);
-					fileListItem.setText("File list");
-					super.createMiddleControls(folder);
-					fileListItem.setControl(super.getTableViewer().getTable());
-					TabItem logItem = new TabItem(folder, SWT.NONE);
-					logTree = new HistoryTree(folder, columns);
-					logTree.getTree().getColumn(Column.REVNO.ordinal()).setText("RevId");
-					logItem.setControl(logTree);
-					logItem.setText("Pending merges");
-					GridData data;
-			        data = new GridData();
-			        data.horizontalAlignment = GridData.FILL;
-			        data.verticalAlignment = GridData.FILL;
-			        data.grabExcessHorizontalSpace = true;
-					logTree.setLayoutData(data);
-					logTree.populate(commitableResources.getAllPendingMerges());
-				} else {
-					super.createMiddleControls(container);
-				}
-			}
-		};
-		Composite listComposite = resourceSelectionComposite.createControls(container);
-		resourceSelectionComposite.getTableViewer().addFilter(new CommittableFilesFilter());
-		resourceSelectionComposite.addUntrackedFilesFilter();
-		
-		resourceSelectionComposite.setResources(this.commitableResources.getAllStatuses());
-		if(pendingMerge) {
-			List<IBzrResourceStatus> filteredResources = new ArrayList<IBzrResourceStatus>(this.commitableResources.getAllStatuses().size());
-			for (IBzrResourceStatus status : this.commitableResources.getAllStatuses()) {
-				if(!status.isUnknown()) {
-					filteredResources.add(status);
-				}
-			}
-			resourceSelectionComposite.setSelection(filteredResources);
-			resourceSelectionComposite.addUntrackedFilesFilter();
-		} else {
-			for (IBzrResourceStatus status : selectedResources.getAllStatuses()) {
-				if(status.isUnknown() && status.getResource() != null && !status.getResource().isFolder()) {
-					resourceSelectionComposite.removeUntrackedFilesFilter();
-					break;
-				}
-			}
-			resourceSelectionComposite.setSelection(this.selectedResources.getAllStatuses());
-		}
-		resourceSelectionComposite.refreshTableViewer();
-		
-		listComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
-		
-		
-		makeActions();
-		return container;
-	}
-	
-	private void createAuthorTextBox(Composite parent) {
-		final Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout(3, false));
-		container.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
-		authorButton = new Button(container, SWT.CHECK);
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.BEGINNING;
-		data.grabExcessHorizontalSpace = false;
-		data.grabExcessVerticalSpace = false;
-		authorButton.setLayoutData(data);
-		final Label author = new Label(container, SWT.HORIZONTAL);
-		author.setText("Author:");
-		authorText = new Text(container, SWT.SINGLE|SWT.WRAP);
-		authorText.setText(EclipseBazaarUI.getDefault().getPreferenceStore().getString(BazaarPreference.BZR_EMAIL.name()));
-		authorText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		authorText.setEditable(false);
-		authorButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				authorText.setEditable(authorButton.getSelection());
-				authorText.setEnabled(authorButton.getSelection());
-			}
-		});
-		container.addControlListener(new ControlAdapter() {
-			@Override
-			public void controlResized(ControlEvent e) {
-				Point currSize = authorText.getSize();
-				currSize.x = container.getSize().x;
-				authorText.setSize(currSize);	
-			}
-		});
-	}
-	
-	private void createFixesTextBox(Composite parent) {
-		final Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout(3, false));
-		container.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
-		fixesButton = new Button(container, SWT.CHECK);
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.BEGINNING;
-		data.grabExcessHorizontalSpace = false;
-		data.grabExcessVerticalSpace = false;
-		fixesButton.setLayoutData(data);
-		final Label author = new Label(container, SWT.HORIZONTAL);
-		author.setText("Fixes:");
-		fixesText = new Text(container, SWT.SINGLE|SWT.WRAP);
-		fixesText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fixesText.setEditable(false);
-		fixesButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				fixesText.setEditable(fixesButton.getSelection());
-				fixesText.setEnabled(fixesButton.getSelection());
-			}
-		});
-		container.addControlListener(new ControlAdapter() {
-			public void controlResized(ControlEvent e) {
-				Point currSize = fixesText.getSize();
-				currSize.x = container.getSize().x;
-				fixesText.setSize(currSize);	
-			}
-		});
-	}
-
-	private void makeActions() {
-
-		commitTextBox.setCapture(true);
-		if(!pendingMerge) {
-			showUntrackedFilesButton.setSelection(!resourceSelectionComposite.isFilterUntracked()); // Start unselected.
-		}
-		pushAfterCommitButton.setSelection(false); // Start unselected.
-		localCommitButton.setSelection(false); // Start unselected
-		localCommitButton.setVisible(false);
-
-		// TODO: for the moment only one branch is supported in commit so we can do this
-		for (IBzrResourceStatus commitable : commitableResources.getAllStatuses()) {
-			if (!commitable.isDeleted() && commitable.getResource().getBranch().isBound()) {
-				localCommitButton.setVisible(true);
-				break;
-			}
-		}
-		if(!pendingMerge) {
-			showUntrackedFilesButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					if (showUntrackedFilesButton.getSelection()) {
-						resourceSelectionComposite.removeUntrackedFilesFilter();
-						for (TableColumn column : resourceSelectionComposite.getTableViewer().getTable().getColumns()) {
-							column.pack();
-						}
-					} else {
-						resourceSelectionComposite.addUntrackedFilesFilter();
-					}
-					resourceSelectionComposite.getTableViewer().refresh(true);
-				}
-			});
-		}
-
-		// set Ctrl + Return listener (fix Bug #128071)
-		commitTextBox.addTraverseListener(new TraverseListener() {
-			public void keyTraversed(TraverseEvent e) {
-				if (e.detail == SWT.TRAVERSE_RETURN && (e.stateMask & SWT.CTRL) != 0) {
-					okPressed();
-				}
-			}
-		});
-
-		setupDefaultCommitMessage();
-	}
-
-	private void setupDefaultCommitMessage() {
-		commitTextBox.setText(DEFAULT_COMMIT_MESSAGE);
-		commitMouseListener = new MouseListener() {
-
-			public void mouseDown(MouseEvent e) {
-				// On the first mouse down in the area clear the default commit
-				// message.
-				commitTextBox.setText("");
-				commitTextBox.removeMouseListener(commitMouseListener);
-				commitTextBox.removeKeyListener(commitKeyListener);
-			}
-
-			public void mouseDoubleClick(MouseEvent e) {
-				// Nothing
-			}
-
-			public void mouseUp(MouseEvent e) {
-				// Nothing
-			}
-		};
-
-		commitKeyListener = new KeyListener() {
-
-			public void keyPressed(KeyEvent e) {
-				// On the first key press, deleted the default commit message
-				// and then remove the handlers.
-				commitTextBox.setText("");
-				commitTextBox.removeMouseListener(commitMouseListener);
-				commitTextBox.removeKeyListener(commitKeyListener);
-			}
-
-			public void keyReleased(KeyEvent e) {
-				// Nothing
-			}
-		};
-		commitTextBox.addMouseListener(commitMouseListener);
-		commitTextBox.addKeyListener(commitKeyListener);
-	}
-	
-	private List<IBzrLocalResource> getCommitList(List<IBzrResourceStatus> list) {
-		List<IBzrLocalResource> filtered = new ArrayList<IBzrLocalResource>();
-		for (IBzrResourceStatus status : list) {
-			filtered.add(status.getResource());
-		}
-		return filtered;
-	}
-
-	private List<IResource> getToAddList(List<IBzrResourceStatus> list) {
-		List<IResource> filtered = new ArrayList<IResource>();
-		for (IBzrResourceStatus status : list) {
-			if (status.contains(BazaarStatusKind.UNKNOWN)) {
-				filtered.add(status.getResource().getIResource());
-			}
-		}
-		return filtered;
-	}
-
-	/**
-	 * Override the OK button pressed to capture the info we want first and then call super.
-	 */
-	protected void okPressed() {
-		filesToAdd = getToAddList(resourceSelectionComposite.getSelection());
-		filesToCommit = getCommitList(resourceSelectionComposite.getSelection());
-		commitMessage = commitTextBox.getText();
-		pushAfterCommit = pushAfterCommitButton.getSelection();
-		String author = authorText.getText();
-		String fixes = fixesText.getText();
-		this.options = new ArrayList<Option>(0);
-		if(localCommitButton.getSelection()) {
-			options.add(ICommitOptions.LOCAL);
-		}
-		if(authorButton.getSelection() && author != null && !"".equals(author.trim())) {
-			options.add(ICommitOptions.AUTHOR.setArgument(author));
-		}
-		if(fixesButton.getSelection() && fixes != null && !"".equals(fixes.trim())) {
-			options.add(ICommitOptions.FIXES.setArgument(fixes));
-		}
-		if (commitMessage == null || commitMessage.trim().length() == 0 || commitMessage.equals(UITexts.CommitDialog_defaultCommitMessage)) {
-			MessageDialog.openInformation(this.getParentShell(), "Empty Commit Text", "You must complete the comment");
-		} else {
-			super.okPressed();
-		}
-	}
-
-	protected Point getInitialSize() {
-		return new Point(480, 700);
-	}
-
-	public boolean isPushAfterCommit() {
-		return pushAfterCommit;
-	}
-
-	public ArrayList<Option> getOptions() {
-		return options;
-	}
-	
-	public int open(CommitableResources commitableResources, CommitableResources selectedResources, boolean shouldBlock) {
-		setShellStyle(SWT.RESIZE | SWT.MODELESS | SWT.CLOSE | SWT.MAX | SWT.BORDER | SWT.TITLE);
-		setBlockOnOpen(shouldBlock);
-		this.commitableResources = commitableResources;
-		this.selectedResources = selectedResources;
-		this.pendingMerge = commitableResources.getAllPendingMerges().size() > 0;
-		return open();
-	}
-	
+    private static String DEFAULT_COMMIT_MESSAGE = UITexts.CommitDialog_defaultCommitMessage;
+
+    private class CommittableFilesFilter extends ViewerFilter {
+
+        public CommittableFilesFilter() {
+            super();
+        }
+
+        /**
+         * Filter out uncommittable files (i.e. ! -> deleted but still tracked)
+         */
+        public boolean select(Viewer viewer, Object parentElement, Object element) {
+            if (element instanceof IBzrResourceStatus) {
+                IBzrResourceStatus status = ((IBzrResourceStatus) element);
+                IBzrLocalResource bzrResource = status.getResource();
+                if (status.isUnchanged()
+                    || status.isIgnored()
+                    || (!status.isDeleted() && bzrResource.getIResource().getType() == IResource.PROJECT))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
+    public class AdaptableCommitList implements IAdaptable, IWorkbenchAdapter {
+        private IBzrResourceStatus[] resources;
+
+        public AdaptableCommitList(List<IBzrResourceStatus> resources) {
+            this.resources = resources.toArray(new IBzrResourceStatus[0]);
+        }
+
+        public Object[] getChildren(Object o) {
+            return resources;
+        }
+
+        public ImageDescriptor getImageDescriptor(Object object) {
+            return null;
+        }
+
+        public String getLabel(Object o) {
+            if (o instanceof IBzrResourceStatus) {
+                return ((IBzrResourceStatus) o).getStatus().toString();
+            }
+            return o == null ? "" : o.toString();//$NON-NLS-1$
+        }
+
+        public Object getParent(Object o) {
+            return null;
+        }
+
+        public Object getAdapter(Class adapter) {
+            if (adapter == IWorkbenchAdapter.class) {
+                return this;
+            }
+            return null;
+        }
+    }
+
+    private static Column[] columns =
+        new Column[] { Column.REVNO, Column.COMMITTER, Column.TIMESTAMP, Column.MESSAGE };
+
+    private StyledText commitTextBox;
+
+    private Label commitTextLabel;
+
+    private Button showUntrackedFilesButton;
+
+    private Button pushAfterCommitButton;
+
+    private Button localCommitButton;
+
+    private CommitableResources commitableResources;
+
+    private List<IResource> filesToAdd;
+
+    private List<IBzrLocalResource> filesToCommit;
+
+    private String commitMessage;
+
+    private MouseListener commitMouseListener;
+
+    private KeyListener commitKeyListener;
+
+    private boolean pushAfterCommit = false;
+
+    private CommitableResources selectedResources;
+
+    private Text authorText;
+
+    private BzrResourceSelectionComposite resourceSelectionComposite;
+
+    private Text fixesText;
+
+    private ArrayList<Option> options = new ArrayList<Option>(0);
+
+    private Button authorButton;
+
+    private Button fixesButton;
+
+    private boolean pendingMerge;
+
+    public CommitDialog(Shell shell, CommitableResources commitableResources,
+        CommitableResources selectedResources)
+    {
+        this(shell);
+        this.commitableResources = commitableResources;
+        this.selectedResources = selectedResources;
+    }
+
+    public CommitDialog(Shell shell) {
+        super(shell);
+        setShellStyle(SWT.RESIZE | SWT.MODELESS | SWT.CLOSE | SWT.MAX | SWT.BORDER | SWT.TITLE);
+        setBlockOnOpen(false);
+    }
+
+    public List<IBzrLocalResource> getFilesToCommit() {
+        return filesToCommit;
+    }
+
+    public String getCommitMessage() {
+        return commitMessage;
+    }
+
+    public List<IResource> getFilesToAdd() {
+        return filesToAdd;
+    }
+
+    protected Control createDialogArea(Composite parent) {
+        Composite container = (Composite) super.createDialogArea(parent);
+        getShell().setText(UITexts.CommitDialog_dialogTitle);
+        container.setLayout(new GridLayout(1, false));
+        container.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+        commitTextLabel = new Label(container, SWT.NONE);
+        commitTextLabel.setText(UITexts.CommitDialog_commentsTitle);
+
+        commitTextBox = new StyledText(container, SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.WRAP);
+        GridData textBoxData = new GridData(GridData.FILL_HORIZONTAL);
+        textBoxData.heightHint = 150;
+        commitTextBox.setLayoutData(textBoxData);
+
+        createAuthorTextBox(container);
+        createFixesTextBox(container);
+
+        resourceSelectionComposite = new BzrResourceSelectionComposite(!pendingMerge) {
+            private HistoryTree logTree;
+
+            @Override
+            protected void createOption(Composite container) {
+                Group optionGroup = new Group(container, SWT.NONE);
+                optionGroup.setText("Options");
+                optionGroup.setLayout(new GridLayout(3, false));
+
+                GridData data;
+                data = new GridData();
+                data.horizontalAlignment = GridData.FILL;
+                data.verticalAlignment = GridData.CENTER;
+                data.grabExcessHorizontalSpace = true;
+                data.grabExcessVerticalSpace = true;
+                optionGroup.setLayoutData(data);
+
+                if (!pendingMerge) {
+                    showUntrackedFilesButton = new Button(optionGroup, SWT.CHECK);
+                    showUntrackedFilesButton.setText(UITexts.CommitDialog_checkboxUntracked);
+                }
+
+                pushAfterCommitButton = new Button(optionGroup, SWT.CHECK);
+                pushAfterCommitButton.setText(UITexts.CommitDialog_pushAfterCommit);
+
+                localCommitButton = new Button(optionGroup, SWT.CHECK);
+                localCommitButton.setText(UITexts.CommitDialog_localCommit);
+            }
+
+            @Override
+            protected void createUpperControls(Composite container) {
+                if (!pendingMerge) {
+                    Label commitFilesLabel = new Label(container, GridData.FILL_BOTH);
+                    commitFilesLabel.setText("Select Files:");
+                }
+            }
+
+            @Override
+            protected void createMiddleControls(Composite container) {
+                if (pendingMerge) {
+                    TabFolder folder = new TabFolder(container, SWT.NONE);
+                    folder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+                    TabItem fileListItem = new TabItem(folder, SWT.NONE);
+                    fileListItem.setText("File list");
+                    super.createMiddleControls(folder);
+                    fileListItem.setControl(super.getTableViewer().getTable());
+                    TabItem logItem = new TabItem(folder, SWT.NONE);
+                    logTree = new HistoryTree(folder, columns);
+                    logTree.getTree().getColumn(Column.REVNO.ordinal()).setText("RevId");
+                    logItem.setControl(logTree);
+                    logItem.setText("Pending merges");
+                    GridData data;
+                    data = new GridData();
+                    data.horizontalAlignment = GridData.FILL;
+                    data.verticalAlignment = GridData.FILL;
+                    data.grabExcessHorizontalSpace = true;
+                    logTree.setLayoutData(data);
+                    logTree.populate(commitableResources.getAllPendingMerges());
+                } else {
+                    super.createMiddleControls(container);
+                }
+            }
+        };
+        Composite listComposite = resourceSelectionComposite.createControls(container);
+        resourceSelectionComposite.getTableViewer().addFilter(new CommittableFilesFilter());
+        resourceSelectionComposite.addUntrackedFilesFilter();
+
+        resourceSelectionComposite.setResources(this.commitableResources.getAllStatuses());
+        if (pendingMerge) {
+            List<IBzrResourceStatus> filteredResources =
+                new ArrayList<IBzrResourceStatus>(this.commitableResources.getAllStatuses().size());
+            for (IBzrResourceStatus status : this.commitableResources.getAllStatuses()) {
+                if (!status.isUnknown()) {
+                    filteredResources.add(status);
+                }
+            }
+            resourceSelectionComposite.setSelection(filteredResources);
+            resourceSelectionComposite.addUntrackedFilesFilter();
+        } else {
+            for (IBzrResourceStatus status : selectedResources.getAllStatuses()) {
+                if (status.isUnknown() && status.getResource() != null
+                    && !status.getResource().isFolder())
+                {
+                    resourceSelectionComposite.removeUntrackedFilesFilter();
+                    break;
+                }
+            }
+            resourceSelectionComposite.setSelection(this.selectedResources.getAllStatuses());
+        }
+        resourceSelectionComposite.refreshTableViewer();
+
+        listComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
+
+        makeActions();
+        return container;
+    }
+
+    private void createAuthorTextBox(Composite parent) {
+        final Composite container = new Composite(parent, SWT.NONE);
+        container.setLayout(new GridLayout(3, false));
+        container.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
+        authorButton = new Button(container, SWT.CHECK);
+        GridData data = new GridData();
+        data.horizontalAlignment = GridData.BEGINNING;
+        data.grabExcessHorizontalSpace = false;
+        data.grabExcessVerticalSpace = false;
+        authorButton.setLayoutData(data);
+        final Label author = new Label(container, SWT.HORIZONTAL);
+        author.setText("Author:");
+        authorText = new Text(container, SWT.SINGLE | SWT.WRAP);
+        authorText.setText(EclipseBazaarUI.getDefault().getPreferenceStore().getString(
+            BazaarPreference.BZR_EMAIL.name()));
+        authorText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+        authorText.setEditable(false);
+        authorButton.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                authorText.setEditable(authorButton.getSelection());
+                authorText.setEnabled(authorButton.getSelection());
+            }
+        });
+        container.addControlListener(new ControlAdapter() {
+            @Override
+            public void controlResized(ControlEvent e) {
+                Point currSize = authorText.getSize();
+                currSize.x = container.getSize().x;
+                authorText.setSize(currSize);
+            }
+        });
+    }
+
+    private void createFixesTextBox(Composite parent) {
+        final Composite container = new Composite(parent, SWT.NONE);
+        container.setLayout(new GridLayout(3, false));
+        container.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
+        fixesButton = new Button(container, SWT.CHECK);
+        GridData data = new GridData();
+        data.horizontalAlignment = GridData.BEGINNING;
+        data.grabExcessHorizontalSpace = false;
+        data.grabExcessVerticalSpace = false;
+        fixesButton.setLayoutData(data);
+        final Label author = new Label(container, SWT.HORIZONTAL);
+        author.setText("Fixes:");
+        fixesText = new Text(container, SWT.SINGLE | SWT.WRAP);
+        fixesText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+        fixesText.setEditable(false);
+        fixesButton.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                fixesText.setEditable(fixesButton.getSelection());
+                fixesText.setEnabled(fixesButton.getSelection());
+            }
+        });
+        container.addControlListener(new ControlAdapter() {
+            public void controlResized(ControlEvent e) {
+                Point currSize = fixesText.getSize();
+                currSize.x = container.getSize().x;
+                fixesText.setSize(currSize);
+            }
+        });
+    }
+
+    private void makeActions() {
+
+        commitTextBox.setCapture(true);
+        if (!pendingMerge) {
+            showUntrackedFilesButton.setSelection(!resourceSelectionComposite.isFilterUntracked()); // Start unselected.
+        }
+        pushAfterCommitButton.setSelection(false); // Start unselected.
+        localCommitButton.setSelection(false); // Start unselected
+        localCommitButton.setVisible(false);
+
+        // TODO: for the moment only one branch is supported in commit so we can do this
+        for (IBzrResourceStatus commitable : commitableResources.getAllStatuses()) {
+            if (!commitable.isDeleted() && commitable.getResource().getBranch().isBound()) {
+                localCommitButton.setVisible(true);
+                break;
+            }
+        }
+        if (!pendingMerge) {
+            showUntrackedFilesButton.addSelectionListener(new SelectionAdapter() {
+                public void widgetSelected(SelectionEvent e) {
+                    if (showUntrackedFilesButton.getSelection()) {
+                        resourceSelectionComposite.removeUntrackedFilesFilter();
+                        for (TableColumn column : resourceSelectionComposite.getTableViewer()
+                            .getTable().getColumns())
+                        {
+                            column.pack();
+                        }
+                    } else {
+                        resourceSelectionComposite.addUntrackedFilesFilter();
+                    }
+                    resourceSelectionComposite.getTableViewer().refresh(true);
+                }
+            });
+        }
+
+        // set Ctrl + Return listener (fix Bug #128071)
+        commitTextBox.addTraverseListener(new TraverseListener() {
+            public void keyTraversed(TraverseEvent e) {
+                if (e.detail == SWT.TRAVERSE_RETURN && (e.stateMask & SWT.CTRL) != 0) {
+                    okPressed();
+                }
+            }
+        });
+
+        setupDefaultCommitMessage();
+    }
+
+    private void setupDefaultCommitMessage() {
+        commitTextBox.setText(DEFAULT_COMMIT_MESSAGE);
+        commitMouseListener = new MouseListener() {
+
+            public void mouseDown(MouseEvent e) {
+                // On the first mouse down in the area clear the default commit
+                // message.
+                commitTextBox.setText("");
+                commitTextBox.removeMouseListener(commitMouseListener);
+                commitTextBox.removeKeyListener(commitKeyListener);
+            }
+
+            public void mouseDoubleClick(MouseEvent e) {
+                // Nothing
+            }
+
+            public void mouseUp(MouseEvent e) {
+                // Nothing
+            }
+        };
+
+        commitKeyListener = new KeyListener() {
+
+            public void keyPressed(KeyEvent e) {
+                // On the first key press, deleted the default commit message
+                // and then remove the handlers.
+                commitTextBox.setText("");
+                commitTextBox.removeMouseListener(commitMouseListener);
+                commitTextBox.removeKeyListener(commitKeyListener);
+            }
+
+            public void keyReleased(KeyEvent e) {
+                // Nothing
+            }
+        };
+        commitTextBox.addMouseListener(commitMouseListener);
+        commitTextBox.addKeyListener(commitKeyListener);
+    }
+
+    private List<IBzrLocalResource> getCommitList(List<IBzrResourceStatus> list) {
+        List<IBzrLocalResource> filtered = new ArrayList<IBzrLocalResource>();
+        for (IBzrResourceStatus status : list) {
+            filtered.add(status.getResource());
+        }
+        return filtered;
+    }
+
+    private List<IResource> getToAddList(List<IBzrResourceStatus> list) {
+        List<IResource> filtered = new ArrayList<IResource>();
+        for (IBzrResourceStatus status : list) {
+            if (status.contains(BazaarStatusKind.UNKNOWN)) {
+                filtered.add(status.getResource().getIResource());
+            }
+        }
+        return filtered;
+    }
+
+    /**
+     * Override the OK button pressed to capture the info we want first and then
+     * call super.
+     */
+    protected void okPressed() {
+        filesToAdd = getToAddList(resourceSelectionComposite.getSelection());
+        filesToCommit = getCommitList(resourceSelectionComposite.getSelection());
+        commitMessage = commitTextBox.getText();
+        pushAfterCommit = pushAfterCommitButton.getSelection();
+        String author = authorText.getText();
+        String fixes = fixesText.getText();
+        this.options = new ArrayList<Option>(0);
+        if (localCommitButton.getSelection()) {
+            options.add(ICommitOptions.LOCAL);
+        }
+        if (authorButton.getSelection() && author != null && !"".equals(author.trim())) {
+            options.add(ICommitOptions.AUTHOR.setArgument(author));
+        }
+        if (fixesButton.getSelection() && fixes != null && !"".equals(fixes.trim())) {
+            options.add(ICommitOptions.FIXES.setArgument(fixes));
+        }
+        if (commitMessage == null || commitMessage.trim().length() == 0
+            || commitMessage.equals(UITexts.CommitDialog_defaultCommitMessage))
+        {
+            MessageDialog.openInformation(this.getParentShell(), "Empty Commit Text",
+                "You must complete the comment");
+        } else {
+            super.okPressed();
+        }
+    }
+
+    protected Point getInitialSize() {
+        return new Point(480, 700);
+    }
+
+    public boolean isPushAfterCommit() {
+        return pushAfterCommit;
+    }
+
+    public ArrayList<Option> getOptions() {
+        return options;
+    }
+
+    public int open(CommitableResources commitableResources,
+        CommitableResources selectedResources,
+        boolean shouldBlock)
+    {
+        setShellStyle(SWT.RESIZE | SWT.MODELESS | SWT.CLOSE | SWT.MAX | SWT.BORDER | SWT.TITLE);
+        setBlockOnOpen(shouldBlock);
+        this.commitableResources = commitableResources;
+        this.selectedResources = selectedResources;
+        this.pendingMerge = commitableResources.getAllPendingMerges().size() > 0;
+        return open();
+    }
+
 }

=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/UpdateInfoDialog.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/UpdateInfoDialog.java	2008-09-10 02:31:19 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/UpdateInfoDialog.java	2009-04-28 04:23:06 +0000
@@ -32,8 +32,13 @@
 import org.vcs.bazaar.eclipse.ui.UITexts;
 
 /**
+ * Dialog requesting the user to verify that bzr-eclipse dependencies are
+ * fulfilled.
+ * <p>
+ * Usually displayed after bzr-eclipse has either been upgraded or newly
+ * installed.
+ * 
  * @author Guillermo Gonzalez <[e-mail]>
- *
  */
 public class UpdateInfoDialog extends TrayDialog {
 

=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/internal/TeamAction.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/internal/TeamAction.java	2008-12-02 18:37:38 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/internal/TeamAction.java	2009-04-29 05:52:15 +0000
@@ -47,7 +47,6 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.ActionDelegate;
 import org.eclipse.ui.internal.LegacyResourceSupport;
 import org.vcs.bazaar.eclipse.ui.EclipseBazaarUI;
@@ -61,391 +60,395 @@
  * providers may also instantiate or subclass any of the subclasses of
  * TeamAction provided in this package.
  */
-public abstract class TeamAction extends ActionDelegate implements IObjectActionDelegate, IViewActionDelegate, IWorkbenchWindowActionDelegate {
-	// The current selection
-	private IStructuredSelection selection;
-
-	// The shell, required for the progress dialog
-	private Shell shell;
-
-	// Constants for determining the type of progress. Subclasses may
-	// pass one of these values to the run method.
-	public final static int PROGRESS_DIALOG = 1;
-	public final static int PROGRESS_BUSYCURSOR = 2;
-
-	private IWorkbenchPart targetPart;
-	private IWorkbenchWindow window;
-
-	private ISelectionListener selectionListener = new ISelectionListener() {
-		public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-			if (selection instanceof IStructuredSelection)
-				TeamAction.this.selection = (IStructuredSelection) selection;
-		}
-	};
-
-	/**
-	 * Creates an array of the given class type containing all the objects in
-	 * the selection that adapt to the given class.
-	 * 
-	 * @param selection
-	 * @param c
-	 * @return the selected adaptables
-	 */
-	public static Object[] getSelectedAdaptables(ISelection selection, Class c) {
-		ArrayList<Object> result = null;
-		if (selection != null && !selection.isEmpty()) {
-			result = new ArrayList<Object>();
-			Iterator elements = ((IStructuredSelection) selection).iterator();
-			while (elements.hasNext()) {
-				Object adapter = getAdapter(elements.next(), c);
-				if (c.isInstance(adapter)) {
-					result.add(adapter);
-				}
-			}
-		}
-		if (result != null && !result.isEmpty()) {
-			return result.toArray((Object[]) Array.newInstance(c, result.size()));
-		}
-		return (Object[]) Array.newInstance(c, 0);
-	}
-
-	/**
-	 * Find the object associated with the given object when it is adapted to
-	 * the provided class. Null is returned if the given object does not adapt
-	 * to the given class
-	 * 
-	 * @param adaptable
-	 * @param c
-	 * @return Object
-	 */
-	public static Object getAdapter(Object adaptable, Class c) {
-		if (c.isInstance(adaptable)) {
-			return adaptable;
-		}
-		if (adaptable instanceof IAdaptable) {
-			IAdaptable a = (IAdaptable) adaptable;
-			Object adapter = a.getAdapter(c);
-			if (c.isInstance(adapter)) {
-				return adapter;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the selected projects.
-	 * 
-	 * @return the selected projects
-	 */
-	protected IProject[] getSelectedProjects() {
-		IResource[] selectedResources = getSelectedResources();
-		if (selectedResources.length == 0)
-			return new IProject[0];
-		ArrayList<IProject> projects = new ArrayList<IProject>();
-		for (int i = 0; i < selectedResources.length; i++) {
-			IResource resource = selectedResources[i];
-			if (resource.getType() == IResource.PROJECT) {
-				projects.add((IProject) resource);
-			}
-		}
-		return (IProject[]) projects.toArray(new IProject[projects.size()]);
-	}
-
-	/**
-	 * Returns an array of the given class type c that contains all instances of
-	 * c that are either contained in the selection or are adapted from objects
-	 * contained in the selection.
-	 * 
-	 * @param c
-	 * @return the selection adapted to the given class
-	 */
-	protected Object[] getAdaptedSelection(Class c) {
-		return getSelectedAdaptables(selection, c);
-	}
-
-	/**
-	 * Returns the selected resources.
-	 * 
-	 * @return the selected resources
-	 */
-	protected IResource[] getSelectedResources() {
-		return Utils.getContributedResources(getSelection().toArray());
-	}
-
-	protected IStructuredSelection getSelection() {
-		if (selection == null)
-			selection = StructuredSelection.EMPTY;
-		return selection;
-	}
-
-	/**
-	 * Return the selected resource mappins that contain resources in projects
-	 * that are associated with a repository of the given id.
-	 * 
-	 * @param providerId
-	 *            the repository provider id
-	 * @return the resource mappings that contain resources associated with the
-	 *         given provider
-	 */
-	protected ResourceMapping[] getSelectedResourceMappings(String providerId) {
-		Object[] elements = getSelection().toArray();
-		ArrayList<ResourceMapping> providerMappings = new ArrayList<ResourceMapping>();
-		for (int i = 0; i < elements.length; i++) {
-			Object object = elements[i];
-			Object adapted = getResourceMapping(object);
-			if (adapted instanceof ResourceMapping) {
-				ResourceMapping mapping = (ResourceMapping) adapted;
-				if (providerId == null || isMappedToProvider(mapping, providerId)) {
-					providerMappings.add(mapping);
-				}
-			}
-		}
-		return (ResourceMapping[]) providerMappings.toArray(new ResourceMapping[providerMappings.size()]);
-	}
-
-	private Object getResourceMapping(Object object) {
-		if (object instanceof ResourceMapping)
-			return (ResourceMapping) object;
-		return LegacyResourceSupport.getAdaptedContributorResourceMapping(object);
-	}
-
-	private boolean isMappedToProvider(ResourceMapping element, String providerId) {
-		IProject[] projects = element.getProjects();
-		for (int k = 0; k < projects.length; k++) {
-			IProject project = projects[k];
-			RepositoryProvider provider = RepositoryProvider.getProvider(project);
-			if (provider != null && provider.getID().equals(providerId)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Convenience method for getting the current shell.
-	 * 
-	 * @return the shell
-	 */
-	protected Shell getShell() {
-		if (shell != null) {
-			return shell;
-		} else if (targetPart != null) {
-			return targetPart.getSite().getShell();
-		} else if (window != null) {
-			return window.getShell();
-		} else {
-			IWorkbench workbench = TeamUIPlugin.getPlugin().getWorkbench();
-			if (workbench == null)
-				return null;
-			IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
-			if (window == null)
-				return null;
-			return window.getShell();
-		}
-	}
-
-	/**
-	 * Convenience method for running an operation with progress and error
-	 * feedback.
-	 * 
-	 * @param runnable
-	 *            the runnable which executes the operation
-	 * @param problemMessage
-	 *            the message to display in the case of errors
-	 * @param progressKind
-	 *            one of PROGRESS_BUSYCURSOR or PROGRESS_DIALOG
-	 */
-	final protected void run(final IRunnableWithProgress runnable, final String problemMessage, int progressKind) {
-		final Exception[] exceptions = new Exception[] { null };
-		switch (progressKind) {
-		case PROGRESS_BUSYCURSOR:
-			final Display display = EclipseBazaarUI.getStandardDisplay();
-			BusyIndicator.showWhile(display , new Runnable() {
-				public void run() {
-					try {
-						runnable.run(new NullProgressMonitor());
-					} catch (InvocationTargetException e) {
-						exceptions[0] = e;
-					} catch (InterruptedException e) {
-						exceptions[0] = null;
-					}
-				}
-			});
-			break;
-		default:
-		case PROGRESS_DIALOG:
-			try {
-				new ProgressMonitorDialog(getShell()).run(true, true, runnable);
-			} catch (InvocationTargetException e) {
-				exceptions[0] = e;
-			} catch (InterruptedException e) {
-				exceptions[0] = null;
-			}
-			break;
-		}
-		if (exceptions[0] != null) {
-			handle(exceptions[0], null, problemMessage);
-		}
-	}
-
-	/*
-	 * Method declared on IActionDelegate.
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			this.selection = (IStructuredSelection) selection;
-			if (action != null) {
-				setActionEnablement(action);
-			}
-		}
-	}
-
-	/**
-	 * Method invoked from <code>selectionChanged(IAction, ISelection)</code>
-	 * to set the enablement status of the action. The instance variable
-	 * <code>selection</code> will contain the latest selection so the methods
-	 * <code>getSelectedResources()</code> and
-	 * <code>getSelectedProjects()</code> will provide the proper objects.
-	 * 
-	 * This method can be overridden by subclasses but should not be invoked by
-	 * them.
-	 */
-	protected void setActionEnablement(IAction action) {
-		try {
-			action.setEnabled(isEnabled());
-		} catch (TeamException e) {
-			if (e.getStatus().getCode() == IResourceStatus.OUT_OF_SYNC_LOCAL) {
-				// Enable the action to allow the user to discover the problem
-				action.setEnabled(true);
-			} else {
-				action.setEnabled(false);
-				// We should not open a dialog when determining menu enablements
-				// so log it instead
-				TeamPlugin.log(e);
-			}
-		}
-	}
-
-	/*
-	 * Method declared on IObjectActionDelegate.
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		if (targetPart != null) {
-			this.shell = targetPart.getSite().getShell();
-			this.targetPart = targetPart;
-		}
-	}
-
-	/**
-	 * 
-	 * Shows the given errors to the user.
-	 * 
-	 * @param exception
-	 * @param title
-	 * @param message
-	 *            void
-	 */
-	protected void handle(Exception exception, String title, String message) {
-		Utils.handleError(getShell(), exception, title, message);
-	}
-
-	/**
-	 * Concrete action enablement code. Subclasses must implement.
-	 * 
-	 * @return whether the action is enabled
-	 * @throws TeamException
-	 *             if an error occurs during enablement detection
-	 */
-	abstract protected boolean isEnabled() throws TeamException;
-
-	/**
-	 * Convenience method that maps the given resources to their providers. The
-	 * returned Hashtable has keys which are ITeamProviders, and values which
-	 * are Lists of IResources that are shared with that provider.
-	 * 
-	 * @return a hashtable mapping providers to their resources
-	 */
-	protected Hashtable getProviderMapping(IResource[] resources) {
-		Hashtable<RepositoryProvider, List<IResource>> result = new Hashtable<RepositoryProvider, List<IResource>>();
-		for (int i = 0; i < resources.length; i++) {
-			RepositoryProvider provider = RepositoryProvider.getProvider(resources[i].getProject());
-			List<IResource> list = result.get(provider);
-			if (list == null) {
-				list = new ArrayList<IResource>();
-				result.put(provider, list);
-			}
-			list.add(resources[i]);
-		}
-		return result;
-	}
-
-	/**
-	 * @return IWorkbenchPart
-	 */
-	protected IWorkbenchPart getTargetPart() {
-		if (targetPart == null) {
-			IWorkbenchPage page = TeamUIPlugin.getActivePage();
-			if (page != null) {
-				targetPart = page.getActivePart();
-			}
-		}
-		return targetPart;
-
-	}
-
-	/**
-	 * Return the path that was active when the menu item was selected.
-	 * 
-	 * @return IWorkbenchPage
-	 */
-	protected IWorkbenchPage getTargetPage() {
-		if (getTargetPart() == null)
-			return TeamUIPlugin.getActivePage();
-		return getTargetPart().getSite().getPage();
-	}
-
-	/**
-	 * Show the view with the given ID in the perspective from which the action
-	 * was executed. Returns null if the view is not registered.
-	 * 
-	 * @param viewId
-	 * @return IViewPart
-	 */
-	protected IViewPart showView(String viewId) {
-		try {
-			return getTargetPage().showView(viewId);
-		} catch (PartInitException pe) {
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
-	public void init(IViewPart view) {
-		if (view != null) {
-			this.shell = view.getSite().getShell();
-			this.targetPart = view;
-		}
-	}
-
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-		this.shell = window.getShell();
-		window.getSelectionService().addPostSelectionListener(selectionListener);
-	}
-
-	public IWorkbenchWindow getWindow() {
-		return window;
-	}
-
-	public void dispose() {
-		super.dispose();
-		if (window != null) {
-			window.getSelectionService().removePostSelectionListener(selectionListener);
-		}
-		selection = null;
-	}
+public abstract class TeamAction extends ActionDelegate
+    implements IObjectActionDelegate, IViewActionDelegate, IWorkbenchWindowActionDelegate
+{
+    // The current selection
+    private IStructuredSelection selection;
+
+    // The shell, required for the progress dialog
+    private Shell shell;
+
+    // Constants for determining the type of progress. Subclasses may
+    // pass one of these values to the run method.
+    public final static int PROGRESS_DIALOG = 1;
+    public final static int PROGRESS_BUSYCURSOR = 2;
+
+    private IWorkbenchPart targetPart;
+    private IWorkbenchWindow window;
+
+    private ISelectionListener selectionListener = new ISelectionListener() {
+        public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+            if (selection instanceof IStructuredSelection) {
+                TeamAction.this.selection = (IStructuredSelection) selection;
+            }
+        }
+    };
+
+    /**
+     * Creates an array of the given class type containing all the objects in
+     * the selection that adapt to the given class.
+     * 
+     * @param selection
+     * @param c
+     * @return the selected adaptables
+     */
+    public static Object[] getSelectedAdaptables(ISelection selection, Class c) {
+        ArrayList<Object> result = null;
+        if (selection != null && !selection.isEmpty()) {
+            result = new ArrayList<Object>();
+            Iterator elements = ((IStructuredSelection) selection).iterator();
+            while (elements.hasNext()) {
+                Object adapter = getAdapter(elements.next(), c);
+                if (c.isInstance(adapter)) {
+                    result.add(adapter);
+                }
+            }
+        }
+        if (result != null && !result.isEmpty()) {
+            return result.toArray((Object[]) Array.newInstance(c, result.size()));
+        }
+        return (Object[]) Array.newInstance(c, 0);
+    }
+
+    /**
+     * Find the object associated with the given object when it is adapted to
+     * the provided class. Null is returned if the given object does not adapt
+     * to the given class
+     * 
+     * @param adaptable
+     * @param c
+     * @return Object
+     */
+    public static Object getAdapter(Object adaptable, Class c) {
+        if (c.isInstance(adaptable)) {
+            return adaptable;
+        }
+        if (adaptable instanceof IAdaptable) {
+            IAdaptable a = (IAdaptable) adaptable;
+            Object adapter = a.getAdapter(c);
+            if (c.isInstance(adapter)) {
+                return adapter;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns the selected projects.
+     * 
+     * @return the selected projects
+     */
+    protected IProject[] getSelectedProjects() {
+        IResource[] selectedResources = getSelectedResources();
+        if (selectedResources.length == 0) {
+            return new IProject[0];
+        }
+        ArrayList<IProject> projects = new ArrayList<IProject>();
+        for (IResource resource : selectedResources) {
+            if (resource.getType() == IResource.PROJECT) {
+                projects.add((IProject) resource);
+            }
+        }
+        return projects.toArray(new IProject[projects.size()]);
+    }
+
+    /**
+     * Returns an array of the given class type c that contains all instances of
+     * c that are either contained in the selection or are adapted from objects
+     * contained in the selection.
+     * 
+     * @param c
+     * @return the selection adapted to the given class
+     */
+    protected Object[] getAdaptedSelection(Class c) {
+        return getSelectedAdaptables(selection, c);
+    }
+
+    /**
+     * Returns the selected resources.
+     * 
+     * @return the selected resources
+     */
+    protected IResource[] getSelectedResources() {
+        return Utils.getContributedResources(getSelection().toArray());
+    }
+
+    protected IStructuredSelection getSelection() {
+        if (selection == null) {
+            selection = StructuredSelection.EMPTY;
+        }
+        return selection;
+    }
+
+    /**
+     * Return the selected resource mappins that contain resources in projects
+     * that are associated with a repository of the given id.
+     * 
+     * @param providerId the repository provider id
+     * @return the resource mappings that contain resources associated with the
+     *         given provider
+     */
+    protected ResourceMapping[] getSelectedResourceMappings(String providerId) {
+        Object[] elements = getSelection().toArray();
+        ArrayList<ResourceMapping> providerMappings = new ArrayList<ResourceMapping>();
+        for (Object object : elements) {
+            Object adapted = getResourceMapping(object);
+            if (adapted instanceof ResourceMapping) {
+                ResourceMapping mapping = (ResourceMapping) adapted;
+                if (providerId == null || isMappedToProvider(mapping, providerId)) {
+                    providerMappings.add(mapping);
+                }
+            }
+        }
+        return providerMappings.toArray(new ResourceMapping[providerMappings.size()]);
+    }
+
+    private Object getResourceMapping(Object object) {
+        if (object instanceof ResourceMapping) {
+            return object;
+        }
+        return LegacyResourceSupport.getAdaptedContributorResourceMapping(object);
+    }
+
+    private boolean isMappedToProvider(ResourceMapping element, String providerId) {
+        IProject[] projects = element.getProjects();
+        for (IProject project : projects) {
+            RepositoryProvider provider = RepositoryProvider.getProvider(project);
+            if (provider != null && provider.getID().equals(providerId)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Convenience method for getting the current shell.
+     * 
+     * @return the shell
+     */
+    protected Shell getShell() {
+        if (shell != null) {
+            return shell;
+        } else if (targetPart != null) {
+            return targetPart.getSite().getShell();
+        } else if (window != null) {
+            return window.getShell();
+        } else {
+            IWorkbench workbench = TeamUIPlugin.getPlugin().getWorkbench();
+            if (workbench == null) {
+                return null;
+            }
+            IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
+            if (window == null) {
+                return null;
+            }
+            return window.getShell();
+        }
+    }
+
+    /**
+     * Convenience method for running an operation with progress and error
+     * feedback.
+     * 
+     * @param runnable the runnable which executes the operation
+     * @param problemMessage the message to display in the case of errors
+     * @param progressKind one of PROGRESS_BUSYCURSOR or PROGRESS_DIALOG
+     */
+    final protected void run(final IRunnableWithProgress runnable,
+        final String problemMessage,
+        int progressKind)
+    {
+        final Exception[] exceptions = new Exception[] { null };
+        switch (progressKind) {
+        case PROGRESS_BUSYCURSOR:
+            final Display display = EclipseBazaarUI.getStandardDisplay();
+            BusyIndicator.showWhile(display, new Runnable() {
+                public void run() {
+                    try {
+                        runnable.run(new NullProgressMonitor());
+                    } catch (InvocationTargetException e) {
+                        exceptions[0] = e;
+                    } catch (InterruptedException e) {
+                        exceptions[0] = null;
+                    }
+                }
+            });
+            break;
+        default:
+        case PROGRESS_DIALOG:
+            try {
+                new ProgressMonitorDialog(getShell()).run(true, true, runnable);
+            } catch (InvocationTargetException e) {
+                exceptions[0] = e;
+            } catch (InterruptedException e) {
+                exceptions[0] = null;
+            }
+            break;
+        }
+        if (exceptions[0] != null) {
+            handle(exceptions[0], null, problemMessage);
+        }
+    }
+
+    /*
+     * Method declared on IActionDelegate.
+     */
+    public void selectionChanged(IAction action, ISelection selection) {
+        if (selection instanceof IStructuredSelection) {
+            this.selection = (IStructuredSelection) selection;
+            if (action != null) {
+                setActionEnablement(action);
+            }
+        }
+    }
+
+    /**
+     * Method invoked from <code>selectionChanged(IAction, ISelection)</code> to
+     * set the enablement status of the action. The instance variable
+     * <code>selection</code> will contain the latest selection so the methods
+     * <code>getSelectedResources()</code> and
+     * <code>getSelectedProjects()</code> will provide the proper objects.
+     * 
+     * This method can be overridden by subclasses but should not be invoked by
+     * them.
+     */
+    protected void setActionEnablement(IAction action) {
+        try {
+            action.setEnabled(isEnabled());
+        } catch (TeamException e) {
+            if (e.getStatus().getCode() == IResourceStatus.OUT_OF_SYNC_LOCAL) {
+                // Enable the action to allow the user to discover the problem
+                action.setEnabled(true);
+            } else {
+                action.setEnabled(false);
+                // We should not open a dialog when determining menu enablements
+                // so log it instead
+                TeamPlugin.log(e);
+            }
+        }
+    }
+
+    /*
+     * Method declared on IObjectActionDelegate.
+     */
+    public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+        if (targetPart != null) {
+            this.shell = targetPart.getSite().getShell();
+            this.targetPart = targetPart;
+        }
+    }
+
+    /**
+     * 
+     * Shows the given errors to the user.
+     * 
+     * @param exception
+     * @param title
+     * @param message void
+     */
+    protected void handle(Exception exception, String title, String message) {
+        Utils.handleError(getShell(), exception, title, message);
+    }
+
+    /**
+     * Concrete action enablement code. Subclasses must implement.
+     * 
+     * @return whether the action is enabled
+     * @throws TeamException if an error occurs during enablement detection
+     */
+    abstract protected boolean isEnabled() throws TeamException;
+
+    /**
+     * Convenience method that maps the given resources to their providers. The
+     * returned Hashtable has keys which are ITeamProviders, and values which
+     * are Lists of IResources that are shared with that provider.
+     * 
+     * @return a hashtable mapping providers to their resources
+     */
+    protected Hashtable getProviderMapping(IResource[] resources) {
+        Hashtable<RepositoryProvider, List<IResource>> result =
+            new Hashtable<RepositoryProvider, List<IResource>>();
+        for (IResource resource : resources) {
+            RepositoryProvider provider = RepositoryProvider.getProvider(resource.getProject());
+            List<IResource> list = result.get(provider);
+            if (list == null) {
+                list = new ArrayList<IResource>();
+                result.put(provider, list);
+            }
+            list.add(resource);
+        }
+        return result;
+    }
+
+    /**
+     * @return IWorkbenchPart
+     */
+    protected IWorkbenchPart getTargetPart() {
+        if (targetPart == null) {
+            IWorkbenchPage page = TeamUIPlugin.getActivePage();
+            if (page != null) {
+                targetPart = page.getActivePart();
+            }
+        }
+        return targetPart;
+
+    }
+
+    /**
+     * Return the path that was active when the menu item was selected.
+     * 
+     * @return IWorkbenchPage
+     */
+    protected IWorkbenchPage getTargetPage() {
+        if (getTargetPart() == null) {
+            return TeamUIPlugin.getActivePage();
+        }
+        return getTargetPart().getSite().getPage();
+    }
+
+    /**
+     * Show the view with the given ID in the perspective from which the action
+     * was executed. Returns null if the view is not registered.
+     * 
+     * @param viewId
+     * @return IViewPart
+     */
+    protected IViewPart showView(String viewId) {
+        try {
+            return getTargetPage().showView(viewId);
+        } catch (PartInitException pe) {
+            return null;
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
+     */
+    public void init(IViewPart view) {
+        if (view != null) {
+            this.shell = view.getSite().getShell();
+            this.targetPart = view;
+        }
+    }
+
+    public void init(IWorkbenchWindow window) {
+        this.window = window;
+        this.shell = window.getShell();
+        window.getSelectionService().addPostSelectionListener(selectionListener);
+    }
+
+    public IWorkbenchWindow getWindow() {
+        return window;
+    }
+
+    public void dispose() {
+        super.dispose();
+        if (window != null) {
+            window.getSelectionService().removePostSelectionListener(selectionListener);
+        }
+        selection = null;
+    }
 }

=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/properties/BazaarPropertyPage.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/properties/BazaarPropertyPage.java	2008-04-11 22:11:00 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/properties/BazaarPropertyPage.java	2009-04-29 06:02:45 +0000
@@ -26,381 +26,392 @@
  */
 public class BazaarPropertyPage extends PropertyPage implements IWorkbenchPropertyPage {
 
-	private IBazaarInfo info = null;
-	private Text layout;
-	private Text controlDirFormat;
-	// Formats
-	private Composite formats;
-	private Text branchFormat;
-	private Text controlFormat;
-	private Text repositoryFormat;
-	private Text workingTreeFormat;
-	// locations
-	private Composite locations;
-	private Text lightCheckoutRoot;
-	private Text repositoryCheckoutRoot;
-	private Text checkoutRoot;
-	private Text checkoutOfBranch;
-	private Text sharedRepository;
-	private Text repository;
-	private Text repositoryBranch;
-	private Text branchRoot;
-	private Text boundToBranch;
-	// related branches
-	private Composite relatedBranches;
-	private Text publicBranch;
-	private Text pushBranch;
-	private Text parentBranch;
-	private Text submitBranch;
-	// stats
-	private Composite workingTreeStats;
-	private Text added;
-	private Text ignored;
-	private Text modified;
-	private Text removed;
-	private Text renamed;
-	private Text unchanged;
-	private Text unknown;
-	private Text versionedSubdirectories;
-
-	private Composite branchHistory;
-	private Text branchRevisions;
-	private Text committers;
-	private Text daysOld;
-	private Text firstRevisionDate;
-	private Text latestRevisionDate;
-
-	private Composite repositoryStats;
-	private Text repositoryRevisions;
-	private Text repositorySize;
-
-	public BazaarPropertyPage() {
-		super();
-	}
-
-	private void addFirstSection(Composite parent) {
-		Composite composite = createDefaultComposite(parent);
-
-		Label label = new Label(composite, SWT.NONE);
-		label.setText("Layout: "); //$NON-NLS-1$
-		layout = new Text(composite, SWT.SINGLE | SWT.READ_ONLY);
-
-		label = new Label(composite, SWT.NONE);
-		label.setText("Control directory format: "); //$NON-NLS-1$
-		controlDirFormat = new Text(composite, SWT.SINGLE | SWT.READ_ONLY);
-
-		// populate fields
-		if (info == null)
-			return;
-		layout.setText(info.getLayout());
-		final StringBuilder sb = new StringBuilder();
-		String[] formats = info.getFormats();
-		for (int idx = 0; idx < formats.length; idx++) {
-			sb.append(formats[idx]);
-			if (idx + 1 < formats.length)
-				sb.append(" or ");
-		}
-		controlDirFormat.setText(sb.toString());
-		
-		// related branches
-		if(info.getRelatedBranches() == null)
-			return;
-		label = new Label(composite, SWT.NONE);
-		label.setText("Related branches: "); //$NON-NLS-1$
-		relatedBranches = createDefaultComposite(composite);
-		if (info.getRelatedBranches().getParentBranch() != null) {
-			label = new Label(relatedBranches, SWT.NONE);
-			label.setText("Parent Branch: "); //$NON-NLS-1$
-			parentBranch = new Text(relatedBranches, SWT.SINGLE | SWT.READ_ONLY);
-			parentBranch.setText(info.getRelatedBranches().getParentBranch());
-		}
-		if (info.getRelatedBranches().getPushBranch() != null) {
-			label = new Label(relatedBranches, SWT.NONE);
-			label.setText("Push branch: "); //$NON-NLS-1$
-			pushBranch = new Text(relatedBranches, SWT.SINGLE | SWT.READ_ONLY);
-			pushBranch.setText(info.getRelatedBranches().getPushBranch());
-		}
-		if (info.getRelatedBranches().getPublicBranch() != null) {	
-			label = new Label(relatedBranches, SWT.NONE);
-			label.setText("Public branch: "); //$NON-NLS-1$
-			publicBranch = new Text(relatedBranches, SWT.SINGLE | SWT.READ_ONLY);
-			publicBranch.setText(info.getRelatedBranches().getSubmitBranch());
-		}
-		if (info.getRelatedBranches().getSubmitBranch() != null) {
-			label = new Label(relatedBranches, SWT.NONE);
-			label.setText("Submit branch: "); //$NON-NLS-1$
-			submitBranch = new Text(relatedBranches, SWT.SINGLE | SWT.READ_ONLY);
-			submitBranch.setText(info.getRelatedBranches().getSubmitBranch());
-		}
-		
-	}
-
-	private void addSeparator(Composite parent) {
-		Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
-		GridData gridData = new GridData();
-		gridData.horizontalAlignment = GridData.FILL;
-		gridData.grabExcessHorizontalSpace = true;
-		separator.setLayoutData(gridData);
-	}
-
-	private void addSecondSection(Composite parent) {
-		Composite composite = createDefaultComposite(parent);
-		Label label = new Label(composite, SWT.NONE);
-		label.setText("Formats: "); //$NON-NLS-1$
-		formats = createDefaultComposite(composite);
-		label = new Label(formats, SWT.NONE);
-		label.setText("Branch format: "); //$NON-NLS-1$
-		branchFormat = new Text(formats, SWT.SINGLE | SWT.READ_ONLY);
-		label = new Label(formats, SWT.NONE);
-		label.setText("Control format: "); //$NON-NLS-1$
-		controlFormat = new Text(formats, SWT.SINGLE | SWT.READ_ONLY);
-		label = new Label(formats, SWT.NONE);
-		label.setText("Repository format: "); //$NON-NLS-1$
-		repositoryFormat = new Text(formats, SWT.SINGLE | SWT.READ_ONLY);
-		label = new Label(formats, SWT.NONE);
-		label.setText("Working tree format: "); //$NON-NLS-1$
-		workingTreeFormat = new Text(formats, SWT.SINGLE | SWT.READ_ONLY);
-
-//		populate default fields
-		if (info == null)
-			return;
-		branchFormat.setText(info.getBranchFormat() == null ? "" : info.getBranchFormat());
-		controlFormat.setText(info.getControlFormat() == null ? "" : info.getControlFormat());
-		repositoryFormat.setText(info.getRepositoryFormat() == null ? "" : info.getRepositoryFormat());
-		workingTreeFormat.setText(info.getWorkingTreeFormat() == null ? "" : info.getWorkingTreeFormat());
-		
-		createLocations(composite);
-
-		createWorkingTreeStats(composite);
-		
-		createBranchHistory(composite);
-
-		if(info.getRepositoryStats() == null)
-			return;
-		label = new Label(composite, SWT.NONE);
-		label.setText("Repository"); //$NON-NLS-1$
-		repositoryStats = createDefaultComposite(composite);
-		if(info.getRepositoryStats().getRevisionCount() != null) {
-			repositoryRevisions = new Text(repositoryStats, SWT.WRAP | SWT.READ_ONLY);
-			repositoryRevisions.setText(info.getRepositoryStats().getRevisionCount().toString());
-			label = new Label(repositoryStats, SWT.NONE);
-			label.setText("revisions"); //$NON-NLS-1$
-		}
-		if(info.getRepositoryStats().getSize() != null) {
-			repositorySize = new Text(repositoryStats, SWT.WRAP | SWT.READ_ONLY);
-			repositorySize.setText(info.getRepositoryStats().getSize().toString());
-			label = new Label(repositoryStats, SWT.NONE);
-			label.setText("KiB"); //$NON-NLS-1$
-		}
-		
-	}
-	
-	private void createWorkingTreeStats(Composite parent) {
-		if(info.getWorkingTreeStats() == null)
-			return;
-		Label label = new Label(parent, SWT.NONE);
-		label.setText("In the working tree"); //$NON-NLS-1$
-		workingTreeStats = createDefaultComposite(parent);
-		if (info.getWorkingTreeStats().getUnchanged() != null) {
-			unchanged = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
-			unchanged.setText(info.getWorkingTreeStats().getUnchanged().toString());
-			label = new Label(workingTreeStats, SWT.NONE);
-			label.setText("unchanged"); //$NON-NLS-1$
-		}
-		if (info.getWorkingTreeStats().getModified() != null) {
-			modified = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
-			modified.setText(info.getWorkingTreeStats().getModified().toString());
-			label = new Label(workingTreeStats, SWT.NONE);
-			label.setText("modified"); //$NON-NLS-1$
-		}
-		if (info.getWorkingTreeStats().getAdded() != null) {
-			added = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
-			added.setText(info.getWorkingTreeStats().getAdded().toString());
-			label = new Label(workingTreeStats, SWT.NONE);
-			label.setText("added"); //$NON-NLS-1$
-		}
-		if (info.getWorkingTreeStats().getRemoved() != null) {
-			removed = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
-			removed.setText(info.getWorkingTreeStats().getRemoved().toString());
-			label = new Label(workingTreeStats, SWT.NONE);
-			label.setText("removed"); //$NON-NLS-1$
-		}
-		if (info.getWorkingTreeStats().getRenamed() != null) {
-			renamed = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
-			renamed.setText(info.getWorkingTreeStats().getRenamed().toString());
-			label = new Label(workingTreeStats, SWT.NONE);
-			label.setText("renamed"); //$NON-NLS-1$
-		}
-		if (info.getWorkingTreeStats().getUnknown() != null) {
-			unknown = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
-			unknown.setText(info.getWorkingTreeStats().getUnknown().toString());
-			label = new Label(workingTreeStats, SWT.NONE);
-			label.setText("unknown"); //$NON-NLS-1$
-		}
-		if (info.getWorkingTreeStats().getIgnored() != null) {
-			ignored = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
-			ignored.setText(info.getWorkingTreeStats().getIgnored().toString());
-			label = new Label(workingTreeStats, SWT.NONE);
-			label.setText("ignored"); //$NON-NLS-1$
-		}
-		if (info.getWorkingTreeStats().getVersionedSubdirectories() != null) {
-			versionedSubdirectories = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
-			versionedSubdirectories.setText(info.getWorkingTreeStats().getVersionedSubdirectories().toString());
-			label = new Label(workingTreeStats, SWT.NONE);
-			label.setText("versioned subdirectories"); //$NON-NLS-1$
-		}
-		
-	}
-
-	private void createLocations(Composite parent) {
-		if(info.getLocations() == null)
-			return;
-		Label label = new Label(parent, SWT.NONE);
-		label.setText("Locations: "); //$NON-NLS-1$
-		locations = createDefaultComposite(parent);
-		if (info.getLocations().getLightCheckoutRoot() != null) {
-			label = new Label(locations, SWT.NONE);
-			label.setText("Light checkout root: "); //$NON-NLS-1$
-			lightCheckoutRoot = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
-			lightCheckoutRoot.setText(info.getLocations().getLightCheckoutRoot());
-		}
-		if (info.getLocations().getRepositoryCheckoutRoot() != null) {
-			label = new Label(locations, SWT.NONE);
-			label.setText("Repository checkout root: "); //$NON-NLS-1$
-			repositoryCheckoutRoot = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
-			repositoryCheckoutRoot.setText(info.getLocations().getRepositoryCheckoutRoot());
-		}
-		if (info.getLocations().getCheckoutRoot() != null) {
-			label = new Label(locations, SWT.NONE);
-			label.setText("Checkout root: "); //$NON-NLS-1$
-			checkoutRoot = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
-			checkoutRoot.setText(info.getLocations().getCheckoutRoot());
-		}
-		if (info.getLocations().getCheckoutOfBranch() != null) {
-			label = new Label(locations, SWT.NONE);
-			label.setText("Checkout of branch: "); //$NON-NLS-1$
-			checkoutOfBranch = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
-			checkoutOfBranch.setText(info.getLocations().getCheckoutOfBranch());
-		}
-		if (info.getLocations().getSharedRepository() != null) {
-			label = new Label(locations, SWT.NONE);
-			label.setText("Shared repository: "); //$NON-NLS-1$
-			sharedRepository = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
-			sharedRepository.setText(info.getLocations().getSharedRepository());
-		}
-		if (info.getLocations().getRepository() != null) {
-			label = new Label(locations, SWT.NONE);
-			label.setText("Repository: "); //$NON-NLS-1$
-			repository = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
-			repository.setText(info.getLocations().getRepository());
-		}
-		if (info.getLocations().getRepositoryBranch() != null) {
-			label = new Label(locations, SWT.NONE);
-			label.setText("Repository branch: "); //$NON-NLS-1$
-			repositoryBranch = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
-			repositoryBranch.setText(info.getLocations().getRepositoryBranch());
-		}
-		if (info.getLocations().getBranchRoot() != null) {
-			label = new Label(locations, SWT.NONE);
-			label.setText("Branch root: "); //$NON-NLS-1$
-			branchRoot = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
-			branchRoot.setText(info.getLocations().getBranchRoot());
-		}
-		if (info.getLocations().getBoundToBranch() != null) {
-			label = new Label(locations, SWT.NONE);
-			label.setText("Bound to branch: "); //$NON-NLS-1$
-			boundToBranch = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
-			boundToBranch.setText(info.getLocations().getBoundToBranch());
-		}
-	}
-	
-	private void createBranchHistory(Composite parent) {
-		if (info.getBranchHistory() == null)
-			return;
-		Label label = new Label(parent, SWT.NONE);
-		label.setText("Branch history: "); //$NON-NLS-1$
-		branchHistory = createDefaultComposite(parent);
-		if (info.getBranchHistory().getRevisions() != null) {
-			label = new Label(branchHistory, SWT.NONE);
-			label.setText("Revisions: "); //$NON-NLS-1$
-			branchRevisions = new Text(branchHistory, SWT.WRAP | SWT.READ_ONLY);
-			branchRevisions.setText(info.getBranchHistory().getRevisions().toString());
-		}
-		if (info.getBranchHistory().getCommitters() != null) {
-			label = new Label(branchHistory, SWT.NONE);
-			label.setText("Committers: "); //$NON-NLS-1$
-			committers = new Text(branchHistory, SWT.WRAP | SWT.READ_ONLY);
-			committers.setText(info.getBranchHistory().getCommitters().toString());
-		}
-		if (info.getBranchHistory().getDaysOld() != null) {
-			label = new Label(branchHistory, SWT.NONE);
-			label.setText("Days old: "); //$NON-NLS-1$
-			daysOld = new Text(branchHistory, SWT.WRAP | SWT.READ_ONLY);
-			daysOld.setText(info.getBranchHistory().getDaysOld().toString());
-		}
-		if (info.getBranchHistory().getFirstRevisionDate() != null) {
-			label = new Label(branchHistory, SWT.NONE);
-			label.setText("First revision date: "); //$NON-NLS-1$
-			firstRevisionDate = new Text(branchHistory, SWT.SINGLE | SWT.READ_ONLY);
-			firstRevisionDate.setText(info.getBranchHistory().getFirstRevisionDate().toString());
-		}
-		if (info.getBranchHistory().getLatestRevisionDate() != null) {
-			label = new Label(branchHistory, SWT.NONE);
-			label.setText("Latest revision date: "); //$NON-NLS-1$
-			latestRevisionDate = new Text(branchHistory, SWT.SINGLE | SWT.READ_ONLY);
-			latestRevisionDate.setText(info.getBranchHistory().getLatestRevisionDate().toString());
-		}
-	}
-
-	/*
-	 * @see PreferencePage#createContents(Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		composite.setLayout(layout);
-		GridData data = new GridData(GridData.FILL);
-
-		composite.setLayoutData(data);
-		loadInfo();
-		addFirstSection(composite);
-		addSeparator(composite);
-		addSecondSection(composite);
-
-		Dialog.applyDialogFont(parent);
-
-		return composite;
-	}
-
-	private Composite createDefaultComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-
-		return composite;
-	}
-
-	private void loadInfo() {
-		IResource resource = (IResource) getElement();
-		try {
-			InfoCommand cmd = new InfoCommand(resource.getProject());
-			cmd.run(new NullProgressMonitor());
-			info = cmd.getInfo();
-		} catch (BazaarException e) {
-			EclipseBazaarUI.log(e);
-		}
-	}
-
-	protected void performDefaults() {
-	}
-
-	public boolean performOk() {
-		return true;
-	}
+    private IBazaarInfo info = null;
+    private Text layout;
+    private Text controlDirFormat;
+    // Formats
+    private Composite formats;
+    private Text branchFormat;
+    private Text controlFormat;
+    private Text repositoryFormat;
+    private Text workingTreeFormat;
+    // locations
+    private Composite locations;
+    private Text lightCheckoutRoot;
+    private Text repositoryCheckoutRoot;
+    private Text checkoutRoot;
+    private Text checkoutOfBranch;
+    private Text sharedRepository;
+    private Text repository;
+    private Text repositoryBranch;
+    private Text branchRoot;
+    private Text boundToBranch;
+    // related branches
+    private Composite relatedBranches;
+    private Text publicBranch;
+    private Text pushBranch;
+    private Text parentBranch;
+    private Text submitBranch;
+    // stats
+    private Composite workingTreeStats;
+    private Text added;
+    private Text ignored;
+    private Text modified;
+    private Text removed;
+    private Text renamed;
+    private Text unchanged;
+    private Text unknown;
+    private Text versionedSubdirectories;
+
+    private Composite branchHistory;
+    private Text branchRevisions;
+    private Text committers;
+    private Text daysOld;
+    private Text firstRevisionDate;
+    private Text latestRevisionDate;
+
+    private Composite repositoryStats;
+    private Text repositoryRevisions;
+    private Text repositorySize;
+
+    public BazaarPropertyPage() {
+        super();
+    }
+
+    private void addFirstSection(Composite parent) {
+        Composite composite = createDefaultComposite(parent);
+
+        Label label = new Label(composite, SWT.NONE);
+        label.setText("Layout: "); //$NON-NLS-1$
+        layout = new Text(composite, SWT.SINGLE | SWT.READ_ONLY);
+
+        label = new Label(composite, SWT.NONE);
+        label.setText("Control directory format: "); //$NON-NLS-1$
+        controlDirFormat = new Text(composite, SWT.SINGLE | SWT.READ_ONLY);
+
+        // populate fields
+        if (info == null) {
+            return;
+        }
+        layout.setText(info.getLayout());
+        final StringBuilder sb = new StringBuilder();
+        String[] formats = info.getFormats();
+        for (int idx = 0; idx < formats.length; idx++) {
+            sb.append(formats[idx]);
+            if (idx + 1 < formats.length) {
+                sb.append(" or ");
+            }
+        }
+        controlDirFormat.setText(sb.toString());
+
+        // related branches
+        if (info.getRelatedBranches() == null) {
+            return;
+        }
+        label = new Label(composite, SWT.NONE);
+        label.setText("Related branches: "); //$NON-NLS-1$
+        relatedBranches = createDefaultComposite(composite);
+        if (info.getRelatedBranches().getParentBranch() != null) {
+            label = new Label(relatedBranches, SWT.NONE);
+            label.setText("Parent Branch: "); //$NON-NLS-1$
+            parentBranch = new Text(relatedBranches, SWT.SINGLE | SWT.READ_ONLY);
+            parentBranch.setText(info.getRelatedBranches().getParentBranch());
+        }
+        if (info.getRelatedBranches().getPushBranch() != null) {
+            label = new Label(relatedBranches, SWT.NONE);
+            label.setText("Push branch: "); //$NON-NLS-1$
+            pushBranch = new Text(relatedBranches, SWT.SINGLE | SWT.READ_ONLY);
+            pushBranch.setText(info.getRelatedBranches().getPushBranch());
+        }
+        if (info.getRelatedBranches().getPublicBranch() != null) {
+            label = new Label(relatedBranches, SWT.NONE);
+            label.setText("Public branch: "); //$NON-NLS-1$
+            publicBranch = new Text(relatedBranches, SWT.SINGLE | SWT.READ_ONLY);
+            publicBranch.setText(info.getRelatedBranches().getSubmitBranch());
+        }
+        if (info.getRelatedBranches().getSubmitBranch() != null) {
+            label = new Label(relatedBranches, SWT.NONE);
+            label.setText("Submit branch: "); //$NON-NLS-1$
+            submitBranch = new Text(relatedBranches, SWT.SINGLE | SWT.READ_ONLY);
+            submitBranch.setText(info.getRelatedBranches().getSubmitBranch());
+        }
+
+    }
+
+    private void addSeparator(Composite parent) {
+        Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
+        GridData gridData = new GridData();
+        gridData.horizontalAlignment = GridData.FILL;
+        gridData.grabExcessHorizontalSpace = true;
+        separator.setLayoutData(gridData);
+    }
+
+    private void addSecondSection(Composite parent) {
+        Composite composite = createDefaultComposite(parent);
+        Label label = new Label(composite, SWT.NONE);
+        label.setText("Formats: "); //$NON-NLS-1$
+        formats = createDefaultComposite(composite);
+        label = new Label(formats, SWT.NONE);
+        label.setText("Branch format: "); //$NON-NLS-1$
+        branchFormat = new Text(formats, SWT.SINGLE | SWT.READ_ONLY);
+        label = new Label(formats, SWT.NONE);
+        label.setText("Control format: "); //$NON-NLS-1$
+        controlFormat = new Text(formats, SWT.SINGLE | SWT.READ_ONLY);
+        label = new Label(formats, SWT.NONE);
+        label.setText("Repository format: "); //$NON-NLS-1$
+        repositoryFormat = new Text(formats, SWT.SINGLE | SWT.READ_ONLY);
+        label = new Label(formats, SWT.NONE);
+        label.setText("Working tree format: "); //$NON-NLS-1$
+        workingTreeFormat = new Text(formats, SWT.SINGLE | SWT.READ_ONLY);
+
+        //        populate default fields
+        if (info == null) {
+            return;
+        }
+        branchFormat.setText(info.getBranchFormat() == null ? "" : info.getBranchFormat());
+        controlFormat.setText(info.getControlFormat() == null ? "" : info.getControlFormat());
+        repositoryFormat.setText(info.getRepositoryFormat() == null ? "" : info
+            .getRepositoryFormat());
+        workingTreeFormat.setText(info.getWorkingTreeFormat() == null ? "" : info
+            .getWorkingTreeFormat());
+
+        createLocations(composite);
+
+        createWorkingTreeStats(composite);
+
+        createBranchHistory(composite);
+
+        if (info.getRepositoryStats() == null) {
+            return;
+        }
+        label = new Label(composite, SWT.NONE);
+        label.setText("Repository"); //$NON-NLS-1$
+        repositoryStats = createDefaultComposite(composite);
+        if (info.getRepositoryStats().getRevisionCount() != null) {
+            repositoryRevisions = new Text(repositoryStats, SWT.WRAP | SWT.READ_ONLY);
+            repositoryRevisions.setText(info.getRepositoryStats().getRevisionCount().toString());
+            label = new Label(repositoryStats, SWT.NONE);
+            label.setText("revisions"); //$NON-NLS-1$
+        }
+        if (info.getRepositoryStats().getSize() != null) {
+            repositorySize = new Text(repositoryStats, SWT.WRAP | SWT.READ_ONLY);
+            repositorySize.setText(info.getRepositoryStats().getSize().toString());
+            label = new Label(repositoryStats, SWT.NONE);
+            label.setText("KiB"); //$NON-NLS-1$
+        }
+
+    }
+
+    private void createWorkingTreeStats(Composite parent) {
+        if (info.getWorkingTreeStats() == null) {
+            return;
+        }
+        Label label = new Label(parent, SWT.NONE);
+        label.setText("In the working tree"); //$NON-NLS-1$
+        workingTreeStats = createDefaultComposite(parent);
+        if (info.getWorkingTreeStats().getUnchanged() != null) {
+            unchanged = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
+            unchanged.setText(info.getWorkingTreeStats().getUnchanged().toString());
+            label = new Label(workingTreeStats, SWT.NONE);
+            label.setText("unchanged"); //$NON-NLS-1$
+        }
+        if (info.getWorkingTreeStats().getModified() != null) {
+            modified = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
+            modified.setText(info.getWorkingTreeStats().getModified().toString());
+            label = new Label(workingTreeStats, SWT.NONE);
+            label.setText("modified"); //$NON-NLS-1$
+        }
+        if (info.getWorkingTreeStats().getAdded() != null) {
+            added = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
+            added.setText(info.getWorkingTreeStats().getAdded().toString());
+            label = new Label(workingTreeStats, SWT.NONE);
+            label.setText("added"); //$NON-NLS-1$
+        }
+        if (info.getWorkingTreeStats().getRemoved() != null) {
+            removed = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
+            removed.setText(info.getWorkingTreeStats().getRemoved().toString());
+            label = new Label(workingTreeStats, SWT.NONE);
+            label.setText("removed"); //$NON-NLS-1$
+        }
+        if (info.getWorkingTreeStats().getRenamed() != null) {
+            renamed = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
+            renamed.setText(info.getWorkingTreeStats().getRenamed().toString());
+            label = new Label(workingTreeStats, SWT.NONE);
+            label.setText("renamed"); //$NON-NLS-1$
+        }
+        if (info.getWorkingTreeStats().getUnknown() != null) {
+            unknown = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
+            unknown.setText(info.getWorkingTreeStats().getUnknown().toString());
+            label = new Label(workingTreeStats, SWT.NONE);
+            label.setText("unknown"); //$NON-NLS-1$
+        }
+        if (info.getWorkingTreeStats().getIgnored() != null) {
+            ignored = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
+            ignored.setText(info.getWorkingTreeStats().getIgnored().toString());
+            label = new Label(workingTreeStats, SWT.NONE);
+            label.setText("ignored"); //$NON-NLS-1$
+        }
+        if (info.getWorkingTreeStats().getVersionedSubdirectories() != null) {
+            versionedSubdirectories = new Text(workingTreeStats, SWT.WRAP | SWT.READ_ONLY);
+            versionedSubdirectories.setText(info.getWorkingTreeStats().getVersionedSubdirectories()
+                .toString());
+            label = new Label(workingTreeStats, SWT.NONE);
+            label.setText("versioned subdirectories"); //$NON-NLS-1$
+        }
+
+    }
+
+    private void createLocations(Composite parent) {
+        if (info.getLocations() == null) {
+            return;
+        }
+        Label label = new Label(parent, SWT.NONE);
+        label.setText("Locations: "); //$NON-NLS-1$
+        locations = createDefaultComposite(parent);
+        if (info.getLocations().getLightCheckoutRoot() != null) {
+            label = new Label(locations, SWT.NONE);
+            label.setText("Light checkout root: "); //$NON-NLS-1$
+            lightCheckoutRoot = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
+            lightCheckoutRoot.setText(info.getLocations().getLightCheckoutRoot());
+        }
+        if (info.getLocations().getRepositoryCheckoutRoot() != null) {
+            label = new Label(locations, SWT.NONE);
+            label.setText("Repository checkout root: "); //$NON-NLS-1$
+            repositoryCheckoutRoot = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
+            repositoryCheckoutRoot.setText(info.getLocations().getRepositoryCheckoutRoot());
+        }
+        if (info.getLocations().getCheckoutRoot() != null) {
+            label = new Label(locations, SWT.NONE);
+            label.setText("Checkout root: "); //$NON-NLS-1$
+            checkoutRoot = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
+            checkoutRoot.setText(info.getLocations().getCheckoutRoot());
+        }
+        if (info.getLocations().getCheckoutOfBranch() != null) {
+            label = new Label(locations, SWT.NONE);
+            label.setText("Checkout of branch: "); //$NON-NLS-1$
+            checkoutOfBranch = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
+            checkoutOfBranch.setText(info.getLocations().getCheckoutOfBranch());
+        }
+        if (info.getLocations().getSharedRepository() != null) {
+            label = new Label(locations, SWT.NONE);
+            label.setText("Shared repository: "); //$NON-NLS-1$
+            sharedRepository = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
+            sharedRepository.setText(info.getLocations().getSharedRepository());
+        }
+        if (info.getLocations().getRepository() != null) {
+            label = new Label(locations, SWT.NONE);
+            label.setText("Repository: "); //$NON-NLS-1$
+            repository = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
+            repository.setText(info.getLocations().getRepository());
+        }
+        if (info.getLocations().getRepositoryBranch() != null) {
+            label = new Label(locations, SWT.NONE);
+            label.setText("Repository branch: "); //$NON-NLS-1$
+            repositoryBranch = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
+            repositoryBranch.setText(info.getLocations().getRepositoryBranch());
+        }
+        if (info.getLocations().getBranchRoot() != null) {
+            label = new Label(locations, SWT.NONE);
+            label.setText("Branch root: "); //$NON-NLS-1$
+            branchRoot = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
+            branchRoot.setText(info.getLocations().getBranchRoot());
+        }
+        if (info.getLocations().getBoundToBranch() != null) {
+            label = new Label(locations, SWT.NONE);
+            label.setText("Bound to branch: "); //$NON-NLS-1$
+            boundToBranch = new Text(locations, SWT.SINGLE | SWT.READ_ONLY);
+            boundToBranch.setText(info.getLocations().getBoundToBranch());
+        }
+    }
+
+    private void createBranchHistory(Composite parent) {
+        if (info.getBranchHistory() == null) {
+            return;
+        }
+        Label label = new Label(parent, SWT.NONE);
+        label.setText("Branch history: "); //$NON-NLS-1$
+        branchHistory = createDefaultComposite(parent);
+        if (info.getBranchHistory().getRevisions() != null) {
+            label = new Label(branchHistory, SWT.NONE);
+            label.setText("Revisions: "); //$NON-NLS-1$
+            branchRevisions = new Text(branchHistory, SWT.WRAP | SWT.READ_ONLY);
+            branchRevisions.setText(info.getBranchHistory().getRevisions().toString());
+        }
+        if (info.getBranchHistory().getCommitters() != null) {
+            label = new Label(branchHistory, SWT.NONE);
+            label.setText("Committers: "); //$NON-NLS-1$
+            committers = new Text(branchHistory, SWT.WRAP | SWT.READ_ONLY);
+            committers.setText(info.getBranchHistory().getCommitters().toString());
+        }
+        if (info.getBranchHistory().getDaysOld() != null) {
+            label = new Label(branchHistory, SWT.NONE);
+            label.setText("Days old: "); //$NON-NLS-1$
+            daysOld = new Text(branchHistory, SWT.WRAP | SWT.READ_ONLY);
+            daysOld.setText(info.getBranchHistory().getDaysOld().toString());
+        }
+        if (info.getBranchHistory().getFirstRevisionDate() != null) {
+            label = new Label(branchHistory, SWT.NONE);
+            label.setText("First revision date: "); //$NON-NLS-1$
+            firstRevisionDate = new Text(branchHistory, SWT.SINGLE | SWT.READ_ONLY);
+            firstRevisionDate.setText(info.getBranchHistory().getFirstRevisionDate().toString());
+        }
+        if (info.getBranchHistory().getLatestRevisionDate() != null) {
+            label = new Label(branchHistory, SWT.NONE);
+            label.setText("Latest revision date: "); //$NON-NLS-1$
+            latestRevisionDate = new Text(branchHistory, SWT.SINGLE | SWT.READ_ONLY);
+            latestRevisionDate.setText(info.getBranchHistory().getLatestRevisionDate().toString());
+        }
+    }
+
+    /*
+     * @see PreferencePage#createContents(Composite)
+     */
+    protected Control createContents(Composite parent) {
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        composite.setLayout(layout);
+        GridData data = new GridData(GridData.FILL);
+
+        composite.setLayoutData(data);
+        loadInfo();
+        addFirstSection(composite);
+        addSeparator(composite);
+        addSecondSection(composite);
+
+        Dialog.applyDialogFont(parent);
+
+        return composite;
+    }
+
+    private Composite createDefaultComposite(Composite parent) {
+        Composite composite = new Composite(parent, SWT.NULL);
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 2;
+        composite.setLayout(layout);
+
+        GridData data = new GridData();
+        data.verticalAlignment = GridData.FILL;
+        composite.setLayoutData(data);
+
+        return composite;
+    }
+
+    private void loadInfo() {
+        IResource resource = (IResource) getElement();
+        try {
+            InfoCommand cmd = new InfoCommand(resource.getProject());
+            cmd.run(new NullProgressMonitor());
+            info = cmd.getInfo();
+        } catch (BazaarException e) {
+            EclipseBazaarUI.log(e);
+        }
+    }
+
+    protected void performDefaults() {
+    }
+
+    public boolean performOk() {
+        return true;
+    }
 
 }

=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/uitexts.properties'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/uitexts.properties	2009-04-21 00:24:40 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/uitexts.properties	2009-04-28 04:23:06 +0000
@@ -124,7 +124,7 @@
 error_QuickDiffProvider_closingFile=Failed closing the file on a quick diff
 
 #update info dialog
-update_message=The dependencies of this version might have changed. \n\nPlease, check if your system fulfill the new dependencies: \n\n
+update_message=A new version of the bzr Eclipse plugin has been installed, and the dependencies of this version might have changed.\n\nPlease check if your system fulfill the new dependencies: \n\n
 bzr_eclipse_home_link=http://bazaar-vcs.org/BzrEclipse
 
 #other constants