From: Vance K. <va...@us...> - 2006-01-03 01:38:59
|
User: vancek Date: 06/01/02 17:38:53 Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades EJB3FinderMethodArgumentFacadeLogicImpl.java Log: renamed constants Revision Changes Path 1.2 +6 -5 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodArgumentFacadeLogicImpl.java Index: EJB3FinderMethodArgumentFacadeLogicImpl.java =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodArgumentFacadeLogicImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- EJB3FinderMethodArgumentFacadeLogicImpl.java 28 Dec 2005 00:32:55 -0000 1.1 +++ EJB3FinderMethodArgumentFacadeLogicImpl.java 3 Jan 2006 01:38:53 -0000 1.2 @@ -1,5 +1,6 @@ package org.andromda.cartridges.ejb3.metafacades; +import org.andromda.cartridges.ejb3.EJB3Globals; import org.andromda.cartridges.ejb3.EJB3Profile; import org.andromda.metafacades.uml.ClassifierFacade; import org.apache.commons.lang.StringUtils; @@ -34,15 +35,15 @@ if (!classifier.isPrimitive()) { if (classifier.isDateType()) { - temporalType = EJB3Profile.TEMPORALTYPE_DATE; + temporalType = EJB3Globals.TEMPORAL_TYPE_DATE; } else if (classifier.isTimeType()) { - temporalType = EJB3Profile.TEMPORALTYPE_TIME; + temporalType = EJB3Globals.TEMPORAL_TYPE_TIME; } else if (classifier.getName().equals("Timestamp")) { - temporalType = EJB3Profile.TEMPORALTYPE_TIMESTAMP; + temporalType = EJB3Globals.TEMPORAL_TYPE_TIMESTAMP; } } } @@ -60,7 +61,7 @@ (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_FINDER_PARAMETER_RESULT_TYPE); if (StringUtils.isNotBlank(resultType)) { - if (resultType.equalsIgnoreCase(EJB3Profile.FINDER_RESULTTYPE_FIRST)) + if (resultType.equalsIgnoreCase(EJB3Globals.FINDER_RESULT_TYPE_FIRST)) { firstResult = true; } @@ -78,7 +79,7 @@ (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_FINDER_PARAMETER_RESULT_TYPE); if (StringUtils.isNotBlank(resultType)) { - if (resultType.equalsIgnoreCase(EJB3Profile.FINDER_RESULTTYPE_MAX)) + if (resultType.equalsIgnoreCase(EJB3Globals.FINDER_RESULT_TYPE_MAX)) { maxResults = true; } |
From: Vance K. <va...@us...> - 2006-01-25 03:01:43
|
User: vancek Date: 06/01/24 19:01:38 Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades EJB3FinderMethodArgumentFacadeLogicImpl.java Log: added isEnumerationTypeOrdinal and isEnumerationTypeString Revision Changes Path 1.3 +38 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodArgumentFacadeLogicImpl.java Index: EJB3FinderMethodArgumentFacadeLogicImpl.java =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodArgumentFacadeLogicImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- EJB3FinderMethodArgumentFacadeLogicImpl.java 3 Jan 2006 01:38:53 -0000 1.2 +++ EJB3FinderMethodArgumentFacadeLogicImpl.java 25 Jan 2006 03:01:36 -0000 1.3 @@ -2,6 +2,7 @@ import org.andromda.cartridges.ejb3.EJB3Globals; import org.andromda.cartridges.ejb3.EJB3Profile; +import org.andromda.metafacades.uml.AttributeFacade; import org.andromda.metafacades.uml.ClassifierFacade; import org.apache.commons.lang.StringUtils; @@ -87,4 +88,41 @@ return maxResults; } + /** + * @see org.andromda.cartridges.ejb3.metafacades.EJB3FinderMethodArgumentFacadeLogic# + * handleIsEnumerationTypeOrdinal() + */ + protected boolean handleIsEnumerationTypeOrdinal() + { + //AttributeFacade attribute = this.getType().findAttribute(this.getName()); + boolean ordinalType = false; + if (this.getType().isEnumeration()) + { + AttributeFacade literal = (AttributeFacade)this.getType().getAttributes().iterator().next(); + if (!literal.getType().isStringType()) + { + ordinalType = true; + } + } + return ordinalType; + } + + /** + * @see org.andromda.cartridges.ejb3.metafacades.EJB3FinderMethodArgumentFacadeLogic# + * handleGetEnumerationTypeString() + */ + protected boolean handleIsEnumerationTypeString() + { + boolean stringType = false; + if (this.getType().isEnumeration()) + { + AttributeFacade literal = (AttributeFacade)this.getType().getAttributes().iterator().next(); + if (literal.getType().isStringType()) + { + stringType = true; + } + } + return stringType; + } + } \ No newline at end of file |
From: Vance K. <va...@us...> - 2006-02-06 04:04:55
|
User: vancek Date: 06/02/05 20:04:39 Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades EJB3FinderMethodArgumentFacadeLogicImpl.java Log: fixed getTemporalType to reference TAGGEDVALUE_PERSISTENCE_TEMPORAL_TYPE Revision Changes Path 1.4 +1 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodArgumentFacadeLogicImpl.java Index: EJB3FinderMethodArgumentFacadeLogicImpl.java =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodArgumentFacadeLogicImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- EJB3FinderMethodArgumentFacadeLogicImpl.java 25 Jan 2006 03:01:36 -0000 1.3 +++ EJB3FinderMethodArgumentFacadeLogicImpl.java 6 Feb 2006 04:04:39 -0000 1.4 @@ -27,7 +27,7 @@ protected java.lang.String handleGetTemporalType() { String temporalType = - (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_FINDER_PARAMETER_TEMPORAL_TYPE); + (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_TEMPORAL_TYPE); if (StringUtils.isBlank(temporalType)) { ClassifierFacade classifier = this.getType(); |
From: Vance K. <va...@us...> - 2006-02-08 10:17:12
|
User: vancek Date: 06/02/08 02:17:07 Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades EJB3FinderMethodArgumentFacadeLogicImpl.java Log: isFirstResult and isMaxResults now check for corresponding stereotypes rather than tagged value Revision Changes Path 1.5 +2 -22 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodArgumentFacadeLogicImpl.java Index: EJB3FinderMethodArgumentFacadeLogicImpl.java =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodArgumentFacadeLogicImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- EJB3FinderMethodArgumentFacadeLogicImpl.java 6 Feb 2006 04:04:39 -0000 1.4 +++ EJB3FinderMethodArgumentFacadeLogicImpl.java 8 Feb 2006 10:17:07 -0000 1.5 @@ -57,17 +57,7 @@ */ protected boolean handleIsFirstResult() { - boolean firstResult = false; - String resultType = - (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_FINDER_PARAMETER_RESULT_TYPE); - if (StringUtils.isNotBlank(resultType)) - { - if (resultType.equalsIgnoreCase(EJB3Globals.FINDER_RESULT_TYPE_FIRST)) - { - firstResult = true; - } - } - return firstResult; + return this.hasStereotype(EJB3Profile.STEREOTYPE_FINDER_RESULT_TYPE_FIRST); } /** @@ -75,17 +65,7 @@ */ protected boolean handleIsMaxResults() { - boolean maxResults = false; - String resultType = - (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_FINDER_PARAMETER_RESULT_TYPE); - if (StringUtils.isNotBlank(resultType)) - { - if (resultType.equalsIgnoreCase(EJB3Globals.FINDER_RESULT_TYPE_MAX)) - { - maxResults = true; - } - } - return maxResults; + return this.hasStereotype(EJB3Profile.STEREOTYPE_FINDER_RESULT_TYPE_MAX); } /** |
From: Vance K. <va...@us...> - 2006-02-10 09:16:16
|
User: vancek Date: 06/02/10 01:16:03 Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades EJB3FinderMethodArgumentFacadeLogicImpl.java Log: removed comment Revision Changes Path 1.6 +0 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodArgumentFacadeLogicImpl.java Index: EJB3FinderMethodArgumentFacadeLogicImpl.java =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodArgumentFacadeLogicImpl.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -r1.5 -r1.6 --- EJB3FinderMethodArgumentFacadeLogicImpl.java 8 Feb 2006 10:17:07 -0000 1.5 +++ EJB3FinderMethodArgumentFacadeLogicImpl.java 10 Feb 2006 09:16:02 -0000 1.6 @@ -74,7 +74,6 @@ */ protected boolean handleIsEnumerationTypeOrdinal() { - //AttributeFacade attribute = this.getType().findAttribute(this.getName()); boolean ordinalType = false; if (this.getType().isEnumeration()) { |