LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix von Sören, damit die Datumsangaben in den Object Lists korrekt an die gewählte Sprache angepasst werden. Zusaetzlich muss das theme angepasst werden! 

git-svn-id: https://svn.libreccm.org/ccm/trunk@545 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2010-10-01 07:35:58 +00:00
parent e855c3e199
commit ec4bc5fa78
1 changed files with 71 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionRenderer.java
View File

@ -36,12 +36,14 @@ import com.arsdigita.web.URL;
import com.arsdigita.web.ParameterMap; import com.arsdigita.web.ParameterMap;
import com.arsdigita.web.Web; import com.arsdigita.web.Web;
// Quasimodo: End // Quasimodo: End
import java.text.DateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -224,7 +226,9 @@ public class DataCollectionRenderer extends LockableImpl {
private void outputValue(final Element item, final Object value, private void outputValue(final Element item, final Object value,
final String name, final String name,
final String[] paths, final int depth) { final String[] paths, final int depth) {
if( null == value ) return; if (null == value) {
return;
}
if (value instanceof DataAssociation) { if (value instanceof DataAssociation) {
DataAssociation assoc = (DataAssociation) value; DataAssociation assoc = (DataAssociation) value;
@ -235,21 +239,19 @@ public class DataCollectionRenderer extends LockableImpl {
} }
cursor.close(); cursor.close();
} } else if (value instanceof DataObject) {
else if( value instanceof DataObject ) {
try { try {
Object newValue = ((DataObject) value).get(paths[depth]); Object newValue = ((DataObject) value).get(paths[depth]);
outputValue(item, newValue, name, paths, depth + 1); outputValue(item, newValue, name, paths, depth + 1);
} catch (PersistenceException ex) { } catch (PersistenceException ex) {
valuePersistenceError(ex, paths, depth); valuePersistenceError(ex, paths, depth);
} }
} } else if (depth == paths.length) {
else if( depth == paths.length ) {
Element attribute = Navigation.newElement("attribute"); Element attribute = Navigation.newElement("attribute");
attribute.addAttribute("name", name); attribute.addAttribute("name", name);
attribute.setText(value.toString()); attribute.setText(value.toString());
// Special handling of Date - see ccm-core/src/com/arsdigita/domain/DomainObjectXMLRenderer.java
if (value instanceof Date) { if (value instanceof Date) {
Date date = (Date) value; Date date = (Date) value;
Calendar calDate = Calendar.getInstance(); Calendar calDate = Calendar.getInstance();
@ -260,11 +262,21 @@ public class DataCollectionRenderer extends LockableImpl {
attribute.addAttribute("hour", Integer.toString(calDate.get(Calendar.HOUR_OF_DAY))); attribute.addAttribute("hour", Integer.toString(calDate.get(Calendar.HOUR_OF_DAY)));
attribute.addAttribute("minute", Integer.toString(calDate.get(Calendar.MINUTE))); attribute.addAttribute("minute", Integer.toString(calDate.get(Calendar.MINUTE)));
attribute.addAttribute("second", Integer.toString(calDate.get(Calendar.SECOND))); attribute.addAttribute("second", Integer.toString(calDate.get(Calendar.SECOND)));
// Quasimodo: BEGIN
// Add attributes for date and time
Locale negLocale = com.arsdigita.dispatcher.DispatcherHelper.getNegotiatedLocale();
DateFormat dateFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM, negLocale);
DateFormat timeFormatter = DateFormat.getTimeInstance(DateFormat.SHORT, negLocale);
attribute.addAttribute("date", dateFormatter.format(date));
attribute.addAttribute("time", timeFormatter.format(date));
// Quasimodo: END
} }
item.addContent(attribute); item.addContent(attribute);
} else {
valuePersistenceError(null, paths, depth);
} }
else valuePersistenceError( null, paths, depth );
} }
private void valuePersistenceError( PersistenceException ex, private void valuePersistenceError( PersistenceException ex,
@ -273,12 +285,17 @@ public class DataCollectionRenderer extends LockableImpl {
msg.append("Attribute "); msg.append("Attribute ");
for (int i = 0; i <= depth; i++) { for (int i = 0; i <= depth; i++) {
msg.append(paths[i]); msg.append(paths[i]);
if( i != depth ) msg.append( '.' ); if (i != depth) {
msg.append('.');
}
} }
msg.append(" doesn't exist"); msg.append(" doesn't exist");
if( null == ex ) s_log.warn( msg.toString() ); if (null == ex) {
else s_log.warn( msg.toString(), ex ); s_log.warn(msg.toString());
} else {
s_log.warn(msg.toString(), ex);
}
} }
protected void generateItemXML(Element item, protected void generateItemXML(Element item,