Author: nmalin
Date: Wed Jul 6 12:18:32 2016 New Revision: 1751667 URL: http://svn.apache.org/viewvc?rev=1751667&view=rev Log: no functionnal change, remove space end line Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericHelperInfo.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java?rev=1751667&r1=1751666&r2=1751667&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java Wed Jul 6 12:18:32 2016 @@ -908,10 +908,10 @@ public interface Delegator { * @throws GenericEntityException */ int storeByCondition(String entityName, Map<String, ? extends Object> fieldsToSet, EntityCondition condition) throws GenericEntityException; - + /** * Get use of Distributed Cache Clear mechanism status * @return boolean true if this delegator uses a Distributed Cache Clear mechanism */ - boolean useDistributedCacheClear(); + boolean useDistributedCacheClear(); } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java?rev=1751667&r1=1751666&r2=1751667&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java Wed Jul 6 12:18:32 2016 @@ -31,7 +31,7 @@ import org.ofbiz.entity.model.ModelEntit */ @SuppressWarnings("serial") public class GenericValue extends GenericEntity { - + public static final GenericValue NULL_VALUE = new NullGenericValue(); /** Creates new GenericValue */ @@ -241,8 +241,8 @@ public class GenericValue extends Generi return "[null-entity-value]"; } } - + public static String getStackTraceAsString() { return Thread.currentThread().getStackTrace().toString(); - } + } } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java?rev=1751667&r1=1751666&r2=1751667&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java Wed Jul 6 12:18:32 2016 @@ -224,7 +224,7 @@ public abstract class EntityFunction<T e public void setModelField(ModelField field) { this.field = field; } - + @Override public void validateSql(ModelEntity modelEntity) throws GenericModelException { if (nested != null) { Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java?rev=1751667&r1=1751666&r2=1751667&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java Wed Jul 6 12:18:32 2016 @@ -75,14 +75,14 @@ public class OrderByItem implements Comp public static final OrderByItem parse(String text) { text = text.trim(); - + // handle nulls first/last Boolean nullsFirst = null; if (text.toUpperCase().endsWith(NULLS_FIRST)) { nullsFirst = true; text = text.substring(0, text.length() - NULLS_FIRST.length()).trim(); } - + if (text.toUpperCase().endsWith(NULLS_LAST)) { nullsFirst = false; text = text.substring(0, text.length() - NULLS_LAST.length()).trim(); @@ -183,10 +183,10 @@ public class OrderByItem implements Comp sb.append(nullsFirst ? "1" : "0"); sb.append(" END, "); } - + getValue().addSqlValue(sb, modelEntity, null, includeTablenamePrefix, datasourceInfo); sb.append(descending ? " DESC" : " ASC"); - + if ((nullsFirst != null) && (datasourceInfo.getUseOrderByNulls())) { sb.append(nullsFirst ? " NULLS FIRST" : " NULLS LAST"); } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java?rev=1751667&r1=1751666&r2=1751667&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java Wed Jul 6 12:18:32 2016 @@ -754,7 +754,7 @@ public class GenericDAO { // OFFSET clause makeOffsetString(sqlBuffer, findOptions); - + // make the final SQL String String sql = sqlBuffer.toString(); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericHelperInfo.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericHelperInfo.java?rev=1751667&r1=1751666&r2=1751667&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericHelperInfo.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericHelperInfo.java Wed Jul 6 12:18:32 2016 @@ -34,7 +34,7 @@ public final class GenericHelperInfo { private String overrideUsername = ""; private String overridePassword = ""; private String helperFullName = ""; - + public GenericHelperInfo(String entityGroupName, String helperBaseName) { this.entityGroupName = entityGroupName == null ? "" : entityGroupName; this.helperBaseName = helperBaseName == null ? "" : helperBaseName; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java?rev=1751667&r1=1751666&r2=1751667&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java Wed Jul 6 12:18:32 2016 @@ -80,10 +80,10 @@ public class PrimaryKeyFinder extends Fi boolean autoFieldMapBool = !"false".equals(autoFieldMapString); ModelEntity modelEntity = delegator.getModelEntity(entityName); - if (modelEntity == null) { + if (modelEntity == null) { throw new IllegalArgumentException("No entity definition found for entity name [" + entityName + "]"); } - + GenericValue valueOut = runFind(modelEntity, context, delegator, useCacheBool, autoFieldMapBool, this.fieldMap, this.selectFieldExpanderList); //Debug.logInfo("PrimaryKeyFinder: valueOut=" + valueOut, module); @@ -124,7 +124,7 @@ public class PrimaryKeyFinder extends Fi EntityFinderUtil.expandFieldMapToContext(fieldMap, context, entityContext); //Debug.logInfo("PrimaryKeyFinder: entityContext=" + entityContext, module); // then convert the types... - + // need the timeZone and locale for conversion, so add here and remove after entityContext.put("locale", context.get("locale")); entityContext.put("timeZone", context.get("timeZone")); |
Free forum by Nabble | Edit this page |