Menu
▾
▴
[Andromda-cvs] SF.net SVN: andromda:[13160] trunk/cartridges
|
From: <cat...@us...> - 2009-12-04 13:43:42
|
Revision: 13160
http://andromda.svn.sourceforge.net/andromda/?rev=13160&view=rev
Author: catforce
Date: 2009-12-04 13:43:34 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
- Use more Java 1.5 features
Modified Paths:
--------------
trunk/cartridges/andromda-hibernate/src/java/org/andromda/cartridges/hibernate/metafacades/HibernateEntityLogicImpl.java
trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/SpringUtils.java
trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringCriteriaAttributeLogicImpl.java
trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringDependencyLogicImpl.java
trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringEntityLogicImpl.java
trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringManageableEntityLogicImpl.java
trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringMetafacadeUtils.java
trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringQueryOperationLogicImpl.java
Modified: trunk/cartridges/andromda-hibernate/src/java/org/andromda/cartridges/hibernate/metafacades/HibernateEntityLogicImpl.java
===================================================================
--- trunk/cartridges/andromda-hibernate/src/java/org/andromda/cartridges/hibernate/metafacades/HibernateEntityLogicImpl.java 2009-12-03 12:24:12 UTC (rev 13159)
+++ trunk/cartridges/andromda-hibernate/src/java/org/andromda/cartridges/hibernate/metafacades/HibernateEntityLogicImpl.java 2009-12-04 13:43:34 UTC (rev 13160)
@@ -79,7 +79,7 @@
/**
* Stores the valid inheritance strategies.
*/
- private static final Collection<String> inheritanceStrategies = new ArrayList();
+ private static final Collection<String> inheritanceStrategies = new ArrayList<String>();
static
{
@@ -319,7 +319,7 @@
String version = (String)this.getConfiguredProperty(HibernateGlobals.HIBERNATE_VERSION);
value = version.equals(HibernateGlobals.HIBERNATE_VERSION_2) ? "false" : "true";
}
- return Boolean.valueOf(value).booleanValue();
+ return Boolean.valueOf(value);
}
@Override
@@ -436,7 +436,7 @@
return MessageFormat.format(
entityNamePattern,
- new Object[] {StringUtils.trimToEmpty(this.getName())});
+ StringUtils.trimToEmpty(this.getName()));
}
@Override
@@ -450,7 +450,7 @@
return MessageFormat.format(
implNamePattern,
- new Object[] {StringUtils.trimToEmpty(this.getName())});
+ StringUtils.trimToEmpty(this.getName()));
}
@Override
@@ -530,7 +530,7 @@
hibernateProxy = (String)this.getConfiguredProperty(HIBERNATE_PROXY);
}
- return Boolean.valueOf(hibernateProxy).booleanValue();
+ return Boolean.valueOf(hibernateProxy);
}
@Override
@@ -539,7 +539,7 @@
*/
protected int handleGetEhCacheMaxElementsInMemory()
{
- String maxElements = null;
+ String maxElements;
maxElements = (String)this.findTaggedValue(HibernateProfile.TAGGEDVALUE_HIBERNATE_EHCACHE_MAX_ELEMENTS);
if (StringUtils.isBlank(maxElements))
@@ -561,7 +561,7 @@
{
eternal = (String)this.getConfiguredProperty(HibernateGlobals.HIBERNATE_EHCACHE_ETERNAL);
}
- return Boolean.valueOf(StringUtils.trimToEmpty(eternal)).booleanValue();
+ return Boolean.valueOf(StringUtils.trimToEmpty(eternal));
}
@Override
@@ -611,7 +611,7 @@
eternal = (String)this.getConfiguredProperty(HibernateGlobals.HIBERNATE_EHCACHE_OVERFLOW_TO_DISK);
}
- return Boolean.valueOf(StringUtils.trimToEmpty(eternal)).booleanValue();
+ return Boolean.valueOf(StringUtils.trimToEmpty(eternal));
}
@Override
@@ -621,13 +621,13 @@
protected boolean handleIsHibernateCacheDistributed()
{
String distributed = (String)this.getConfiguredProperty(HibernateGlobals.HIBERNATE_ENTITYCACHE_DISTRIBUTED);
- boolean distributedCachingEnabled = Boolean.valueOf(StringUtils.trimToEmpty(distributed)).booleanValue();
+ boolean distributedCachingEnabled = Boolean.valueOf(StringUtils.trimToEmpty(distributed));
if (distributedCachingEnabled)
{
String entityCacheDistributed =
(String)this.findTaggedValue(HibernateProfile.TAGGEDVALUE_HIBERNATE_ENTITYCACHE_DISTRIBUTED);
- return Boolean.valueOf(StringUtils.trimToEmpty(entityCacheDistributed)).booleanValue();
+ return Boolean.valueOf(StringUtils.trimToEmpty(entityCacheDistributed));
}
return false;
}
@@ -699,7 +699,7 @@
if ((superEntity != null) && superEntity.isHibernateInheritanceSubclass())
{
- column = ((EntityAttribute)this.getIdentifiers().iterator().next()).getColumnName();
+ column = (this.getIdentifiers().iterator().next()).getColumnName();
}
return column;
@@ -765,7 +765,7 @@
dynamicInsert = (String)this.getConfiguredProperty(HibernateGlobals.HIBERNATE_ENTITY_DYNAMIC_INSERT);
}
- return Boolean.valueOf(dynamicInsert).booleanValue();
+ return Boolean.valueOf(dynamicInsert);
}
@Override
@@ -782,7 +782,7 @@
dynamicUpdate = (String)this.getConfiguredProperty(HibernateGlobals.HIBERNATE_ENTITY_DYNAMIC_UPDATE);
}
- return Boolean.valueOf(dynamicUpdate).booleanValue();
+ return Boolean.valueOf(dynamicUpdate);
}
@Override
Modified: trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/SpringUtils.java
===================================================================
--- trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/SpringUtils.java 2009-12-03 12:24:12 UTC (rev 13159)
+++ trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/SpringUtils.java 2009-12-04 13:43:34 UTC (rev 13160)
@@ -313,7 +313,7 @@
*/
public String getClassName(String fullyQualifiedName)
{
- String className = null;
+ String className = "";
if (StringUtils.isNotBlank(fullyQualifiedName))
{
int lastDot = fullyQualifiedName.lastIndexOf('.');
@@ -326,10 +326,6 @@
className = fullyQualifiedName;
}
}
- else
- {
- className = "";
- }
return className;
}
@@ -342,16 +338,12 @@
*/
public String getPackageName(String fullyQualifiedName)
{
- String packageName = null;
+ String packageName = "";
if (StringUtils.isNotBlank(fullyQualifiedName))
{
int lastDot = fullyQualifiedName.lastIndexOf('.');
packageName = (lastDot >= 0 ? fullyQualifiedName.substring(0, lastDot) : "");
}
- else
- {
- packageName = "";
- }
return packageName;
}
@@ -369,20 +361,18 @@
{
final Map<String, ModelElementFacade> filteredElements = new LinkedHashMap<String, ModelElementFacade>();
- for (final Iterator<ModelElementFacade> elementIterator = modelElements.iterator(); elementIterator.hasNext();)
+ for (final ModelElementFacade modelElement : modelElements)
{
/*final Object object = elementIterator.next();
if (object instanceof ModelElementFacade)
{*/
- final ModelElementFacade modelElement = elementIterator.next();
- if (!filteredElements.containsKey(modelElement.getName()))
- {
- filteredElements.put(modelElement.getName(), modelElement);
- }
+ if (!filteredElements.containsKey(modelElement.getName())) {
+ filteredElements.put(modelElement.getName(), modelElement);
+ }
/*}*/
}
- return new ArrayList(filteredElements.values());
+ return new ArrayList<ModelElementFacade>(filteredElements.values());
}
/**
Modified: trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringCriteriaAttributeLogicImpl.java
===================================================================
--- trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringCriteriaAttributeLogicImpl.java 2009-12-03 12:24:12 UTC (rev 13159)
+++ trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringCriteriaAttributeLogicImpl.java 2009-12-04 13:43:34 UTC (rev 13160)
@@ -146,8 +146,7 @@
{
matchMode = String.valueOf(value);
}
- String result = StringUtils.trimToEmpty(matchMode);
- return result;
+ return StringUtils.trimToEmpty(matchMode);
}
/**
@@ -264,6 +263,6 @@
{
value = this.getConfiguredProperty(HIBERNATE_CRITERIA_QUERY_IGNORE_CASE);
}
- return Boolean.valueOf(ObjectUtils.toString(value)).booleanValue();
+ return Boolean.valueOf(ObjectUtils.toString(value));
}
}
\ No newline at end of file
Modified: trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringDependencyLogicImpl.java
===================================================================
--- trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringDependencyLogicImpl.java 2009-12-03 12:24:12 UTC (rev 13159)
+++ trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringDependencyLogicImpl.java 2009-12-04 13:43:34 UTC (rev 13160)
@@ -119,8 +119,9 @@
boolean breakOut = false;
for (int ctr = hierarchy.size() - 1; ctr >= 0; ctr--)
{
- final SpringEntity generalization = (SpringEntity)hierarchy.get(ctr);
- for (final Iterator<ClassifierFacade> referenceIterator = generalization.getValueObjectReferences().iterator();
+ final SpringEntity generalization = hierarchy.get(ctr);
+ //TODO Bug? generalization.getValueObjectReferences() can contains not only ClassiefierFacades
+ for (final Iterator referenceIterator = generalization.getValueObjectReferences().iterator();
referenceIterator.hasNext();)
{
final Object reference = referenceIterator.next();
Modified: trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringEntityLogicImpl.java
===================================================================
--- trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringEntityLogicImpl.java 2009-12-03 12:24:12 UTC (rev 13159)
+++ trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringEntityLogicImpl.java 2009-12-04 13:43:34 UTC (rev 13160)
@@ -216,7 +216,7 @@
final String entityNamePattern = (String)this.getConfiguredProperty("entityNamePattern");
return MessageFormat.format(
entityNamePattern,
- new Object[] {StringUtils.trimToEmpty(this.getName())});
+ StringUtils.trimToEmpty(this.getName()));
}
/**
@@ -238,11 +238,9 @@
protected Object handleGetRoot()
{
GeneralizableElementFacade generalization = this;
- for (
- ; generalization.getGeneralization() != null && generalization instanceof SpringEntity;
- generalization = generalization.getGeneralization())
+ while(generalization.getGeneralization() != null && generalization instanceof SpringEntity)
{
- ;
+ generalization = generalization.getGeneralization();
}
return generalization;
}
Modified: trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringManageableEntityLogicImpl.java
===================================================================
--- trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringManageableEntityLogicImpl.java 2009-12-03 12:24:12 UTC (rev 13159)
+++ trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringManageableEntityLogicImpl.java 2009-12-04 13:43:34 UTC (rev 13160)
@@ -34,13 +34,7 @@
protected String handleGetDaoReferenceName()
{
- final char[] name = getName().toCharArray();
- if (name.length > 0)
- {
- name[0] = Character.toLowerCase(name[0]);
- }
-
- return new String(name) + "Dao";
+ return StringUtils.uncapitalize(getName()) + "Dao";
}
protected String handleGetManageableDaoName()
Modified: trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringMetafacadeUtils.java
===================================================================
--- trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringMetafacadeUtils.java 2009-12-03 12:24:12 UTC (rev 13159)
+++ trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringMetafacadeUtils.java 2009-12-04 13:43:34 UTC (rev 13160)
@@ -65,7 +65,7 @@
static String getServiceRemotingType(ClassifierFacade classifier, String defaultServiceRemotingType)
{
ExceptionUtils.checkNull("classifer", classifier);
- String remotingType = null;
+ String remotingType = "";
if (classifier.hasStereotype(UMLProfile.STEREOTYPE_SERVICE))
{
String remotingTypeValue = (String)classifier.findTaggedValue(
@@ -149,7 +149,7 @@
static String getServiceRemotePort(ClassifierFacade classifier, String defaultRemoteServicePort)
{
ExceptionUtils.checkNull("classifer", classifier);
- String remoteServicePort = null;
+ String remoteServicePort = "";
if (classifier.hasStereotype(UMLProfile.STEREOTYPE_SERVICE))
{
String remoteServicePortValue = (String)classifier.findTaggedValue(
@@ -196,7 +196,7 @@
.findTaggedValue(SpringProfile.TAGGEDVALUE_HIBERNATE_USE_NAMED_PARAMETERS));
if (StringUtils.isNotEmpty(useNamedParametersValue))
{
- useNamedParameters = Boolean.valueOf(useNamedParametersValue).booleanValue();
+ useNamedParameters = Boolean.valueOf(useNamedParametersValue);
}
}
return useNamedParameters;
Modified: trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringQueryOperationLogicImpl.java
===================================================================
--- trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringQueryOperationLogicImpl.java 2009-12-03 12:24:12 UTC (rev 13159)
+++ trunk/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringQueryOperationLogicImpl.java 2009-12-04 13:43:34 UTC (rev 13160)
@@ -70,7 +70,6 @@
protected boolean handleIsUseNamedParameters()
{
boolean useNamedParameters = Boolean.valueOf(String.valueOf(this.getConfiguredProperty(USE_NAMED_PARAMETERS)))
- .booleanValue()
|| StringUtils.isNotBlank(this.getTranslatedQuery());
return SpringMetafacadeUtils.getUseNamedParameters(this, useNamedParameters);
@@ -92,9 +91,8 @@
protected ParameterFacade handleGetCriteriaArgument()
{
ParameterFacade foundParameter = null;
- for (final Iterator<ParameterFacade> iterator = this.getParameters().iterator(); iterator.hasNext();)
+ for (final ParameterFacade parameter : this.getParameters())
{
- final ParameterFacade parameter = (ParameterFacade)iterator.next();
final ClassifierFacade type = parameter.getType();
if (type != null && type.hasStereotype(UMLProfile.STEREOTYPE_CRITERIA))
{
@@ -146,51 +144,48 @@
}
String variableName = StringUtils.uncapitalize(owner.getName());
queryString = "from " + entityName + " as " + variableName;
- if (this.getArguments().size() > 0)
+ if (!this.getArguments().isEmpty())
{
queryString += " where";
Collection<ParameterFacade> arguments = this.getArguments();
- if (arguments != null && !arguments.isEmpty())
+ Iterator<ParameterFacade> iterator = arguments.iterator();
+ while(iterator.hasNext())
{
- final Iterator<ParameterFacade> iterator = arguments.iterator();
- for (int ctr = 0; iterator.hasNext(); ctr++)
+ final ParameterFacade argument = iterator.next();
+ final ClassifierFacade type = argument.getType();
+ if (type != null)
{
- ParameterFacade argument = (ParameterFacade)iterator.next();
- final ClassifierFacade type = argument.getType();
- if (type != null)
+ final String parameterName = argument.getName();
+ if (type.isEmbeddedValue())
{
- final String parameterName = argument.getName();
- if (type.isEmbeddedValue())
+ for (final Iterator<AttributeFacade> attributeIterator = type.getAttributes(true).iterator(); attributeIterator.hasNext();)
{
- for (final Iterator<AttributeFacade> attributeIterator = type.getAttributes(true).iterator(); attributeIterator.hasNext();)
- {
- final AttributeFacade attribute = (AttributeFacade)attributeIterator.next();
- String parameter = "?";
- if (this.isUseNamedParameters())
- {
- parameter = ':' + SpringUtils.concatNamesCamelCase(Arrays.asList(new String[]{parameterName, attribute.getName()}));
- }
- queryString += ' ' + variableName + '.' + parameterName + '.' + attribute.getName() + " = " + parameter;
- if (attributeIterator.hasNext())
- {
- queryString += " and";
- }
- }
- }
- else
- {
+ final AttributeFacade attribute = attributeIterator.next();
String parameter = "?";
if (this.isUseNamedParameters())
{
- parameter = ':' + parameterName;
+ parameter = ':' + SpringUtils.concatNamesCamelCase(Arrays.asList(parameterName, attribute.getName()));
}
- queryString += ' ' + variableName + '.' + parameterName + " = " + parameter;
- if (iterator.hasNext())
+ queryString += ' ' + variableName + '.' + parameterName + '.' + attribute.getName() + " = " + parameter;
+ if (attributeIterator.hasNext())
{
queryString += " and";
}
}
}
+ else
+ {
+ String parameter = "?";
+ if (this.isUseNamedParameters())
+ {
+ parameter = ':' + parameterName;
+ }
+ queryString += ' ' + variableName + '.' + parameterName + " = " + parameter;
+ if (iterator.hasNext())
+ {
+ queryString += " and";
+ }
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|