Menu
▾
▴
andromdaplugins-cvs
|
From: Walter M. <wal...@us...> - 2007-09-03 00:24:31
|
User: walterim
Date: 07/09/02 17:24:31
Modified: andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2
JSFUtils.java
Log:
Added support to default dateTime format
Revision Changes Path
1.3 +5 -1 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/JSFUtils.java
Index: JSFUtils.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/JSFUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- JSFUtils.java 11 Dec 2006 13:43:58 -0000 1.2
+++ JSFUtils.java 3 Sep 2007 00:24:31 -0000 1.3
@@ -965,7 +965,11 @@
format = JSFUtils.getInputFormat(element);
if (format == null)
{
- if (type.isTimeType())
+ if(type.isDateType() && type.isTimeType())
+ {
+ format = defaultDateFormat+" "+defaultTimeFormat;
+ }
+ else if (type.isTimeType())
{
format = defaultTimeFormat;
}
|
|
From: Chad B. <cwb...@us...> - 2007-09-07 16:51:20
|
User: cwbrandon
Date: 07/09/07 09:42:48
Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration
validation.xml.vm
andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
JSFManageableEntityAttributeLogicImpl.java
JSFAttributeLogicImpl.java
JSFParameterLogicImpl.java
andromda-jsf2/src/main/uml JSFMetafacadeModel.xml.zip
andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2
JSFUtils.java
Log:
Fix generation of validation.xml for complex objects (wasn't using the nested name for the field name)
Revision Changes Path
1.3 +6 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/validation.xml.vm
Index: validation.xml.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/validation.xml.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- validation.xml.vm 11 Dec 2006 13:43:57 -0000 1.2
+++ validation.xml.vm 7 Sep 2007 16:42:48 -0000 1.3
@@ -22,7 +22,12 @@
#end
#end
#end
-#foreach ($validatorVar in $field.validatorVars)
+#if ($ownerParameter.complex)
+#set ($validatorVars = $field.getValidatorVars($ownerParameter))
+#else
+#set ($validatorVars = $field.validatorVars)
+#end
+#foreach ($validatorVar in $validatorVars)
#set ($varValue = $validatorVar.get(1))
#if ($field.equalValidator)
#set ($varValue = "${action.formBeanName}:${varValue}")
1.3 +2 -5 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityAttributeLogicImpl.java
Index: JSFManageableEntityAttributeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityAttributeLogicImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- JSFManageableEntityAttributeLogicImpl.java 20 Feb 2007 10:12:05 -0000 1.2
+++ JSFManageableEntityAttributeLogicImpl.java 7 Sep 2007 16:42:48 -0000 1.3
@@ -226,7 +226,8 @@
{
return JSFUtils.getValidatorVars(
((ModelElementFacade)this.THIS()),
- this.getType());
+ this.getType(),
+ null);
}
/**
@@ -561,8 +562,4 @@
return dateFormat;
}
-
-
-
-
}
\ No newline at end of file
1.2 +6 -5 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFAttributeLogicImpl.java
Index: JSFAttributeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFAttributeLogicImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- JSFAttributeLogicImpl.java 5 Dec 2006 19:39:09 -0000 1.1
+++ JSFAttributeLogicImpl.java 7 Sep 2007 16:42:48 -0000 1.2
@@ -393,13 +393,14 @@
}
/**
- * @see org.andromda.cartridges.jsf2.metafacades.JSFParameter#getValidatorVars()
+ * @see org.andromda.cartridges.jsf2.metafacades.JSFAttribute#getValidatorVars(JSFParameter)
*/
- protected java.util.Collection handleGetValidatorVars()
+ protected Collection handleGetValidatorVars(JSFParameter ownerParameter)
{
return JSFUtils.getValidatorVars(
((ModelElementFacade)this.THIS()),
- this.getType());
+ this.getType(),
+ ownerParameter);
}
/**
1.2 +6 -5 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFParameterLogicImpl.java
Index: JSFParameterLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFParameterLogicImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- JSFParameterLogicImpl.java 5 Dec 2006 19:39:09 -0000 1.1
+++ JSFParameterLogicImpl.java 7 Sep 2007 16:42:48 -0000 1.2
@@ -842,7 +842,8 @@
{
return JSFUtils.getValidatorVars(
((ModelElementFacade)this.THIS()),
- this.getType());
+ this.getType(),
+ null);
}
/**
1.8 +193 -178 cartridges/andromda-jsf2/src/main/uml/JSFMetafacadeModel.xml.zip
<<Binary file>>
1.4 +46 -26 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/JSFUtils.java
Index: JSFUtils.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/JSFUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- JSFUtils.java 3 Sep 2007 00:24:31 -0000 1.3
+++ JSFUtils.java 7 Sep 2007 16:42:48 -0000 1.4
@@ -478,6 +478,28 @@
}
/**
+ * Retrieves the "equal" value from the given element (if one is present).
+ *
+ * @param element the element from which to retrieve the equal value.
+ * @param ownerParameter the optional owner parameter (specified if the element is an attribute).
+ * @return the "equal" value.
+ */
+ public static java.lang.String getEqual(final ModelElementFacade element, final ParameterFacade ownerParameter)
+ {
+ String equal = null;
+ if (element != null)
+ {
+ final Object value = element.findTaggedValue(JSFProfile.TAGGEDVALUE_INPUT_EQUAL);
+ equal = value == null ? null : value.toString();
+ if (StringUtils.isNotBlank(equal) && ownerParameter != null)
+ {
+ equal = ownerParameter.getName() + StringUtilsHelper.upperCamelCaseName(equal);
+ }
+ }
+ return equal;
+ }
+
+ /**
* Retrieves the "validwhen" value from the given element (if one is present).
*
* @param element the element from which to retrieve the validwhen value.
@@ -691,11 +713,13 @@
*
* @param element the element from which to retrieve the variables
* @param type the type of the element.
+ * @param ownerParameter the optional owner parameter (if the element is an attribute for example).
* @return the collection of validator variables.
*/
public static java.util.Collection getValidatorVars(
final ModelElementFacade element,
- final ClassifierFacade type)
+ final ClassifierFacade type,
+ final ParameterFacade ownerParameter)
{
final Map vars = new LinkedHashMap();
if (element != null && type != null)
@@ -755,14 +779,10 @@
{
inputFormat = ((JSFParameter)element).getFormat();
}
- else if (element instanceof JSFManageableEntityAttribute)
- {
- inputFormat = ((JSFManageableEntityAttribute)element).getFormat();
- }
else
{
throw new RuntimeException("'element' is an invalid type, it must be either an instance of '" +
- JSFAttribute.class.getName() + "' or '" +JSFManageableEntityAttribute.class.getName() + "' or '" + JSFParameter.class.getName() + "'");
+ JSFAttribute.class.getName() + "' or '" + JSFParameter.class.getName() + "'");
}
if (JSFUtils.isDate(type))
{
@@ -798,7 +818,7 @@
Arrays.asList(new Object[] {test, validWhen}));
}
- final String equal = JSFUtils.getEqual(element);
+ final String equal = JSFUtils.getEqual(element, ownerParameter);
if (equal != null)
{
final String fieldName = "fieldName";
|
|
From: Walter M. <wal...@us...> - 2007-09-09 11:02:04
|
User: walterim
Date: 07/09/09 04:02:04
Modified: andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2
JSFUtils.java
Log:
The support to manageable entities was broken.
Revision Changes Path
1.5 +4 -0 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/JSFUtils.java
Index: JSFUtils.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/JSFUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- JSFUtils.java 7 Sep 2007 16:42:48 -0000 1.4
+++ JSFUtils.java 9 Sep 2007 11:02:04 -0000 1.5
@@ -779,6 +779,10 @@
{
inputFormat = ((JSFParameter)element).getFormat();
}
+ else if (element instanceof JSFManageableEntityAttribute)
+ {
+ inputFormat = ((JSFManageableEntityAttribute)element).getFormat();
+ }
else
{
throw new RuntimeException("'element' is an invalid type, it must be either an instance of '" +
|
|
From: Chad B. <cwb...@us...> - 2008-06-29 01:56:29
|
User: cwbrandon
Date: 08/06/28 18:56:38
Modified: andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
JSFUseCaseLogicImpl.java JSFForwardLogicImpl.java
andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2
JSFUtils.java
Log:
minor cleanup
Revision Changes Path
1.10 +3 -2 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java
Index: JSFUseCaseLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- JSFUseCaseLogicImpl.java 26 Apr 2008 17:36:15 -0000 1.9
+++ JSFUseCaseLogicImpl.java 29 Jun 2008 01:56:38 -0000 1.10
@@ -509,9 +509,10 @@
/**
* @see org.andromda.cartridges.jsf2.metafacades.JSFUseCase#getAllForwards()
*/
+ @SuppressWarnings("unchecked")
protected List handleGetAllForwards()
{
- final Map forwards = new LinkedHashMap();
+ final Map<String, ModelElementFacade> forwards = new LinkedHashMap<String, ModelElementFacade>();
for (final Iterator iterator = this.getActionForwards().iterator(); iterator.hasNext();)
{
final ModelElementFacade forward = (ModelElementFacade)iterator.next();
@@ -896,7 +897,7 @@
@Override
protected String handleGetPortletViewPath()
{
- return this.getInitialTargetPath();
+ return this.getPath();
}
@SuppressWarnings("unchecked")
1.2 +9 -8 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFForwardLogicImpl.java
Index: JSFForwardLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFForwardLogicImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- JSFForwardLogicImpl.java 5 Dec 2006 19:39:09 -0000 1.1
+++ JSFForwardLogicImpl.java 29 Jun 2008 01:56:38 -0000 1.2
@@ -81,9 +81,10 @@
* @return maps message keys to message values, but only those that match the arguments
* will have been recorded
*/
- private Map getMessages(String taggedValue)
+ @SuppressWarnings("unchecked")
+ private Map<String, String> getMessages(String taggedValue)
{
- Map messages;
+ Map<String, String> messages;
final Collection taggedValues = this.findTaggedValues(taggedValue);
if (taggedValues.isEmpty())
@@ -92,7 +93,7 @@
}
else
{
- messages = new LinkedHashMap(); // we want to keep the order
+ messages = new LinkedHashMap<String, String>(); // we want to keep the order
for (final Iterator iterator = taggedValues.iterator(); iterator.hasNext();)
{
1.7 +6 -6 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/JSFUtils.java
Index: JSFUtils.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/JSFUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- JSFUtils.java 21 Mar 2008 16:07:13 -0000 1.6
+++ JSFUtils.java 29 Jun 2008 01:56:38 -0000 1.7
@@ -56,7 +56,7 @@
* @return returns a list of String instances or an empty list
* @throws IllegalArgumentException when the input string does not match the required pattern
*/
- public static List parseValidatorArgs(String validatorTaggedValue)
+ public static List<String> parseValidatorArgs(String validatorTaggedValue)
{
if (validatorTaggedValue == null)
{
@@ -72,7 +72,7 @@
"@andromda.presentation.view.field.format?): " + validatorTaggedValue);
}
- final List validatorArgs = new ArrayList();
+ final List<String> validatorArgs = new ArrayList<String>();
// only keep what is between parentheses (if any)
int left = validatorTaggedValue.indexOf('(');
@@ -122,7 +122,7 @@
throw new IllegalArgumentException("Illegal validator tagged value: " + validatorTaggedValue);
}
- final List validatorVars = new ArrayList();
+ final List<String> validatorVars = new ArrayList<String>();
// only keep what is between parentheses (if any)
int left = validatorTaggedValue.indexOf('(');
@@ -583,7 +583,7 @@
final ModelElementFacade element,
final ClassifierFacade type)
{
- final Collection validatorTypesList = new ArrayList();
+ final Collection<String> validatorTypesList = new ArrayList<String>();
if (element != null && type != null)
{
final String format = JSFUtils.getInputFormat(element);
@@ -721,7 +721,7 @@
final ClassifierFacade type,
final ParameterFacade ownerParameter)
{
- final Map vars = new LinkedHashMap();
+ final Map<String, Object> vars = new LinkedHashMap<String, Object>();
if (element != null && type != null)
{
final String format = JSFUtils.getInputFormat(element);
@@ -866,7 +866,7 @@
final ModelElementFacade element,
final java.lang.String validatorType)
{
- final Collection args = new ArrayList();
+ final Collection<Object> args = new ArrayList<Object>();
if ("intRange".equals(validatorType) || "floatRange".equals(validatorType) ||
"doubleRange".equals(validatorType))
{
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X