dflorey 2004/06/24 08:53:17
Modified: proposals/projector/src/java/org/apache/slide/projector/processor/table
TableGenerator.java
proposals/projector/src/java/org/apache/slide/projector/processor/core
DateFormatter.java
Log:
Date handling enabled
Table formatting improved
Revision Changes Path
1.10 +18 -5
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableGenerator.java
Index: TableGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableGenerator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TableGenerator.java 23 Jun 2004 14:42:57 -0000 1.9
+++ TableGenerator.java 24 Jun 2004 15:53:17 -0000 1.10
@@ -50,9 +50,11 @@
final private static String HEADER = "header";
final private static String KEY = "key";
final private static String VALUE = "value";
+ final private static String NAME = "name";
final private static String PROCESSOR = "processor";
final private static String PARAMETERS = "parameters";
final private static String RESULT = "result";
+ final private static String REPLACE_COLUMN = "replaceColumn";
final private static String HEADERS = "headers";
final private static String COLUMNS = "columns";
@@ -84,6 +86,8 @@
headerParameterDescriptors.add(new ParameterDescriptor(HEADER, new
ParameterMessage("tableGenerator/parameter/columns/header"), new
StringValueDescriptor(), StringValue.EMPTY));
headerParameterDescriptors.add(new ParameterDescriptor(VALUE, new
ParameterMessage("tableGenerator/parameter/columns/value"), new
ResourceValueDescriptor(), NullValue.NULL));
headerParameterDescriptors.add(new ParameterDescriptor(KEY, new
ParameterMessage("tableGenerator/parameter/columns/key"), new
StringValueDescriptor()));
+ headerParameterDescriptors.add(new ParameterDescriptor(NAME, new
ParameterMessage("tableGenerator/parameter/columns/name"), new
StringValueDescriptor(), new StringValue(VALUE)));
+ headerParameterDescriptors.add(new ParameterDescriptor(REPLACE_COLUMN, new
ParameterMessage("tableGenerator/parameter/columns/replaceColumn"), new
BooleanValueDescriptor(), BooleanValue.FALSE));
headerParameterDescriptors.add(new ParameterDescriptor(RESIZABLE, new
ParameterMessage("tableGenerator/parameter/columns/resizable"), new
BooleanValueDescriptor(), BooleanValue.FALSE));
headerParameterDescriptors.add(new ParameterDescriptor(SORTABLE, new
ParameterMessage("tableGenerator/parameter/columns/sortable"), new
BooleanValueDescriptor(), BooleanValue.FALSE));
headerParameterDescriptors.add(new ParameterDescriptor(PROCESSOR, new
ParameterMessage("tableGenerator/parameter/columns/processor"), new
URIValueDescriptor(), NullValue.NULL));
@@ -173,15 +177,17 @@
Map inputParameter = ((MapValue)input[i]).getMap();
for ( int j = 0; j < columns.length; j++ ) {
Map columnMap = ((MapValue)columns[j]).getMap();
+ boolean replaceColumn =
((BooleanValue)columnMap.get(REPLACE_COLUMN)).booleanValue();
Value processorUri = (Value)columnMap.get(PROCESSOR);
Map columnParameters = new HashMap();
columnParameters.putAll(parameter);
String key = columnMap.get(KEY).toString();
+ String name = columnMap.get(NAME).toString();
Object value = columnMap.get(VALUE);
if ( value == null || value == NullValue.NULL ) {
value = inputParameter.get(key);
}
- columnParameters.put(VALUE, value);
+ columnParameters.put(name, value);
if ( processorUri != NullValue.NULL ) {
Processor processor =
ProcessorManager.getInstance().getProcessor((URI)processorUri);
Value processorParameters = (Value)columnMap.get(PARAMETERS);
@@ -193,10 +199,17 @@
String resultKey = columnMap.get(RESULT).toString();
Value resultEntry =
(Value)processorResult.getResultEntries().get(resultKey);
if ( resultEntry instanceof PrintableValue ) {
- ((PrintableValue)resultEntry).print(columnsBuffer);
+ if ( replaceColumn ) {
+
((PrintableValue)resultEntry).print(columnsBuffer);
+ } else {
+ StringBuffer resultBuffer = new StringBuffer();
+
((PrintableValue)resultEntry).print(resultBuffer);
+ columnParameters.put(VALUE, new
StringValue(resultBuffer.toString()));
+ }
}
- } else {
- Template template = columnTemplate;
+ }
+ if ( !replaceColumn ) {
+ Template template = columnTemplate;
if ( size != null &&
TableHandler.COLLAPSED.equals(size.get(key))) {
template = collapsedColumnTemplate;
}
1.2 +1 -1
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/core/DateFormatter.java
Index: DateFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/core/DateFormatter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateFormatter.java 24 Jun 2004 15:12:13 -0000 1.1
+++ DateFormatter.java 24 Jun 2004 15:53:17 -0000 1.2
@@ -77,7 +77,7 @@
} else if ( timeFormat.equals(HIDE) ) {
return DateFormat.getDateInstance(getStyleByName(dateFormat),
locale);
} else {
- return
DateFormat.getDateTimeInstance(getStyleByName(timeFormat), getStyleByName(dateFormat),
locale);
+ return
DateFormat.getDateTimeInstance(getStyleByName(dateFormat), getStyleByName(timeFormat),
locale);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
