eclipse plugin: Change the default wrapping...

...indentation policy to 'Indent by one'

utils/umc_dev/org.wesnoth.tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Sat Aug 06 22:15:01 EEST 2011
+#Mon Aug 08 23:52:12 EEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -80,28 +80,28 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=20
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=20
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=4
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=20
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=20
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=84
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=4
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=20
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=4
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=20
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=20
 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
@@ -334,7 +334,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=insert
 org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 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

utils/umc_dev/org.wesnoth.ui/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Sat Aug 06 22:15:01 EEST 2011
+#Mon Aug 08 23:52:12 EEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -80,28 +80,28 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=20
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=20
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=4
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=20
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=20
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=84
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=4
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=20
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=4
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=20
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=20
 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
@@ -334,7 +334,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=insert
 org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 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

utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java

@@ -227,7 +227,8 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
                 events.addAll( projectCache_.getEvents( ) );
 
                 for( String event: events ) {
-                    acceptor.accept( createCompletionProposal( event, context ) );
+                    acceptor
+                        .accept( createCompletionProposal( event, context ) );
                 }
             }
             else {
@@ -373,7 +374,8 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
 
         // parsed custom tags
         for( WMLTag tag: projectCache_.getWMLTags( ).values( ) ) {
-            acceptor.accept( createTagProposal( tag, "", ruleProposal, context ) ); //$NON-NLS-1$
+            acceptor
+                .accept( createTagProposal( tag, "", ruleProposal, context ) ); //$NON-NLS-1$
         }
     }
 

utils/umc_dev/org.wesnoth/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Sat Aug 06 22:15:01 EEST 2011
+#Mon Aug 08 23:52:12 EEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -80,28 +80,28 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=20
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=20
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=4
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=20
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=20
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=84
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=4
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=20
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=4
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=20
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=20
 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
@@ -334,7 +334,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=insert
 org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 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

utils/umc_dev/org.wesnoth/src/org/wesnoth/Constants.java

@@ -26,7 +26,8 @@ public class Constants
                                                              + "/";                                        //$NON-NLS-1$
     public static final String  PLUGIN_ID                = "org.wesnoth";                                  //$NON-NLS-1$
 
