Author: ilgrosso
Date: Thu Dec 13 17:07:29 2012
New Revision: 1421385
URL: http://svn.apache.org/viewvc?rev=1421385&view=rev
Log:
Removing some deprecated classes, yet to deal with the deprecated
org.apache.wicket.extensions.markup.html.tree package
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java?rev=1421385&r1=1421384&r2=1421385&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
Thu Dec 13 17:07:29 2012
@@ -124,7 +124,8 @@ public class AttributesPanel extends Pan
add(attributeView);
}
- private List<AttributeTO> initEntityData(final AbstractAttributableTO
entityTO, final Collection<SchemaTO> schemas) {
+ private List<AttributeTO> initEntityData(final AbstractAttributableTO
entityTO,
+ final Collection<SchemaTO> schemas) {
final List<AttributeTO> entityData = new ArrayList<AttributeTO>();
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java?rev=1421385&r1=1421384&r2=1421385&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java
Thu Dec 13 17:07:29 2012
@@ -19,12 +19,12 @@
package
org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table;
import java.util.Date;
+import org.apache.syncope.console.SyncopeSession;
import
org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import
org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
-import org.apache.syncope.console.SyncopeSession;
/**
* Format column's value as date string.
@@ -42,15 +42,12 @@ public class DatePropertyColumn<T> exten
@Override
public void populateItem(final Item<ICellPopulator<T>> item, final String
componentId, final IModel<T> rowModel) {
- IModel date = (IModel<Date>) createLabelModel(rowModel);
+ IModel<Object> date = getDataModel(rowModel);
String convertedDate = "";
-
- if (date.getObject() != null) {
+ if (date.getObject() instanceof Date) {
convertedDate =
SyncopeSession.get().getDateFormat().format(date.getObject());
- item.add(new Label(componentId, convertedDate));
- } else {
- item.add(new Label(componentId, convertedDate));
}
+ item.add(new Label(componentId, convertedDate));
}
}
\ No newline at end of file
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java?rev=1421385&r1=1421384&r2=1421385&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
Thu Dec 13 17:07:29 2012
@@ -62,7 +62,7 @@ public class DateTimeFieldPanel extends
private static final long serialVersionUID = -1107858522700306810L;
@Override
- protected void onUpdate(AjaxRequestTarget art) {
+ protected void onUpdate(final AjaxRequestTarget target) {
if (((DateTimeField) field).getHours() > 12) {
cal.set(Calendar.HOUR_OF_DAY, ((DateTimeField)
field).getHours());
} else {
@@ -151,18 +151,18 @@ public class DateTimeFieldPanel extends
public void validate(final Form form) {
final DateTimeField dateTimeField = (DateTimeField)
dateTimeComponents[0];
- if (!(dateTimeField.getDate() != null && dateTimeField.getHours()
!= null && dateTimeField.getMinutes() != null)) {
+ if (!(dateTimeField.getDate() != null && dateTimeField.getHours()
!= null
+ && dateTimeField.getMinutes() != null)) {
ValidationError ve = new ValidationError();
ve.setVariables(DateTimeFormValidator.this.variablesMap());
- ve.addMessageKey(resourceKey());
+ ve.addKey(resourceKey());
dateTimeComponents[0].error((IValidationError) ve);
}
}
}
public FieldPanel setFormValidator(final Form form) {
-
if (field == null) {
LOG.error("Error setting form validator");
} else {
@@ -174,22 +174,14 @@ public class DateTimeFieldPanel extends
}
@Override
- public FieldPanel setStyleSheet(String classes) {
- field.get("date").add(AttributeModifier.replace("class", (classes !=
null
- ? classes
- : "") + " date_size"));
-
- field.get("hours").add(AttributeModifier.replace("class", classes !=
null
- ? classes
- : ""));
-
- field.get("minutes").add(AttributeModifier.replace("class", classes !=
null
- ? classes
- : ""));
-
- field.get("amOrPmChoice").add(AttributeModifier.replace("class",
classes != null
- ? classes
- : ""));
+ public FieldPanel setStyleSheet(final String classes) {
+ field.get("date").add(AttributeModifier.replace("class", (classes ==
null ? "" : classes) + " date_size"));
+
+ field.get("hours").add(AttributeModifier.replace("class", classes ==
null ? "" : classes));
+
+ field.get("minutes").add(AttributeModifier.replace("class", classes ==
null ? "" : classes));
+
+ field.get("amOrPmChoice").add(AttributeModifier.replace("class",
classes == null ? "" : classes));
return this;
}
