diff --git a/spring-webflow-samples/birthdate/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/birthdate/.settings/org.eclipse.jdt.core.prefs index 63c85b13..d52c9b4f 100644 --- a/spring-webflow-samples/birthdate/.settings/org.eclipse.jdt.core.prefs +++ b/spring-webflow-samples/birthdate/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Jul 31 15:11:23 EDT 2007 +#Mon Aug 13 12:11:13 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -76,7 +76,7 @@ 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.indentation.size=8 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not insert @@ -256,7 +256,7 @@ 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=mixed -org.eclipse.jdt.core.formatter.tabulation.size=8 +org.eclipse.jdt.core.formatter.tabulation.char=tab +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 diff --git a/spring-webflow-samples/birthdate/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/birthdate/.settings/org.eclipse.jdt.ui.prefs index c0063032..78a54260 100644 --- a/spring-webflow-samples/birthdate/.settings/org.eclipse.jdt.ui.prefs +++ b/spring-webflow-samples/birthdate/.settings/org.eclipse.jdt.ui.prefs @@ -1,9 +1,8 @@ -#Tue Jul 31 15:07:56 EDT 2007 +#Mon Aug 13 12:11:13 EDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Spring Java Conventions formatter_settings_version=11 -org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true diff --git a/spring-webflow-samples/birthdate/src/main/java/org/springframework/webflow/samples/birthdate/BirthDateFormAction.java b/spring-webflow-samples/birthdate/src/main/java/org/springframework/webflow/samples/birthdate/BirthDateFormAction.java index 45c6d09c..137dd22c 100644 --- a/spring-webflow-samples/birthdate/src/main/java/org/springframework/webflow/samples/birthdate/BirthDateFormAction.java +++ b/spring-webflow-samples/birthdate/src/main/java/org/springframework/webflow/samples/birthdate/BirthDateFormAction.java @@ -54,7 +54,7 @@ public class BirthDateFormAction extends FormAction { */ public Event calculateAge(RequestContext context) throws Exception { // pull the date from the model - BirthDate birthDate = (BirthDate)getFormObject(context); + BirthDate birthDate = (BirthDate) getFormObject(context); // calculate the age (quick & dirty) // in a real application you would delegate to the business layer for diff --git a/spring-webflow-samples/birthdate/src/main/java/org/springframework/webflow/samples/birthdate/BirthDateValidator.java b/spring-webflow-samples/birthdate/src/main/java/org/springframework/webflow/samples/birthdate/BirthDateValidator.java index ab6e7c66..49f50170 100644 --- a/spring-webflow-samples/birthdate/src/main/java/org/springframework/webflow/samples/birthdate/BirthDateValidator.java +++ b/spring-webflow-samples/birthdate/src/main/java/org/springframework/webflow/samples/birthdate/BirthDateValidator.java @@ -28,7 +28,7 @@ public class BirthDateValidator implements Validator { } public void validate(Object obj, Errors errors) { - BirthDate birthDate = (BirthDate)obj; + BirthDate birthDate = (BirthDate) obj; validateBirthdateForm(birthDate, errors); validateCardForm(birthDate, errors); } @@ -44,8 +44,7 @@ public class BirthDateValidator implements Validator { cal.setTime(birthDate.getDate()); if (cal.get(Calendar.MONTH) == 11) { errors.reject("tooGoodForCards", "You're born in December--you're too good for a silly card!"); - } - else { + } else { ValidationUtils.rejectIfEmptyOrWhitespace(errors, "emailAddress", "noEmail", "Please specify your email address."); } diff --git a/spring-webflow-samples/fileupload/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/fileupload/.settings/org.eclipse.jdt.core.prefs index 63c85b13..84703edd 100644 --- a/spring-webflow-samples/fileupload/.settings/org.eclipse.jdt.core.prefs +++ b/spring-webflow-samples/fileupload/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Jul 31 15:11:23 EDT 2007 +#Mon Aug 13 12:11:18 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -76,7 +76,7 @@ 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.indentation.size=8 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not insert @@ -256,7 +256,7 @@ 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=mixed -org.eclipse.jdt.core.formatter.tabulation.size=8 +org.eclipse.jdt.core.formatter.tabulation.char=tab +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 diff --git a/spring-webflow-samples/fileupload/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/fileupload/.settings/org.eclipse.jdt.ui.prefs index 012bdcc5..1aa5bd5d 100644 --- a/spring-webflow-samples/fileupload/.settings/org.eclipse.jdt.ui.prefs +++ b/spring-webflow-samples/fileupload/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,4 @@ -#Tue Jul 31 15:08:06 EDT 2007 +#Mon Aug 13 12:11:18 EDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Spring Java Conventions diff --git a/spring-webflow-samples/fileupload/src/main/java/org/springframework/webflow/samples/fileupload/FileUploadAction.java b/spring-webflow-samples/fileupload/src/main/java/org/springframework/webflow/samples/fileupload/FileUploadAction.java index 7b15dae9..20ada647 100644 --- a/spring-webflow-samples/fileupload/src/main/java/org/springframework/webflow/samples/fileupload/FileUploadAction.java +++ b/spring-webflow-samples/fileupload/src/main/java/org/springframework/webflow/samples/fileupload/FileUploadAction.java @@ -28,8 +28,7 @@ public class FileUploadAction extends AbstractAction { // data was uploaded context.getFlashScope().put("file", new String(file.getBytes())); return success(); - } - else { + } else { return error(); } } diff --git a/spring-webflow-samples/flowlauncher/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/flowlauncher/.settings/org.eclipse.jdt.core.prefs index 63c85b13..fc083440 100644 --- a/spring-webflow-samples/flowlauncher/.settings/org.eclipse.jdt.core.prefs +++ b/spring-webflow-samples/flowlauncher/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Jul 31 15:11:23 EDT 2007 +#Mon Aug 13 12:11:22 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -76,7 +76,7 @@ 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.indentation.size=8 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not insert @@ -256,7 +256,7 @@ 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=mixed -org.eclipse.jdt.core.formatter.tabulation.size=8 +org.eclipse.jdt.core.formatter.tabulation.char=tab +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 diff --git a/spring-webflow-samples/flowlauncher/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/flowlauncher/.settings/org.eclipse.jdt.ui.prefs index f323a8f8..f937d8ff 100644 --- a/spring-webflow-samples/flowlauncher/.settings/org.eclipse.jdt.ui.prefs +++ b/spring-webflow-samples/flowlauncher/.settings/org.eclipse.jdt.ui.prefs @@ -1,9 +1,8 @@ -#Tue Jul 31 15:08:18 EDT 2007 +#Mon Aug 13 12:11:22 EDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Spring Java Conventions formatter_settings_version=11 -org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true diff --git a/spring-webflow-samples/itemlist/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/itemlist/.settings/org.eclipse.jdt.core.prefs index 63c85b13..d782c67a 100644 --- a/spring-webflow-samples/itemlist/.settings/org.eclipse.jdt.core.prefs +++ b/spring-webflow-samples/itemlist/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Jul 31 15:11:23 EDT 2007 +#Mon Aug 13 12:11:25 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -76,7 +76,7 @@ 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.indentation.size=8 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not insert @@ -256,7 +256,7 @@ 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=mixed -org.eclipse.jdt.core.formatter.tabulation.size=8 +org.eclipse.jdt.core.formatter.tabulation.char=tab +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 diff --git a/spring-webflow-samples/itemlist/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/itemlist/.settings/org.eclipse.jdt.ui.prefs index df9ae89e..de420da1 100644 --- a/spring-webflow-samples/itemlist/.settings/org.eclipse.jdt.ui.prefs +++ b/spring-webflow-samples/itemlist/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,4 @@ -#Tue Jul 31 15:08:30 EDT 2007 +#Mon Aug 13 12:11:25 EDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Spring Java Conventions diff --git a/spring-webflow-samples/itemlist/src/main/java/org/springframework/webflow/samples/itemlist/AddItemAction.java b/spring-webflow-samples/itemlist/src/main/java/org/springframework/webflow/samples/itemlist/AddItemAction.java index 65f7f04c..efbae1a4 100644 --- a/spring-webflow-samples/itemlist/src/main/java/org/springframework/webflow/samples/itemlist/AddItemAction.java +++ b/spring-webflow-samples/itemlist/src/main/java/org/springframework/webflow/samples/itemlist/AddItemAction.java @@ -33,8 +33,7 @@ public class AddItemAction extends AbstractAction { try { // add a bit of artificial think time Thread.sleep(2000); - } - catch (InterruptedException e) { + } catch (InterruptedException e) { } return success(); diff --git a/spring-webflow-samples/numberguess/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/numberguess/.settings/org.eclipse.jdt.core.prefs index 63c85b13..3863920c 100644 --- a/spring-webflow-samples/numberguess/.settings/org.eclipse.jdt.core.prefs +++ b/spring-webflow-samples/numberguess/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Jul 31 15:11:23 EDT 2007 +#Mon Aug 13 12:11:28 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -76,7 +76,7 @@ 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.indentation.size=8 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not insert @@ -256,7 +256,7 @@ 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=mixed -org.eclipse.jdt.core.formatter.tabulation.size=8 +org.eclipse.jdt.core.formatter.tabulation.char=tab +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 diff --git a/spring-webflow-samples/numberguess/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/numberguess/.settings/org.eclipse.jdt.ui.prefs index 2401a442..5a8f723f 100644 --- a/spring-webflow-samples/numberguess/.settings/org.eclipse.jdt.ui.prefs +++ b/spring-webflow-samples/numberguess/.settings/org.eclipse.jdt.ui.prefs @@ -1,9 +1,8 @@ -#Tue Jul 31 15:08:39 EDT 2007 +#Mon Aug 13 12:11:28 EDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Spring Java Conventions formatter_settings_version=11 -org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true diff --git a/spring-webflow-samples/numberguess/src/main/java/org/springframework/webflow/samples/numberguess/HigherLowerGame.java b/spring-webflow-samples/numberguess/src/main/java/org/springframework/webflow/samples/numberguess/HigherLowerGame.java index eccea80a..12df15e6 100644 --- a/spring-webflow-samples/numberguess/src/main/java/org/springframework/webflow/samples/numberguess/HigherLowerGame.java +++ b/spring-webflow-samples/numberguess/src/main/java/org/springframework/webflow/samples/numberguess/HigherLowerGame.java @@ -20,8 +20,8 @@ import java.util.Calendar; import java.util.Random; /** - * Action that encapsulates logic for the number guess sample flow. Note that - * this is a stateful action: it holds modifiable state in instance members! + * Action that encapsulates logic for the number guess sample flow. Note that this is a stateful action: it holds + * modifiable state in instance members! * * @author Erwin Vervaet * @author Keith Donald @@ -63,16 +63,13 @@ public class HigherLowerGame implements Serializable { public GuessResult makeGuess(int guess) { if (guess < 0 || guess > 100) { setResult(GuessResult.INVALID); - } - else { + } else { guesses++; if (answer < guess) { setResult(GuessResult.TOO_HIGH); - } - else if (answer > guess) { + } else if (answer > guess) { setResult(GuessResult.TOO_LOW); - } - else { + } else { setResult(GuessResult.CORRECT); } } diff --git a/spring-webflow-samples/numberguess/src/main/java/org/springframework/webflow/samples/numberguess/MastermindGame.java b/spring-webflow-samples/numberguess/src/main/java/org/springframework/webflow/samples/numberguess/MastermindGame.java index 2d05209e..4c798647 100644 --- a/spring-webflow-samples/numberguess/src/main/java/org/springframework/webflow/samples/numberguess/MastermindGame.java +++ b/spring-webflow-samples/numberguess/src/main/java/org/springframework/webflow/samples/numberguess/MastermindGame.java @@ -51,8 +51,7 @@ public class MastermindGame implements Serializable { public GuessResult makeGuess(String guess) { if (isGuessValid(guess)) { setResult(calculateResult(guess)); - } - else { + } else { setResult(GuessResult.INVALID); } return getResult(); @@ -86,8 +85,7 @@ public class MastermindGame implements Serializable { if (digit == answerDigit) { if (i == j) { rightPosition++; - } - else { + } else { correctButWrongPosition++; } break; @@ -97,8 +95,7 @@ public class MastermindGame implements Serializable { data.recordGuessData(guess, rightPosition, correctButWrongPosition); if (rightPosition == 4) { return GuessResult.CORRECT; - } - else { + } else { return GuessResult.WRONG; } } diff --git a/spring-webflow-samples/numberguess/src/test/java/org/springframework/webflow/samples/numberguess/MastermindGameTests.java b/spring-webflow-samples/numberguess/src/test/java/org/springframework/webflow/samples/numberguess/MastermindGameTests.java index e9732a34..41cbd85c 100644 --- a/spring-webflow-samples/numberguess/src/test/java/org/springframework/webflow/samples/numberguess/MastermindGameTests.java +++ b/spring-webflow-samples/numberguess/src/test/java/org/springframework/webflow/samples/numberguess/MastermindGameTests.java @@ -23,11 +23,11 @@ import org.springframework.webflow.samples.numberguess.MastermindGame.GuessResul public class MastermindGameTests extends TestCase { private MastermindGame action = new MastermindGame(); - + protected void setUp() { action = new MastermindGame(); } - + public void testGuessNoInputProvided() throws Exception { GuessResult result = action.makeGuess(null); assertEquals(GuessResult.INVALID, result); diff --git a/spring-webflow-samples/phonebook-portlet/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/phonebook-portlet/.settings/org.eclipse.jdt.core.prefs index d5e7fca3..06a3955f 100644 --- a/spring-webflow-samples/phonebook-portlet/.settings/org.eclipse.jdt.core.prefs +++ b/spring-webflow-samples/phonebook-portlet/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Jul 31 15:11:23 EDT 2007 +#Mon Aug 13 12:11:37 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -80,7 +80,7 @@ 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.indentation.size=8 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not insert @@ -260,7 +260,7 @@ 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=mixed -org.eclipse.jdt.core.formatter.tabulation.size=8 +org.eclipse.jdt.core.formatter.tabulation.char=tab +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 diff --git a/spring-webflow-samples/phonebook-portlet/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/phonebook-portlet/.settings/org.eclipse.jdt.ui.prefs index 5d89a367..f5c2a151 100644 --- a/spring-webflow-samples/phonebook-portlet/.settings/org.eclipse.jdt.ui.prefs +++ b/spring-webflow-samples/phonebook-portlet/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,4 @@ -#Tue Jul 31 15:08:57 EDT 2007 +#Mon Aug 13 12:11:37 EDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Spring Java Conventions diff --git a/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/SearchCriteriaValidator.java b/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/SearchCriteriaValidator.java index b915ba51..5cd8aab2 100644 --- a/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/SearchCriteriaValidator.java +++ b/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/SearchCriteriaValidator.java @@ -26,8 +26,8 @@ public class SearchCriteriaValidator implements Validator { } public void validate(Object obj, Errors errors) { - SearchCriteria query = (SearchCriteria)obj; - if (!StringUtils.hasText(query.getFirstName()) && !StringUtils.hasText(query.getLastName())) { + SearchCriteria query = (SearchCriteria) obj; + if (!StringUtils.hasText(query.getFirstName()) && !StringUtils.hasText(query.getLastName())) { errors.reject("noCriteria", "Please provide some query criteria!"); } } diff --git a/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PersonDetailFlowBuilder.java b/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PersonDetailFlowBuilder.java index 0b246f12..7c397bd8 100644 --- a/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PersonDetailFlowBuilder.java +++ b/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PersonDetailFlowBuilder.java @@ -23,11 +23,11 @@ import org.springframework.webflow.engine.builder.FlowBuilderException; import org.springframework.webflow.engine.support.ConfigurableFlowAttributeMapper; /** - * Java-based flow builder that builds the person details flow, exactly like it - * is defined in the detail-flow.xml XML flow definition. + * Java-based flow builder that builds the person details flow, exactly like it is defined in the + * detail-flow.xml XML flow definition. *