-    public static final String  MACHINE_OS               = System.getProperty(
+    public static final String  MACHINE_OS               = System
+                                                             .getProperty(
                                                                  "os.name" ).toLowerCase( Locale.ENGLISH ); //$NON-NLS-1$
     /**
      * The boolean value whether this machine is running windows or not

utils/umc_dev/org.wesnoth/src/org/wesnoth/Logger.java

@@ -60,12 +60,10 @@ public class Logger
                 throw new IOException( "Could not create the temporary folder." ); //$NON-NLS-1$
             }
 
-            String logFilePath = String.format(
+            String logFilePath = String.format( "%s/logs/log%s.txt", //$NON-NLS-1$
-                    "%s/logs/log%s.txt", //$NON-NLS-1$
                 WorkspaceUtils.getTemporaryFolder( ),
                 WorkspaceUtils.getCurrentDateTime( ) );
-            String toolsLogFilePath = String.format(
+            String toolsLogFilePath = String.format( "%s/logs/tools_log%s.txt", //$NON-NLS-1$
-                    "%s/logs/tools_log%s.txt", //$NON-NLS-1$
                 WorkspaceUtils.getTemporaryFolder( ),
                 WorkspaceUtils.getCurrentDateTime( ) );
 
@@ -220,7 +218,8 @@ public class Logger
     {
         if( writer != null ) {
             try {
-                writer.write( String
+                writer
+                    .write( String
                         .format(
                             "%s | %d | %s\n", //$NON-NLS-1$
                             new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format( new Date( ) ), //$NON-NLS-1$

utils/umc_dev/org.wesnoth/src/org/wesnoth/action/RegenerateBuildFiles.java

@@ -33,9 +33,11 @@ public class RegenerateBuildFiles extends ObjectActionDelegate
             Object element = it.next( );
             if( element instanceof IProject ) {
                 ArrayList< ReplaceableParameter > param = new ArrayList< ReplaceableParameter >( );
-                param.add( new ReplaceableParameter(
+                param
+                    .add( new ReplaceableParameter(
                         "$$project_name", ( ( ( IProject ) element ).getName( ) ) ) ); //$NON-NLS-1$
-                param.add( new ReplaceableParameter(
+                param
+                    .add( new ReplaceableParameter(
                         "$$project_dir_name", ( ( IProject ) element ).getName( ) ) ); //$NON-NLS-1$
                 ResourceUtils.createFile( ( IProject ) element,
                     "build.xml", //$NON-NLS-1$

utils/umc_dev/org.wesnoth/src/org/wesnoth/preferences/Preferences.java

@@ -275,7 +275,8 @@ public class Preferences extends AbstractPreferenceInitializer
         public String getWMLToolsDir( )
         {
             return getString( installPrefix_ + Constants.P_WESNOTH_WMLTOOLS_DIR )
-                    .replace( '\\', '/' ) + IPath.SEPARATOR;
+                .replace( '\\', '/' )
+                + IPath.SEPARATOR;
         }
 
         /**

utils/umc_dev/org.wesnoth/src/org/wesnoth/preferences/WesnothInstallsPage.java

@@ -327,7 +327,8 @@ public class WesnothInstallsPage extends AbstractPreferencePage
             prefs.setToDefault( installPrefix + Constants.P_WESNOTH_USER_DIR );
             prefs.setToDefault( installPrefix
                 + Constants.P_WESNOTH_WMLTOOLS_DIR );
-            prefs.setToDefault( installPrefix + Constants.P_WESNOTH_WORKING_DIR );
+            prefs
+                .setToDefault( installPrefix + Constants.P_WESNOTH_WORKING_DIR );
 
             // unset the default install if this was that
             // and select another one (the first) - if any - as default
@@ -573,7 +574,8 @@ public class WesnothInstallsPage extends AbstractPreferencePage
                 // if we haven't completed anything,
                 // we can skip the saving without alerting the user.
                 if( ! isFieldsEmpty ) {
-                    GUIUtils.showErrorMessageBox( Messages.WesnothInstallsPage_19 );
+                    GUIUtils
+                        .showErrorMessageBox( Messages.WesnothInstallsPage_19 );
                 }
 
                 // we consider successfully save if the fields are all

utils/umc_dev/org.wesnoth/src/org/wesnoth/preprocessor/PreprocessorUtils.java

@@ -295,7 +295,8 @@ public class PreprocessorUtils
             for( Long timestamp: filesTimeStamps_.values( ) ) {
                 timestamps.add( timestamp.toString( ) );
             }
-            settings.put(
+            settings
+                .put(
                     "timestamps", timestamps.toArray( new String[timestamps.size( )] ) ); //$NON-NLS-1$
             settings.save( PREPROCESSED_FILE_PATH );
         } catch( Exception e ) {

utils/umc_dev/org.wesnoth/src/org/wesnoth/product/WorkbenchActionBuilder.java

@@ -499,7 +499,8 @@ public class WorkbenchActionBuilder extends ActionBarAdvisor
             newMenu.add( new Separator( newId ) );
             this.newWizardMenu = new NewWizardMenu( getWindow( ) );
             newMenu.add( this.newWizardMenu );
-            newMenu.add( new Separator( IWorkbenchActionConstants.MB_ADDITIONS ) );
+            newMenu
+                .add( new Separator( IWorkbenchActionConstants.MB_ADDITIONS ) );
             menu.add( newMenu );
         }
 

utils/umc_dev/org.wesnoth/src/org/wesnoth/schema/SchemaParser.java

@@ -261,7 +261,8 @@ public class SchemaParser
                     String[] value = tokens[1].substring( 1,
                         tokens[1].length( ) - 1 ).split( " " ); //$NON-NLS-1$
                     if( value.length != 2 ) {
-                        Logger.getInstance( )
+                        Logger
+                            .getInstance( )
                             .logError(
                                 "Error. invalid attribute value on line:" + index ); //$NON-NLS-1$
                         continue;
@@ -285,7 +286,8 @@ public class SchemaParser
                         }
                         else {
                             if( primitives_.get( value[1] ) == null ) {
-                                Logger.getInstance( )
+                                Logger
+                                    .getInstance( )
                                     .logError(
                                         "Undefined primitive type in schema.cfg for: " + value[1] ); //$NON-NLS-1$
                             }

utils/umc_dev/org.wesnoth/src/org/wesnoth/templates/TemplateProvider.java

@@ -245,9 +245,11 @@ public class TemplateProvider
 
                 // oops. error
                 if( tmpLine.length != 2 ) {
-                    Logger.getInstance( )
+                    Logger
+                        .getInstance( )
                         .logError(
-                                    String.format(
+                            String
+                                .format(
                                     "error parsing 'structure template' (%s) on line %s", //$NON-NLS-1$
                                     structureTemplate, line ) );
                     continue;

utils/umc_dev/org.wesnoth/src/org/wesnoth/utils/WizardUtils.java

@@ -54,8 +54,7 @@ public class WizardUtils
             .getDefault( )
             .getWorkbench( )
             .getHelpSystem( )
-                .setHelp( wizardDialog.getShell( ),
+            .setHelp( wizardDialog.getShell( ), "org.wesnoth.help.wizardHelp" ); //$NON-NLS-1$
-                        "org.wesnoth.help.wizardHelp" ); //$NON-NLS-1$
 
         return wizardDialog.open( );
     }

utils/umc_dev/org.wesnoth/src/org/wesnoth/utils/WorkspaceUtils.java

@@ -431,7 +431,8 @@ public class WorkspaceUtils
                     }
 
                     if( guided ) {
-                        GUIUtils.showInfoMessageBox( Messages.WorkspaceUtils_25 );
+                        GUIUtils
+                            .showInfoMessageBox( Messages.WorkspaceUtils_25 );
                     }
                     else {
                         Logger.getInstance( ).log(

utils/umc_dev/org.wesnoth/src/org/wesnoth/views/AddonsView.java

@@ -270,7 +270,8 @@ public class AddonsView extends ViewPart
     protected void refreshAddons( )
     {
         if( loading_ ) {
-            GUIUtils.showInfoMessageBox( "Please wait for the previous query to finish." );
+            GUIUtils
+                .showInfoMessageBox( "Please wait for the previous query to finish." );
             return;
         }
 

utils/umc_dev/org.wesnoth/src/org/wesnoth/wizards/campaign/CampaignNewWizard.java

@@ -85,11 +85,14 @@ public class CampaignNewWizard extends WizardTemplate
 
         params.add( new ReplaceableParameter(
             "$$campaign_name", page1_.getCampaignName( ) ) ); //$NON-NLS-1$
-        params.add( new ReplaceableParameter( "$$author", page1_.getAuthor( ) ) ); //$NON-NLS-1$
+        params
-        params.add( new ReplaceableParameter( "$$version", page1_.getVersion( ) ) ); //$NON-NLS-1$
+            .add( new ReplaceableParameter( "$$author", page1_.getAuthor( ) ) ); //$NON-NLS-1$
+        params
+            .add( new ReplaceableParameter( "$$version", page1_.getVersion( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter(
             "$$description", page1_.getCampaignDescription( ) ) ); //$NON-NLS-1$
-        params.add( new ReplaceableParameter( "$$icon", page1_.getIconPath( ) ) ); //$NON-NLS-1$
+        params
+            .add( new ReplaceableParameter( "$$icon", page1_.getIconPath( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter( "$$email", page1_.getEmail( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter(
             "$$passphrase", page1_.getPassphrase( ) ) ); //$NON-NLS-1$
@@ -99,7 +102,8 @@ public class CampaignNewWizard extends WizardTemplate
         params.add( new ReplaceableParameter(
             "$$campaign_id", page2_.getCampaignId( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter( "$$abrev", page2_.getAbbrev( ) ) ); //$NON-NLS-1$
-        params.add( new ReplaceableParameter( "$$define", page2_.getDefine( ) ) ); //$NON-NLS-1$
+        params
+            .add( new ReplaceableParameter( "$$define", page2_.getDefine( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter(
             "$$difficulties", page2_.getDifficulties( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter(

utils/umc_dev/org.wesnoth/src/org/wesnoth/wizards/emptyproject/EmptyProjectNewWizard.java

@@ -77,11 +77,14 @@ public class EmptyProjectNewWizard extends WizardTemplate
 
         params.add( new ReplaceableParameter(
             "$$campaign_name", page1_.getCampaignName( ) ) ); //$NON-NLS-1$
-        params.add( new ReplaceableParameter( "$$author", page1_.getAuthor( ) ) ); //$NON-NLS-1$
+        params
-        params.add( new ReplaceableParameter( "$$version", page1_.getVersion( ) ) ); //$NON-NLS-1$
+            .add( new ReplaceableParameter( "$$author", page1_.getAuthor( ) ) ); //$NON-NLS-1$
+        params
+            .add( new ReplaceableParameter( "$$version", page1_.getVersion( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter(
             "$$description", page1_.getPBLDescription( ) ) ); //$NON-NLS-1$
-        params.add( new ReplaceableParameter( "$$icon", page1_.getIconPath( ) ) ); //$NON-NLS-1$
+        params
+            .add( new ReplaceableParameter( "$$icon", page1_.getIconPath( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter( "$$email", page1_.getEmail( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter(
             "$$passphrase", page1_.getPassphrase( ) ) ); //$NON-NLS-1$

utils/umc_dev/org.wesnoth/src/org/wesnoth/wizards/era/EraNewWizard.java

@@ -135,7 +135,8 @@ public class EraNewWizard extends WizardTemplate
         ArrayList< ReplaceableParameter > params = new ArrayList< ReplaceableParameter >( );
 
         params.add( new ReplaceableParameter( "$$era_id", page0_.getEraID( ) ) ); //$NON-NLS-1$
-        params.add( new ReplaceableParameter( "$$era_name", page0_.getEraName( ) ) ); //$NON-NLS-1$
+        params
+            .add( new ReplaceableParameter( "$$era_name", page0_.getEraName( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter(
             "$$require_era", String.valueOf( page0_.getRequiresEra( ) ) ) ); //$NON-NLS-1$
 

utils/umc_dev/org.wesnoth/src/org/wesnoth/wizards/faction/FactionNewWizard.java

@@ -152,16 +152,20 @@ public class FactionNewWizard extends WizardTemplate
             "$$faction_name", page0_.getFactionName( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter(
             "$$faction_type", page0_.getType( ) ) ); //$NON-NLS-1$
-        params.add( new ReplaceableParameter( "$$leader", page0_.getLeader( ) ) ); //$NON-NLS-1$
+        params
+            .add( new ReplaceableParameter( "$$leader", page0_.getLeader( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter(
             "$$random_leader", page0_.getRandomLeader( ) ) ); //$NON-NLS-1$
         params.add( new ReplaceableParameter(
             "$$terrain_liked", page0_.getTerrainLiked( ) ) ); //$NON-NLS-1$
 
-        params.add( new ReplaceableParameter(
+        params
+            .add( new ReplaceableParameter(
                 "$$random_faction", String.valueOf( page1_.getIsRandomFaction( ) ) ) ); //$NON-NLS-1$
-        params.add( new ReplaceableParameter( "$$choices", page1_.getChoices( ) ) ); //$NON-NLS-1$
+        params
-        params.add( new ReplaceableParameter( "$$except", page1_.getExcept( ) ) ); //$NON-NLS-1$
+            .add( new ReplaceableParameter( "$$choices", page1_.getChoices( ) ) ); //$NON-NLS-1$
+        params
+            .add( new ReplaceableParameter( "$$except", page1_.getExcept( ) ) ); //$NON-NLS-1$
 
         String template = TemplateProvider.getInstance( ).getProcessedTemplate(
             "faction", params ); //$NON-NLS-1$

utils/umc_dev/org.wesnoth/src/org/wesnoth/wizards/generator/WizardGeneratorPageTag.java

@@ -186,9 +186,12 @@ public class WizardGeneratorPageTag extends WizardPageTemplate
     {
         StringBuilder result = new StringBuilder( );
         for( Entry< String, java.util.List< String >> tag: content_.entrySet( ) ) {
-            result.append( StringUtils.multiples( "\t", indent_ ) + "[" + tag.getKey( ) + "]\n" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            result
-            result.append( ListUtils.concatenateList( tag.getValue( ), "\n\t" ) ); //$NON-NLS-1$
+                .append( StringUtils.multiples( "\t", indent_ ) + "[" + tag.getKey( ) + "]\n" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            result.append( StringUtils.multiples( "\t", indent_ ) + "[/" + tag.getKey( ) + "]\n" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            result
+                .append( ListUtils.concatenateList( tag.getValue( ), "\n\t" ) ); //$NON-NLS-1$
+            result
+                .append( StringUtils.multiples( "\t", indent_ ) + "[/" + tag.getKey( ) + "]\n" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result.toString( );
     }

utils/umc_dev/org.wesnoth/src/org/wesnoth/wizards/scenario/ScenarioNewWizard.java

@@ -228,7 +228,8 @@ public class ScenarioNewWizard extends WizardTemplate
                 throw new Exception( "incorrect arguments" ); //$NON-NLS-1$
             }
         }
-        params.add( new ReplaceableParameter( "$$starting_gold", startingGold ) ); //$NON-NLS-1$
+        params
+            .add( new ReplaceableParameter( "$$starting_gold", startingGold ) ); //$NON-NLS-1$
 
         // multiplayer only variables
         params.add( new ReplaceableParameter(