Author: andyhot
Date: Wed Feb 27 15:47:20 2008
New Revision: 631774
URL: http://svn.apache.org/viewvc?rev=631774&view=rev
Log:
#TAPESTRY-2201 Make LabeledPSM use model's isDisabled
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java?rev=631774&r1=631773&r2=631774&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java
Wed Feb 27 15:47:20 2008
@@ -213,7 +213,7 @@
public boolean isDisabled(int index)
{
- return index == 0 && _option == null;
+ return index == 0 ? _option == null : _model.isDisabled(index - 1);
}
/**
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java?rev=631774&r1=631773&r2=631774&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java
Wed Feb 27 15:47:20 2008
@@ -78,6 +78,7 @@
assertEquals(model.getLabel(1), String.valueOf(Boolean.TRUE));
assert model.isDisabled(0);
assert !model.isDisabled(1);
+ assert model.isDisabled(2);
}
public void test_Label_Option_Disabled()
@@ -90,6 +91,7 @@
assertEquals(model.getLabel(0), label);
assert !model.isDisabled(0);
assert !model.isDisabled(1);
+ assert model.isDisabled(2);
}
public void test_Label_Value_With_Option_Disabled()
@@ -107,6 +109,7 @@
assert !model.isDisabled(0);
assert !model.isDisabled(1);
+ assert model.isDisabled(2);
}
private void validateLabel(IPropertySelectionModel model, String label,
Object option,
@@ -163,7 +166,7 @@
public boolean isDisabled(int index)
{
- return false;
+ return !values[index];
}
public Object translateValue(String value)
