You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2008/09/30 15:30:40 UTC
svn commit: r700466 - in
/labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view:
AddToUserToBeans.aj AddViewSettingsToPropertyInfo.aj tree/ViewUtils.java
Author: simoneg
Date: Tue Sep 30 06:30:40 2008
New Revision: 700466
URL: http://svn.apache.org/viewvc?rev=700466&view=rev
Log:
Refactoring of converters after adding formatters, to unify and better handle conversions
Modified:
labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/AddToUserToBeans.aj
labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/AddViewSettingsToPropertyInfo.aj
labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/ViewUtils.java
Modified: labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/AddToUserToBeans.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/AddToUserToBeans.aj?rev=700466&r1=700465&r2=700466&view=diff
==============================================================================
--- labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/AddToUserToBeans.aj (original)
+++ labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/AddToUserToBeans.aj Tue Sep 30 06:30:40 2008
@@ -50,7 +50,8 @@
if (b.toUserNodes.size() > 0) {
StringBuffer ret = new StringBuffer();
for (FieldNode fieldNode : b.toUserNodes) {
- ret.append(ViewUtils.getStringNodeValue(fieldNode, this));
+ Object value = ViewUtils.getNodeValue(fieldNode, this);
+ ret.append(fieldNode.getProperty().toUser(value));
ret.append(" ");
}
return ret.toString();
Modified: labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/AddViewSettingsToPropertyInfo.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/AddViewSettingsToPropertyInfo.aj?rev=700466&r1=700465&r2=700466&view=diff
==============================================================================
--- labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/AddViewSettingsToPropertyInfo.aj (original)
+++ labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/AddViewSettingsToPropertyInfo.aj Tue Sep 30 06:30:40 2008
@@ -16,6 +16,7 @@
*/
package org.apache.magma.view;
+import org.apache.magma.beans.MagmaBeanSupport;
import org.apache.magma.beans.PropertyInfo;
import org.apache.magma.view.tree.ViewUtils;
@@ -52,5 +53,16 @@
}
}
}
+
+ String around(PropertyInfo info, Object value) :
+ execution(String PropertyInfo.toUser(Object)) &&
+ this(info) && args(value) {
+ if (value instanceof MagmaBeanSupport) {
+ return ((MagmaBeanSupport)value).toUser();
+ }
+ return proceed(info, value);
+ }
+
+
}
Modified: labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/ViewUtils.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/ViewUtils.java?rev=700466&r1=700465&r2=700466&view=diff
==============================================================================
--- labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/ViewUtils.java (original)
+++ labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/ViewUtils.java Tue Sep 30 06:30:40 2008
@@ -316,9 +316,27 @@
return root;
}
+ /*
public static String getStringNodeValue(FieldNode node, MagmaBeanSupport bean) {
Object value = getNodeValue(node, bean);
- return getStringValue(value);
+ return getStringValue(bean, node.property, value);
+ }
+
+ public static String getStringValue(MagmaBeanSupport bean, PropertyInfo property, Object value) {
+ if (value == null) return "";
+ if (value instanceof MagmaBeanSupport) {
+ return ((MagmaBeanSupport)value).toUser();
+ } else {
+ Converter conv = property.getConverter();
+ if (conv != null) {
+ return conv.toString(value);
+ }
+ conv = Converters.getConverterFor(value.getClass());
+ if (conv != null) {
+ return conv.toString(value);
+ }
+ }
+ return value.toString();
}
public static String getStringValue(Object value) {
@@ -333,6 +351,7 @@
}
return value.toString();
}
+ */
public static Object getNodeValue(FieldNode node, MagmaBeanSupport bean) {
MagmaBeanSupport acbean = findProperBean(node, bean, false);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org