Author: tromanovich
Date: 2008-11-13 08:59:39 -0500 (Thu, 13 Nov 2008)
New Revision: 11139
Modified:
trunk/test-applications/facelets/src/main/java/listShuttle/ListShuttle.java
trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml
trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml
trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java
trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp
trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp
Log:
Add sourceRequired and targetRequired attributes test
Modified: trunk/test-applications/facelets/src/main/java/listShuttle/ListShuttle.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/listShuttle/ListShuttle.java 2008-11-13
13:34:14 UTC (rev 11138)
+++ trunk/test-applications/facelets/src/main/java/listShuttle/ListShuttle.java 2008-11-13
13:59:39 UTC (rev 11139)
@@ -25,6 +25,8 @@
private boolean showAllSourceData;
private boolean showAllTargetData;
private boolean switchByClick;
+ private boolean sourceRequired;
+ private boolean targetRequired;
private ArrayList<Data> sourceValue;
private ArrayList<Data> targetValue;
private ArrayList<String> info;
@@ -70,6 +72,8 @@
this.moveControlsVisible = true;
this.orderControlsVisible = true;
this.showButtonLabels = true;
+ this.sourceRequired = false;
+ this.targetRequired = false;
this.bottomControlLabel = "bottom";
this.copyAllControlLabel = "copy all";
this.copyControlLabel = "copy";
@@ -346,7 +350,23 @@
public void setTargetCaptionLabel(String targetCaptionLabel) {
this.targetCaptionLabel = targetCaptionLabel;
}
+
+ public boolean isSourceRequired() {
+ return sourceRequired;
+ }
+ public void setSourceRequired(boolean sourceRequired) {
+ this.sourceRequired = sourceRequired;
+ }
+
+ public boolean isTargetRequired() {
+ return targetRequired;
+ }
+
+ public void setTargetRequired(boolean targetRequired) {
+ this.targetRequired = targetRequired;
+ }
+
private void addSelection(Collection<Data> selection, String description) {
if (selection == null)
return;
Modified: trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml
===================================================================
---
trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2008-11-13
13:34:14 UTC (rev 11138)
+++
trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2008-11-13
13:59:39 UTC (rev 11139)
@@ -27,6 +27,8 @@
targetListWidth="#{listShuttle.targetListWidth}"
sourceListWidth="#{listShuttle.sourceListWidth}"
listsHeight="#{listShuttle.listsHeight}"
+ sourceRequired="#{listShuttle.sourceRequired}"
+ targetRequired="#{listShuttle.targetRequired}"
sourceCaptionLabel="#{listShuttle.sourceCaptionLabel}"
targetCaptionLabel="#{listShuttle.targetCaptionLabel}"
topControlLabel="#{listShuttle.topControlLabel}"
Modified:
trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml
===================================================================
---
trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml 2008-11-13
13:34:14 UTC (rev 11138)
+++
trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml 2008-11-13
13:59:39 UTC (rev 11139)
@@ -122,6 +122,14 @@
<h:outputText value="switchByClick" />
<h:selectBooleanCheckbox value="#{listShuttle.switchByClick}"
onchange="submit();" />
+
+ <h:outputText value="sourceRequired" />
+ <h:selectBooleanCheckbox value="#{listShuttle.sourceRequired}"
+ onchange="submit();" />
+
+ <h:outputText value="targetRequired" />
+ <h:selectBooleanCheckbox value="#{listShuttle.targetRequired}"
+ onchange="submit();" />
<h:outputText value="sourceCaptionLabel" />
<h:inputText value="#{listShuttle.sourceCaptionLabel}"
Modified: trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java 2008-11-13
13:34:14 UTC (rev 11138)
+++ trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java 2008-11-13
13:59:39 UTC (rev 11139)
@@ -22,6 +22,8 @@
private boolean showAllSourceData;
private boolean showAllTargetData;
private boolean switchByClick;
+ private boolean sourceRequired;
+ private boolean targetRequired;
private ArrayList<Data> sourceValue;
private ArrayList<Data> targetValue;
private ArrayList<String> info;
@@ -66,6 +68,8 @@
this.moveControlsVisible = true;
this.orderControlsVisible = true;
this.showButtonLabels = true;
+ this.sourceRequired = false;
+ this.targetRequired = false;
this.bottomControlLabel = "bottom";
this.copyAllControlLabel = "copy all";
this.copyControlLabel = "copy";
@@ -341,6 +345,22 @@
this.targetCaptionLabel = targetCaptionLabel;
}
+ public boolean isSourceRequired() {
+ return sourceRequired;
+ }
+
+ public void setSourceRequired(boolean sourceRequired) {
+ this.sourceRequired = sourceRequired;
+ }
+
+ public boolean isTargetRequired() {
+ return targetRequired;
+ }
+
+ public void setTargetRequired(boolean targetRequired) {
+ this.targetRequired = targetRequired;
+ }
+
private void addSelection(Collection<Data> selection, String description) {
if(selection == null) return;
Iterator<Data> inter = selection.iterator();
Modified: trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp 2008-11-13
13:34:14 UTC (rev 11138)
+++ trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp 2008-11-13
13:59:39 UTC (rev 11139)
@@ -27,6 +27,8 @@
targetListWidth="#{listShuttle.targetListWidth}"
sourceListWidth="#{listShuttle.sourceListWidth}"
listsHeight="#{listShuttle.listsHeight}"
+ sourceRequired="#{listShuttle.sourceRequired}"
+ targetRequired="#{listShuttle.targetRequired}"
sourceCaptionLabel="#{listShuttle.sourceCaptionLabel}"
targetCaptionLabel="#{listShuttle.targetCaptionLabel}"
topControlLabel="#{listShuttle.topControlLabel}"
Modified: trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp
===================================================================
---
trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp 2008-11-13
13:34:14 UTC (rev 11138)
+++
trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp 2008-11-13
13:59:39 UTC (rev 11139)
@@ -120,6 +120,14 @@
<h:outputText value="switchByClick" />
<h:selectBooleanCheckbox value="#{listShuttle.switchByClick}"
onchange="submit();" />
+
+ <h:outputText value="sourceRequired" />
+ <h:selectBooleanCheckbox value="#{listShuttle.sourceRequired}"
+ onchange="submit();" />
+
+ <h:outputText value="targetRequired" />
+ <h:selectBooleanCheckbox value="#{listShuttle.targetRequired}"
+ onchange="submit();" />
<h:outputText value="sourceCaptionLabel" />
<h:inputText value="#{listShuttle.sourceCaptionLabel}"