dflorey 2004/12/30 07:04:28
Modified: projector/src/java/org/apache/slide/projector/processor/core
DateFormatter.java
projector/src/java/org/apache/slide/projector/constraints
ArrayFactory.java MapFactory.java DateFactory.java
projector/src/java/org/apache/slide/projector/engine
ProcessorManager.java
projector/src/java/org/apache/slide/projector/processor/table
TableMapRenderer.java
projector/src/java/org/apache/slide/projector/value Any.java
projector/src/java/org/apache/slide/projector/repository/webdav
WebdavRepository.java
Removed: projector/src/java/org/apache/slide/projector/constraints
DynamicMapConstraints.java
DynamicArrayConstraints.java
DynamicListConstraints.java
Log:
Migration to commons-contract continued...
Revision Changes Path
1.5 +1 -1
jakarta-slide/projector/src/java/org/apache/slide/projector/processor/core/DateFormatter.java
Index: DateFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/core/DateFormatter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DateFormatter.java 28 Nov 2004 13:54:06 -0000 1.4
+++ DateFormatter.java 30 Dec 2004 15:04:27 -0000 1.5
@@ -34,7 +34,7 @@
private final static String[] STYLES = new String[] { HIDE, SHORT,
MEDIUM, LONG, FULL };
private final static ParameterDescriptor[] parameterDescriptors = new
ParameterDescriptor[]{
- new ParameterDescriptor(DATE, new
ParameterMessage("dateFormatter/parameter/date"), new DateConstraints()),
+ new ParameterDescriptor(DATE, new
ParameterMessage("dateFormatter/parameter/date"), new
DateConstraints("yyyy-MM-dd'T'HH:mm:ss'Z'")),
new ParameterDescriptor(DATE_FORMAT, new
ParameterMessage("dateFormatter/parameter/dateFormat"), new
StringConstraints(STYLES), SHORT),
new ParameterDescriptor(TIME_FORMAT, new
ParameterMessage("dateFormatter/parameter/timeFormat"), new
StringConstraints(STYLES), SHORT),
};
1.4 +2 -2
jakarta-slide/projector/src/java/org/apache/slide/projector/constraints/ArrayFactory.java
Index: ArrayFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/constraints/ArrayFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ArrayFactory.java 30 Dec 2004 12:55:57 -0000 1.3
+++ ArrayFactory.java 30 Dec 2004 15:04:27 -0000 1.4
@@ -41,8 +41,8 @@
Iterator childrenIterator = element.getChildren().iterator();;
if ( childrenIterator.hasNext() ) {
Constraints allowedArrayValue =
ConstraintsManager.getInstance().loadConstraints((Element)childrenIterator.next());
- return new DynamicArrayConstraints(allowedArrayValue);
+ return new ArrayConstraints(allowedArrayValue);
}
- return new DynamicArrayConstraints();
+ return new ArrayConstraints();
}
}
1.4 +1 -1
jakarta-slide/projector/src/java/org/apache/slide/projector/constraints/MapFactory.java
Index: MapFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/constraints/MapFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MapFactory.java 30 Dec 2004 12:55:57 -0000 1.3
+++ MapFactory.java 30 Dec 2004 15:04:27 -0000 1.4
@@ -45,7 +45,7 @@
}
public Constraints loadDescriptor(Element element) {
- MapConstraints valueDescriptor = new DynamicMapConstraints();
+ MapConstraints valueDescriptor = new MapConstraints();
for ( Iterator i = element.getChildren().iterator();
i.hasNext(); ) {
Element entry = (Element)i.next();
String key = entry.getAttributeValue("key");
1.3 +2 -0
jakarta-slide/projector/src/java/org/apache/slide/projector/constraints/DateFactory.java
Index: DateFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/constraints/DateFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DateFactory.java 28 Nov 2004 13:54:05 -0000 1.2
+++ DateFactory.java 30 Dec 2004 15:04:27 -0000 1.3
@@ -23,8 +23,10 @@
DateConstraints valueDescriptor = new DateConstraints();
String earliest = element.getAttributeValue("earliest");
String latest = element.getAttributeValue("latest");
+ String formatPattern = element.getAttributeValue("formatPattern");
if ( earliest != null ) valueDescriptor.setEarliest(new
Date(Long.valueOf(earliest).longValue()));
if ( latest != null ) valueDescriptor.setLatest(new
Date(Long.valueOf(latest).longValue()));
+ if ( formatPattern != null )
valueDescriptor.setFormatPattern(formatPattern);
return valueDescriptor;
}
}
1.11 +1 -1
jakarta-slide/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java
Index: ProcessorManager.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ProcessorManager.java 28 Nov 2004 13:54:08 -0000 1.10
+++ ProcessorManager.java 30 Dec 2004 15:04:28 -0000 1.11
@@ -273,7 +273,7 @@
public static Object prepareValue(ParameterDescriptor
parameterDescriptor, Object value, Context context) throws Exception {
Object preparedValue;
if ( value instanceof Any ) {
- value = ((Any)value).load(context);
+ value = ((Any)value).evaluate(context);
}
if ( value == null ) {
if ( parameterDescriptor.isRequired() ) {
1.7 +6 -9
jakarta-slide/projector/src/java/org/apache/slide/projector/processor/table/TableMapRenderer.java
Index: TableMapRenderer.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/table/TableMapRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TableMapRenderer.java 28 Nov 2004 13:54:07 -0000 1.6
+++ TableMapRenderer.java 30 Dec 2004 15:04:28 -0000 1.7
@@ -107,11 +107,8 @@
Object []input = (Object [])parameter.get(SimpleProcessor.INPUT);
Number offsetResource = (Number)parameter.get(OFFSET);
Number itemsPerPageResource = (Number)parameter.get(ITEMS_PER_PAGE);
- Object sortedByParameter = parameter.get(TableHandler.SORTED_BY);
- Object orderParameter = parameter.get(TableHandler.ORDER);
- String sortedBy = null, order = null;
- if ( sortedByParameter != null ) sortedBy =
sortedByParameter.toString();
- if ( orderParameter != null ) order = orderParameter.toString();
+ String sortedBy = (String)parameter.get(TableHandler.SORTED_BY);
+ String order = (String)parameter.get(TableHandler.ORDER);
String id = parameter.get(TableHandler.ID).toString();
Store store =
context.getStore(parameter.get(TableHandler.STORE).toString());
Map tableMap = (Map)store.get(id, context);
@@ -123,10 +120,10 @@
if ( offset != null ) offsetResource = offset;
Number itemsPerPage = (Number)tableMap.get(ITEMS_PER_PAGE);
if ( itemsPerPage != null ) itemsPerPageResource = itemsPerPage;
- Object sortedByValue =
(Number)tableMap.get(TableHandler.SORTED_BY);
- if ( sortedByValue != null && sortedByValue != null ) sortedBy =
sortedByValue.toString();
- Object orderValue = (Number)tableMap.get(TableHandler.ORDER);
- if ( orderValue != null && orderValue != null ) order =
orderValue.toString();
+ String sortedByState =
(String)tableMap.get(TableHandler.SORTED_BY);
+ if ( sortedByState != null ) sortedBy = sortedByState;
+ String orderState = (String)tableMap.get(TableHandler.ORDER);
+ if ( orderState != null ) order = orderState;
}
// sort table
if ( sortedBy != null && order != null ) {
1.3 +4 -2
jakarta-slide/projector/src/java/org/apache/slide/projector/value/Any.java
Index: Any.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/value/Any.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Any.java 28 Nov 2004 13:54:08 -0000 1.2
+++ Any.java 30 Dec 2004 15:04:28 -0000 1.3
@@ -4,11 +4,13 @@
import org.apache.commons.contract.Context;
import org.apache.commons.contract.Store;
+import org.apache.commons.contract.constraints.Evaluatable;
import org.apache.slide.projector.Projector;
import org.apache.slide.projector.engine.ProcessorManager;
import org.apache.slide.projector.processor.process.Process;
-public class Any {
+public class Any implements Evaluatable {
+
private URI processorUri;
private String result;
private String storeId;
@@ -58,7 +60,7 @@
return storeId;
}
- public Object load(Context context) throws Exception {
+ public Object evaluate(Context context) throws Exception {
Object value = null;
if ( key != null ) {
if ( storeId.equals(Projector.NO_STORE) ) {
1.9 +2 -2
jakarta-slide/projector/src/java/org/apache/slide/projector/repository/webdav/WebdavRepository.java
Index: WebdavRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/repository/webdav/WebdavRepository.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WebdavRepository.java 28 Nov 2004 13:54:07 -0000 1.8
+++ WebdavRepository.java 30 Dec 2004 15:04:28 -0000 1.9
@@ -134,9 +134,9 @@
public URI createRole(String rolename, Credentials credentials) throws
RepositoryException {
try {
- getResource(new URIValue(users+rolename), credentials);
+ getResource(new URIValue(roles+rolename), credentials);
} catch ( NotFoundException exception ) {
- URI roleUri = new URIValue(users+rolename);
+ URI roleUri = new URIValue(roles+rolename);
MkcolMethod mkcolMethod = new MkcolMethod(domain+roleUri);
mkcolMethod.setDoAuthentication(true);
HttpState httpState = new HttpState();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