- * This encapsulates the page flow of viewing a person's details and their - * collegues in a reusable, self-contained module. + * This encapsulates the page flow of viewing a person's details and their collegues in a reusable, self-contained + * module. * * @author Keith Donald */ diff --git a/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PhonebookFlowRegistryFactoryBean.java b/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PhonebookFlowRegistryFactoryBean.java index 4e199be7..451198e7 100644 --- a/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PhonebookFlowRegistryFactoryBean.java +++ b/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PhonebookFlowRegistryFactoryBean.java @@ -24,7 +24,7 @@ import org.springframework.webflow.engine.builder.AbstractFlowBuilderFlowRegistr * @author Keith Donald */ public class PhonebookFlowRegistryFactoryBean extends AbstractFlowBuilderFlowRegistryFactoryBean { - + protected void doPopulate(FlowDefinitionRegistry registry) { registerFlowDefinition(registry, "detail-flow", new PersonDetailFlowBuilder()); registerFlowDefinition(registry, "search-flow", new SearchPersonFlowBuilder()); diff --git a/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/webflow/SearchPersonFlowBuilder.java b/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/webflow/SearchPersonFlowBuilder.java index b4148584..53f5860c 100644 --- a/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/webflow/SearchPersonFlowBuilder.java +++ b/spring-webflow-samples/phonebook-portlet/src/main/java/org/springframework/webflow/samples/phonebook/webflow/SearchPersonFlowBuilder.java @@ -26,13 +26,11 @@ import org.springframework.webflow.samples.phonebook.SearchCriteria; import org.springframework.webflow.samples.phonebook.SearchCriteriaValidator; /** - * Java-based flow builder that searches for people in the phonebook. The flow - * defined by this class is exactly the same as that defined in the - * search-flow.xml XML flow definition. + * Java-based flow builder that searches for people in the phonebook. The flow defined by this class is exactly the same + * as that defined in the search-flow.xml XML flow definition. *

- * This encapsulates the page flow of searching for some people, selecting a - * person you care about, and viewing their person's details and those of their - * collegues in a reusable, self-contained module. + * This encapsulates the page flow of searching for some people, selecting a person you care about, and viewing their + * person's details and those of their collegues in a reusable, self-contained module. * * @author Keith Donald */ diff --git a/spring-webflow-samples/phonebook-portlet/src/test/java/org/springframework/webflow/samples/phonebook/webflow/SearchFlowExecutionTests.java b/spring-webflow-samples/phonebook-portlet/src/test/java/org/springframework/webflow/samples/phonebook/webflow/SearchFlowExecutionTests.java index da233851..c4f76b74 100644 --- a/spring-webflow-samples/phonebook-portlet/src/test/java/org/springframework/webflow/samples/phonebook/webflow/SearchFlowExecutionTests.java +++ b/spring-webflow-samples/phonebook-portlet/src/test/java/org/springframework/webflow/samples/phonebook/webflow/SearchFlowExecutionTests.java @@ -72,7 +72,7 @@ public class SearchFlowExecutionTests extends AbstractXmlFlowExecutionTests { @Override protected FlowDefinitionResource getFlowDefinitionResource() { - return createFlowDefinitionResource("src/main/webapp/WEB-INF/flows/search-flow.xml"); + return createFlowDefinitionResource("src/main/webapp/WEB-INF/flows/search-flow.xml"); } @Override @@ -80,7 +80,8 @@ public class SearchFlowExecutionTests extends AbstractXmlFlowExecutionTests { Flow mockDetailFlow = new Flow("detail-flow"); mockDetailFlow.setInputMapper(new AttributeMapper() { public void map(Object source, Object target, MappingContext context) { - assertEquals("id of value 1 not provided as input by calling search flow", new Long(1), ((AttributeMap)source).get("id")); + assertEquals("id of value 1 not provided as input by calling search flow", new Long(1), + ((AttributeMap) source).get("id")); } }); // test responding to finish result diff --git a/spring-webflow-samples/phonebook/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/phonebook/.settings/org.eclipse.jdt.core.prefs index 63c85b13..511aa624 100644 --- a/spring-webflow-samples/phonebook/.settings/org.eclipse.jdt.core.prefs +++ b/spring-webflow-samples/phonebook/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Jul 31 15:11:23 EDT 2007 +#Mon Aug 13 12:11:34 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -76,7 +76,7 @@ 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.indentation.size=8 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not insert @@ -256,7 +256,7 @@ 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=mixed -org.eclipse.jdt.core.formatter.tabulation.size=8 +org.eclipse.jdt.core.formatter.tabulation.char=tab +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 diff --git a/spring-webflow-samples/phonebook/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/phonebook/.settings/org.eclipse.jdt.ui.prefs index 3b67a9d3..32b9ee63 100644 --- a/spring-webflow-samples/phonebook/.settings/org.eclipse.jdt.ui.prefs +++ b/spring-webflow-samples/phonebook/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,4 @@ -#Tue Jul 31 15:08:49 EDT 2007 +#Mon Aug 13 12:11:34 EDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Spring Java Conventions diff --git a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/SearchCriteriaValidator.java b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/SearchCriteriaValidator.java index 080540a6..ac57b80d 100644 --- a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/SearchCriteriaValidator.java +++ b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/SearchCriteriaValidator.java @@ -26,8 +26,8 @@ public class SearchCriteriaValidator implements Validator { } public void validate(Object obj, Errors errors) { - SearchCriteria query = (SearchCriteria)obj; - if (!StringUtils.hasText(query.getFirstName()) && !StringUtils.hasText(query.getLastName())) { + SearchCriteria query = (SearchCriteria) obj; + if (!StringUtils.hasText(query.getFirstName()) && !StringUtils.hasText(query.getLastName())) { errors.reject("noCriteria", "Please provide valid search criteria"); } } diff --git a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PersonDetailFlowBuilder.java b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PersonDetailFlowBuilder.java index 0b246f12..7c397bd8 100644 --- a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PersonDetailFlowBuilder.java +++ b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PersonDetailFlowBuilder.java @@ -23,11 +23,11 @@ import org.springframework.webflow.engine.builder.FlowBuilderException; import org.springframework.webflow.engine.support.ConfigurableFlowAttributeMapper; /** - * Java-based flow builder that builds the person details flow, exactly like it - * is defined in the detail-flow.xml XML flow definition. + * Java-based flow builder that builds the person details flow, exactly like it is defined in the + * detail-flow.xml XML flow definition. *

- * This encapsulates the page flow of viewing a person's details and their - * collegues in a reusable, self-contained module. + * This encapsulates the page flow of viewing a person's details and their collegues in a reusable, self-contained + * module. * * @author Keith Donald */ diff --git a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PhonebookFlowRegistryFactoryBean.java b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PhonebookFlowRegistryFactoryBean.java index 4e199be7..451198e7 100644 --- a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PhonebookFlowRegistryFactoryBean.java +++ b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/PhonebookFlowRegistryFactoryBean.java @@ -24,7 +24,7 @@ import org.springframework.webflow.engine.builder.AbstractFlowBuilderFlowRegistr * @author Keith Donald */ public class PhonebookFlowRegistryFactoryBean extends AbstractFlowBuilderFlowRegistryFactoryBean { - + protected void doPopulate(FlowDefinitionRegistry registry) { registerFlowDefinition(registry, "detail-flow", new PersonDetailFlowBuilder()); registerFlowDefinition(registry, "search-flow", new SearchPersonFlowBuilder()); diff --git a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/SearchPersonFlowBuilder.java b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/SearchPersonFlowBuilder.java index b4148584..53f5860c 100644 --- a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/SearchPersonFlowBuilder.java +++ b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/SearchPersonFlowBuilder.java @@ -26,13 +26,11 @@ import org.springframework.webflow.samples.phonebook.SearchCriteria; import org.springframework.webflow.samples.phonebook.SearchCriteriaValidator; /** - * Java-based flow builder that searches for people in the phonebook. The flow - * defined by this class is exactly the same as that defined in the - * search-flow.xml XML flow definition. + * Java-based flow builder that searches for people in the phonebook. The flow defined by this class is exactly the same + * as that defined in the search-flow.xml XML flow definition. *

- * This encapsulates the page flow of searching for some people, selecting a - * person you care about, and viewing their person's details and those of their - * collegues in a reusable, self-contained module. + * This encapsulates the page flow of searching for some people, selecting a person you care about, and viewing their + * person's details and those of their collegues in a reusable, self-contained module. * * @author Keith Donald */ diff --git a/spring-webflow-samples/phonebook/src/test/java/org/springframework/webflow/samples/phonebook/webflow/SearchFlowExecutionTests.java b/spring-webflow-samples/phonebook/src/test/java/org/springframework/webflow/samples/phonebook/webflow/SearchFlowExecutionTests.java index da233851..c4f76b74 100644 --- a/spring-webflow-samples/phonebook/src/test/java/org/springframework/webflow/samples/phonebook/webflow/SearchFlowExecutionTests.java +++ b/spring-webflow-samples/phonebook/src/test/java/org/springframework/webflow/samples/phonebook/webflow/SearchFlowExecutionTests.java @@ -72,7 +72,7 @@ public class SearchFlowExecutionTests extends AbstractXmlFlowExecutionTests { @Override protected FlowDefinitionResource getFlowDefinitionResource() { - return createFlowDefinitionResource("src/main/webapp/WEB-INF/flows/search-flow.xml"); + return createFlowDefinitionResource("src/main/webapp/WEB-INF/flows/search-flow.xml"); } @Override @@ -80,7 +80,8 @@ public class SearchFlowExecutionTests extends AbstractXmlFlowExecutionTests { Flow mockDetailFlow = new Flow("detail-flow"); mockDetailFlow.setInputMapper(new AttributeMapper() { public void map(Object source, Object target, MappingContext context) { - assertEquals("id of value 1 not provided as input by calling search flow", new Long(1), ((AttributeMap)source).get("id")); + assertEquals("id of value 1 not provided as input by calling search flow", new Long(1), + ((AttributeMap) source).get("id")); } }); // test responding to finish result diff --git a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.core.prefs index dc8ffbcd..bd4b29c4 100644 --- a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.core.prefs +++ b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Thu Aug 09 13:12:30 EDT 2007 +#Mon Aug 13 12:11:43 EDT 2007 eclipse.preferences.version=1 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled @@ -77,7 +77,7 @@ 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.indentation.size=8 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not insert @@ -257,7 +257,7 @@ 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=mixed -org.eclipse.jdt.core.formatter.tabulation.size=8 +org.eclipse.jdt.core.formatter.tabulation.char=tab +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 diff --git a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.ui.prefs index e0d5724c..7540e704 100644 --- a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.ui.prefs +++ b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,4 @@ -#Thu Aug 09 13:12:30 EDT 2007 +#Mon Aug 13 12:10:49 EDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Spring Java Conventions diff --git a/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/InMemoryDatabaseCreator.java b/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/InMemoryDatabaseCreator.java index baafe632..45cc5d36 100644 --- a/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/InMemoryDatabaseCreator.java +++ b/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/InMemoryDatabaseCreator.java @@ -21,9 +21,8 @@ public class InMemoryDatabaseCreator extends JdbcDaoSupport { @Override protected void initDao() throws Exception { - String createSales = - "create table T_SALES (ID int not null identity primary key, ITEM_COUNT int not null, " + - "PRICE double NOT NULL, category VARCHAR(1) NOT NULL, SHIPPING_TYPE varchar(1))"; + String createSales = "create table T_SALES (ID int not null identity primary key, ITEM_COUNT int not null, " + + "PRICE double NOT NULL, category VARCHAR(1) NOT NULL, SHIPPING_TYPE varchar(1))"; getJdbcTemplate().execute(createSales); } diff --git a/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/JdbcSaleProcessor.java b/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/JdbcSaleProcessor.java index ca5415de..abbe25a2 100644 --- a/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/JdbcSaleProcessor.java +++ b/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/JdbcSaleProcessor.java @@ -21,7 +21,8 @@ public class JdbcSaleProcessor extends JdbcDaoSupport implements SaleProcessor { public void process(Sale sale) { getJdbcTemplate() - .update("insert into T_SALES values (?, ?, ?, ?, ?)", + .update( + "insert into T_SALES values (?, ?, ?, ?, ?)", new Object[] { null, sale.getItemCount(), sale.getPrice(), sale.getCategory(), sale.getShippingType() }); } diff --git a/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/Sale.java b/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/Sale.java index 99a632f5..2b35bf86 100644 --- a/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/Sale.java +++ b/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/Sale.java @@ -89,8 +89,7 @@ public class Sale implements Serializable { if (itemCount >= 100) { discount = 0.1; } - } - else if ("B".equals(category)) { + } else if ("B".equals(category)) { if (itemCount >= 200) { discount = 0.2; } @@ -112,8 +111,7 @@ public class Sale implements Serializable { double delCost = 0.0; if ("S".equals(shippingType)) { delCost = 10.0; - } - else if ("E".equals(shippingType)) { + } else if ("E".equals(shippingType)) { delCost = 20.0; } return delCost; diff --git a/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/SellItemAction.java b/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/SellItemAction.java index 7d834edb..80ab1d4d 100644 --- a/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/SellItemAction.java +++ b/spring-webflow-samples/sellitem-jsf/src/main/java/org/springframework/webflow/samples/sellitem/SellItemAction.java @@ -25,7 +25,7 @@ public class SellItemAction extends AbstractAction { // an action is not needed for binding, you can still add in an action to do // something if you need to protected Event doExecute(RequestContext context) throws Exception { - Sale sale = (Sale)context.getFlowScope().getRequired("sale", Sale.class); + Sale sale = (Sale) context.getFlowScope().getRequired("sale", Sale.class); sale.getAmount(); return success(); } diff --git a/spring-webflow-samples/sellitem/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/sellitem/.settings/org.eclipse.jdt.core.prefs index dc8ffbcd..e1d6f998 100644 --- a/spring-webflow-samples/sellitem/.settings/org.eclipse.jdt.core.prefs +++ b/spring-webflow-samples/sellitem/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Thu Aug 09 13:12:30 EDT 2007 +#Mon Aug 13 12:11:40 EDT 2007 eclipse.preferences.version=1 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled @@ -77,7 +77,7 @@ 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.indentation.size=8 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not insert @@ -257,7 +257,7 @@ 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=mixed -org.eclipse.jdt.core.formatter.tabulation.size=8 +org.eclipse.jdt.core.formatter.tabulation.char=tab +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 diff --git a/spring-webflow-samples/sellitem/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/sellitem/.settings/org.eclipse.jdt.ui.prefs index e0d5724c..3b6b987b 100644 --- a/spring-webflow-samples/sellitem/.settings/org.eclipse.jdt.ui.prefs +++ b/spring-webflow-samples/sellitem/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,4 @@ -#Thu Aug 09 13:12:30 EDT 2007 +#Mon Aug 13 12:10:46 EDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Spring Java Conventions diff --git a/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/InMemoryDatabaseCreator.java b/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/InMemoryDatabaseCreator.java index a0365260..b9eb2afa 100644 --- a/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/InMemoryDatabaseCreator.java +++ b/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/InMemoryDatabaseCreator.java @@ -21,9 +21,8 @@ public class InMemoryDatabaseCreator extends JdbcDaoSupport { @Override protected void initDao() throws Exception { - String createSalesSql = - "create table T_SALES (ID int not null identity primary key, ITEM_COUNT int not null, " + - "PRICE double NOT NULL, category VARCHAR(1) NOT NULL, SHIPPING_TYPE varchar(1))"; + String createSalesSql = "create table T_SALES (ID int not null identity primary key, ITEM_COUNT int not null, " + + "PRICE double NOT NULL, category VARCHAR(1) NOT NULL, SHIPPING_TYPE varchar(1))"; getJdbcTemplate().execute(createSalesSql); } diff --git a/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/Sale.java b/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/Sale.java index f6b1fdf3..13f42bac 100644 --- a/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/Sale.java +++ b/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/Sale.java @@ -100,8 +100,7 @@ public class Sale implements Serializable { if (itemCount >= 100) { discount = 0.1; } - } - else if ("B".equals(category)) { + } else if ("B".equals(category)) { if (itemCount >= 200) { discount = 0.2; } @@ -123,8 +122,7 @@ public class Sale implements Serializable { double delCost = 0.0; if ("S".equals(shippingType)) { delCost = 10.0; - } - else if ("E".equals(shippingType)) { + } else if ("E".equals(shippingType)) { delCost = 20.0; } return delCost; diff --git a/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/SaleValidator.java b/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/SaleValidator.java index a3f493a1..060afdb8 100644 --- a/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/SaleValidator.java +++ b/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/SaleValidator.java @@ -25,10 +25,10 @@ public class SaleValidator implements Validator { } public void validate(Object obj, Errors errors) { - Sale sale = (Sale)obj; + Sale sale = (Sale) obj; validatePriceAndItemCount(sale, errors); } - + public void validatePriceAndItemCount(Sale sale, Errors errors) { if (sale.getItemCount() <= 0) { errors.rejectValue("itemCount", "tooLittle", "Item count must be greater than 0"); diff --git a/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/SellItemFlowExecutionListener.java b/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/SellItemFlowExecutionListener.java index 1b757892..27347a31 100644 --- a/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/SellItemFlowExecutionListener.java +++ b/spring-webflow-samples/sellitem/src/main/java/org/springframework/webflow/samples/sellitem/SellItemFlowExecutionListener.java @@ -25,15 +25,14 @@ import org.springframework.webflow.execution.FlowExecutionListenerAdapter; import org.springframework.webflow.execution.RequestContext; /** - * Flow execution listener that makes sure a user has the required role - * to enter a state. + * Flow execution listener that makes sure a user has the required role to enter a state. */ public class SellItemFlowExecutionListener extends FlowExecutionListenerAdapter { public void stateEntering(RequestContext context, StateDefinition nextState) throws EnterStateVetoException { String role = nextState.getAttributes().getString("role"); if (StringUtils.hasText(role)) { - HttpServletRequest request = ((ServletExternalContext)context.getExternalContext()).getRequest(); + HttpServletRequest request = ((ServletExternalContext) context.getExternalContext()).getRequest(); if (!request.isUserInRole(role)) { throw new EnterStateVetoException(context.getActiveFlow().getId(), context.getCurrentState().getId(), nextState.getId(), "State requires role '" + role diff --git a/spring-webflow-samples/sellitem/src/test/java/org/springframework/webflow/samples/sellitem/SellItemFlowExecutionTests.java b/spring-webflow-samples/sellitem/src/test/java/org/springframework/webflow/samples/sellitem/SellItemFlowExecutionTests.java index b482eae7..e3be17d3 100644 --- a/spring-webflow-samples/sellitem/src/test/java/org/springframework/webflow/samples/sellitem/SellItemFlowExecutionTests.java +++ b/spring-webflow-samples/sellitem/src/test/java/org/springframework/webflow/samples/sellitem/SellItemFlowExecutionTests.java @@ -69,9 +69,9 @@ public class SellItemFlowExecutionTests extends AbstractXmlFlowExecutionTests { public void testSubmitShippingDetailsForm() { testSubmitCategoryFormWithShipping(); - saleProcessor.process((Sale)getRequiredFlowAttribute("sale", Sale.class)); + saleProcessor.process((Sale) getRequiredFlowAttribute("sale", Sale.class)); EasyMock.replay(saleProcessor); - + MockParameterMap parameters = new MockParameterMap(); parameters.put("shippingType", "E"); parameters.put("shipDate", "12/06/2007"); diff --git a/spring-webflow-samples/shippingrate/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/shippingrate/.settings/org.eclipse.jdt.core.prefs index 63c85b13..dc3005ba 100644 --- a/spring-webflow-samples/shippingrate/.settings/org.eclipse.jdt.core.prefs +++ b/spring-webflow-samples/shippingrate/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Jul 31 15:11:23 EDT 2007 +#Mon Aug 13 12:12:05 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -76,7 +76,7 @@ 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.indentation.size=8 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not insert @@ -256,7 +256,7 @@ 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=mixed -org.eclipse.jdt.core.formatter.tabulation.size=8 +org.eclipse.jdt.core.formatter.tabulation.char=tab +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 diff --git a/spring-webflow-samples/shippingrate/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/shippingrate/.settings/org.eclipse.jdt.ui.prefs index ca74b17d..b72a32a4 100644 --- a/spring-webflow-samples/shippingrate/.settings/org.eclipse.jdt.ui.prefs +++ b/spring-webflow-samples/shippingrate/.settings/org.eclipse.jdt.ui.prefs @@ -1,9 +1,8 @@ -#Tue Jul 31 15:11:23 EDT 2007 +#Mon Aug 13 12:12:05 EDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Spring Java Conventions formatter_settings_version=11 -org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true diff --git a/spring-webflow-samples/shippingrate/src/main/java/org/springframework/webflow/samples/shippingrate/domain/Rate.java b/spring-webflow-samples/shippingrate/src/main/java/org/springframework/webflow/samples/shippingrate/domain/Rate.java index 93f13223..edfd7bba 100644 --- a/spring-webflow-samples/shippingrate/src/main/java/org/springframework/webflow/samples/shippingrate/domain/Rate.java +++ b/spring-webflow-samples/shippingrate/src/main/java/org/springframework/webflow/samples/shippingrate/domain/Rate.java @@ -34,7 +34,7 @@ public class Rate implements Serializable { if (!(o instanceof Rate)) { return false; } - return value.equals(((Rate)o).value); + return value.equals(((Rate) o).value); } public int hashCode() { diff --git a/spring-webflow-samples/shippingrate/src/main/java/org/springframework/webflow/samples/shippingrate/domain/RateCriteriaValidator.java b/spring-webflow-samples/shippingrate/src/main/java/org/springframework/webflow/samples/shippingrate/domain/RateCriteriaValidator.java index 2260aade..4bc5d845 100644 --- a/spring-webflow-samples/shippingrate/src/main/java/org/springframework/webflow/samples/shippingrate/domain/RateCriteriaValidator.java +++ b/spring-webflow-samples/shippingrate/src/main/java/org/springframework/webflow/samples/shippingrate/domain/RateCriteriaValidator.java @@ -26,7 +26,7 @@ public class RateCriteriaValidator implements Validator { } public void validate(Object obj, Errors errors) { - RateCriteria criteria = (RateCriteria)obj; + RateCriteria criteria = (RateCriteria) obj; validateSender(criteria, errors); validateReceiver(criteria, errors); validatePackageDetails(criteria, errors); diff --git a/spring-webflow-sandbox/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-sandbox/.settings/org.eclipse.jdt.core.prefs index ab0cae0a..001a90e1 100644 --- a/spring-webflow-sandbox/.settings/org.eclipse.jdt.core.prefs +++ b/spring-webflow-sandbox/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,6 @@ -#Tue Jul 31 15:11:23 EDT 2007 +#Mon Aug 13 12:06:30 EDT 2007 eclipse.preferences.version=1 +instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve @@ -142,7 +143,7 @@ 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.indentation.size=8 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not insert @@ -322,7 +323,7 @@ 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=mixed -org.eclipse.jdt.core.formatter.tabulation.size=8 +org.eclipse.jdt.core.formatter.tabulation.char=tab +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 diff --git a/spring-webflow-sandbox/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-sandbox/.settings/org.eclipse.jdt.ui.prefs index 599cc0b3..e18fff5d 100644 --- a/spring-webflow-sandbox/.settings/org.eclipse.jdt.ui.prefs +++ b/spring-webflow-sandbox/.settings/org.eclipse.jdt.ui.prefs @@ -1,9 +1,9 @@ -#Tue Jul 31 15:07:43 EDT 2007 +#Mon Aug 13 12:10:07 EDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Spring Java Conventions formatter_settings_version=11 -internal.default.compliance=default +instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true