Author: solomax
Date: Wed Sep 18 02:16:11 2013
New Revision: 1524276
URL: http://svn.apache.org/r1524276
Log:
[OPENMEETINGS-796] additional YesNoDropDown is added for yes/no configs
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1524276&r1=1524275&r2=1524276&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
Wed Sep 18 02:16:11 2013
@@ -69,6 +69,7 @@ public class InstallWizard extends Wizar
private InstallationConfig cfg;
private CompoundPropertyModel<InstallWizard> model;
private final static List<SelectOption> yesNoList =
Arrays.asList(SelectOption.NO, SelectOption.YES);
+ private final static List<SelectOption> yesNoTextList =
Arrays.asList(SelectOption.NO_TEXT, SelectOption.YES_TEXT);
private final static List<String> allFonts =
Arrays.asList("TimesNewRoman", "Verdana", "Arial");
private final IDynamicWizardStep welcomeStep;
private final ParamsStep1 paramsStep1;
@@ -278,7 +279,7 @@ public class InstallWizard extends Wizar
add(new RequiredTextField<String>("cfg.cryptClassName"));
//Validate class
//TODO add check for red5sip connection
- add(new YesNoDropDown("red5SipEnable"));
+ add(new YesNoTextDropDown("red5SipEnable"));
add(new TextField<String>("cfg.red5SipRoomPrefix"));
add(new TextField<String>("cfg.red5SipExtenContext"));
}
@@ -400,7 +401,9 @@ public class InstallWizard extends Wizar
private static class SelectOption implements Serializable {
private static final long serialVersionUID =
2559982745410615390L;
private static SelectOption NO = new SelectOption("0", "No");
+ private static SelectOption NO_TEXT = new SelectOption("no",
"No");
private static SelectOption YES = new SelectOption("1", "Yes");
+ private static SelectOption YES_TEXT = new SelectOption("yes",
"Yes");
public String key;
@SuppressWarnings("unused")
public String value;
@@ -474,6 +477,7 @@ public class InstallWizard extends Wizar
}
}
+
private final class YesNoDropDown extends SelectOptionDropDown {
private static final long serialVersionUID =
578375825530725477L;
@@ -485,6 +489,17 @@ public class InstallWizard extends Wizar
}
}
+ private final class YesNoTextDropDown extends SelectOptionDropDown {
+ private static final long serialVersionUID =
578375825530725477L;
+
+ YesNoTextDropDown(String id) {
+ super(id);
+ setChoices(yesNoTextList);
+ this.option =
SelectOption.NO_TEXT.key.equals(propModel.getObject()) ?
+ SelectOption.NO_TEXT :
SelectOption.YES_TEXT;
+ }
+ }
+
private final class LangDropDown extends SelectOptionDropDown {
private static final long serialVersionUID =
-2826765890538795285L;