Index: src/org/tp23/antinstaller/renderer/text/TextMessageRenderer.java =================================================================== --- src/org/tp23/antinstaller/renderer/text/TextMessageRenderer.java (revision 587) +++ src/org/tp23/antinstaller/renderer/text/TextMessageRenderer.java (working copy) @@ -64,10 +64,10 @@ public class TextMessageRenderer impleme return false; } - if(TextUtils.isFalse(command)) { + if(TextUtils.isNegativeAnswer(command)) { return false; } - else if(TextUtils.isTrue(command)) { + else if(TextUtils.isAffirmativeAnswer(command)) { System.out.println(); // This is needed to always have the same spaces between pages return true; } Index: src/org/tp23/antinstaller/renderer/text/SummaryPageRenderer.java =================================================================== --- src/org/tp23/antinstaller/renderer/text/SummaryPageRenderer.java (revision 587) +++ src/org/tp23/antinstaller/renderer/text/SummaryPageRenderer.java (working copy) @@ -64,10 +64,10 @@ public class SummaryPageRenderer extends command = reader.readLine().trim(); out.println(); - if(TextUtils.isFalse(command)) { + if(TextUtils.isNegativeAnswer(command)) { page.setSummaryRejected(true); } - else if(TextUtils.isTrue(command)){ + else if(TextUtils.isAffirmativeAnswer(command)){ page.setSummaryRejected(false); } Index: src/org/tp23/antinstaller/renderer/text/TargetInputRenderer.java =================================================================== --- src/org/tp23/antinstaller/renderer/text/TargetInputRenderer.java (revision 587) +++ src/org/tp23/antinstaller/renderer/text/TargetInputRenderer.java (working copy) @@ -50,7 +50,7 @@ public class TargetInputRenderer extends out.print(" Y or N ["); out.print(TextUtils.getString("_default_")); out.print(": "); - if (TextUtils.isFalse(iField.getSuggestedValue())) + if (TextUtils.isNegativeAnswer(iField.getSuggestedValue())) out.print("N"); else out.print("Y"); @@ -59,7 +59,7 @@ public class TargetInputRenderer extends String input = reader.readLine(); out.println(); - + if(TextUtils.isVoid(input)) { input = iField.getSuggestedValue(); } Index: src/org/tp23/antinstaller/renderer/text/TextUtils.java =================================================================== --- src/org/tp23/antinstaller/renderer/text/TextUtils.java (revision 587) +++ src/org/tp23/antinstaller/renderer/text/TextUtils.java (working copy) @@ -27,7 +27,7 @@ class TextUtils { private static final ResourceBundle RES = ResourceBundle.getBundle("org.tp23.antinstaller.renderer.text.Res"); - private static final char[] affimativeChars = parseChars(getString("affirmativeChars")); + private static final char[] affirmativeChars = parseChars(getString("affirmativeChars")); private static final char[] negativeChars = parseChars(getString("negativeChars")); static final int PAGE_BLANK_LINES = 0; @@ -148,30 +148,30 @@ class TextUtils { } /** - * does the string represent true default = true + * check wether the string represent an affermative answer * * @param entered String * @return boolean */ - static boolean isTrue(String entered) { + static boolean isAffirmativeAnswer(String entered) { if(entered.length() == 0) { return true; } char first = entered.charAt(0); boolean isTrue = false; - for(int i = 0; i < affimativeChars.length; i++) { - isTrue |= Character.toUpperCase(first) == affimativeChars[i]; + for(int i = 0; i < affirmativeChars.length; i++) { + isTrue |= Character.toUpperCase(first) == affirmativeChars[i]; } return isTrue; } /** - * does the string represent false default = false + * check wether the string represent a negative answer * * @param entered String * @return boolean */ - static boolean isFalse(String entered) { + static boolean isNegativeAnswer(String entered) { if(entered.length() == 0) { return true; } Index: src/org/tp23/antinstaller/renderer/text/LicensePageRenderer.java =================================================================== --- src/org/tp23/antinstaller/renderer/text/LicensePageRenderer.java (revision 587) +++ src/org/tp23/antinstaller/renderer/text/LicensePageRenderer.java (working copy) @@ -37,6 +37,12 @@ public class LicensePageRenderer extends } } + // FIXME: duplicated from OutputField + private boolean isTrue(String value) { + if(value == null) return false; + return value.equalsIgnoreCase("true") || value.equalsIgnoreCase("yes"); + } + private boolean renderLicensePage(LicensePage page) throws InstallException { try { printHeader(page); @@ -55,7 +61,7 @@ public class LicensePageRenderer extends Pager pager = new Pager(license); String strUsePaging = page.getUsePaging(); - boolean usePaging = strUsePaging != null && TextUtils.isTrue(strUsePaging); + boolean usePaging = strUsePaging != null && isTrue(strUsePaging); if(usePaging) { while (true) { out.println(); @@ -82,13 +88,13 @@ public class LicensePageRenderer extends out.print(TextUtils.PROMPT_STRING); command = reader.readLine().trim(); - if(TextUtils.isFalse(command)) { + if(TextUtils.isNegativeAnswer(command)) { out.println(); out.println(TextUtils.format(TextUtils.getString("licenseRejected") + getContext().getInstaller().getName() + ".")); page.setAbort(true); return false; } - else if(TextUtils.isTrue(command)){ + else if(TextUtils.isAffirmativeAnswer(command)){ out.println(); // This is needed to always have the same spaces between pages return true; } Index: src/org/tp23/antinstaller/renderer/text/CheckboxInputRenderer.java =================================================================== --- src/org/tp23/antinstaller/renderer/text/CheckboxInputRenderer.java (revision 587) +++ src/org/tp23/antinstaller/renderer/text/CheckboxInputRenderer.java (working copy) @@ -61,16 +61,16 @@ public class CheckboxInputRenderer exten break; } - if(InputField.isTrue(input)) { + if(TextUtils.isAffirmativeAnswer(input)) { iField.setValue("true"); break; } - else if (InputField.isFalse(input)){ + else if (TextUtils.isNegativeAnswer(input)){ iField.setValue("false"); break; } - out.println("Please answer \"true\" or \"false\""); + out.println("Please answer \"yes\" or \"no\""); out.println(); out.print(TextUtils.PROMPT_STRING); }