You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/08/17 10:20:42 UTC
svn commit: r804895 [4/7] - in /ofbiz/trunk:
applications/accounting/src/org/ofbiz/accounting/agreement/
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/src/org...
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java Mon Aug 17 08:20:38 2009
@@ -189,7 +189,7 @@
throw new IllegalArgumentException("You must pass an even sized array to the toMap method");
}
Map<String, V> map = FastMap.newInstance();
- for (int i = 0; i < data.length; ) {
+ for (int i = 0; i < data.length;) {
map.put((String) data[i++], (V) data[i++]);
}
return map;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java Mon Aug 17 08:20:38 2009
@@ -354,7 +354,7 @@
// if (isSignedInteger.arguments.length > 1) secondArg = isSignedInteger.arguments[1];
// skip leading + or -
- // if ((s.charAt(0) == "-") ||(s.charAt(0) == "+") ) startPos = 1;
+ // if ((s.charAt(0) == "-") ||(s.charAt(0) == "+")) startPos = 1;
// return(isInteger(s.substring(startPos, s.length), secondArg))
}
@@ -387,7 +387,7 @@
}
// return(isSignedInteger(s, secondArg)
- // &&((isEmpty(s) && secondArg) ||(parseInt(s) > 0) ) );
+ // &&((isEmpty(s) && secondArg) ||(parseInt(s) > 0)));
}
/** Returns true if string s is an integer >= 0. */
@@ -404,7 +404,7 @@
}
// return(isSignedInteger(s, secondArg)
- // &&((isEmpty(s) && secondArg) ||(parseInt(s) >= 0) ) );
+ // &&((isEmpty(s) && secondArg) ||(parseInt(s) >= 0)));
}
/** Returns true if string s is an integer < 0. */
@@ -421,7 +421,7 @@
}
// return(isSignedInteger(s, secondArg)
- // &&((isEmpty(s) && secondArg) ||(parseInt(s) < 0) ) );
+ // &&((isEmpty(s) && secondArg) ||(parseInt(s) < 0)));
}
/** Returns true if string s is an integer <= 0. */
@@ -438,7 +438,7 @@
}
// return(isSignedInteger(s, secondArg)
- // &&((isEmpty(s) && secondArg) ||(parseInt(s) <= 0) ) );
+ // &&((isEmpty(s) && secondArg) ||(parseInt(s) <= 0)));
}
/** True if string s is an unsigned floating point(real) number.
@@ -547,7 +547,7 @@
// int startPos = 0;
// if (isSignedFloat.arguments.length > 1) secondArg = isSignedFloat.arguments[1];
// skip leading + or -
- // if ((s.charAt(0) == "-") ||(s.charAt(0) == "+") ) startPos = 1;
+ // if ((s.charAt(0) == "-") ||(s.charAt(0) == "+")) startPos = 1;
// return(isFloat(s.substring(startPos, s.length), secondArg))
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java Mon Aug 17 08:20:38 2009
@@ -1000,7 +1000,7 @@
+ String.valueOf(exception.getLineNumber())
+ ". Error message: "
+ exceptionMessage, module
- );
+ );
}
}
@@ -1012,7 +1012,7 @@
+ String.valueOf(exception.getLineNumber())
+ ". Error message: "
+ exception.getMessage(), module
- );
+ );
}
}
@@ -1024,7 +1024,7 @@
+ String.valueOf(exception.getLineNumber())
+ ". Error message: "
+ exception.getMessage(), module
- );
+ );
}
}
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Mon Aug 17 08:20:38 2009
@@ -444,7 +444,7 @@
}
if (varNames != null) {
for (String varName: varNames) {
- //freemarker.ext.beans.StringModel varObj = (freemarker.ext.beans.StringModel ) varNameIter.next();
+ //freemarker.ext.beans.StringModel varObj = (freemarker.ext.beans.StringModel) varNameIter.next();
//Object varObj = varNameIter.next();
//String varName = varObj.toString();
templateRoot.put(varName, FreeMarkerWorker.getWrappedObject(varName, env));
@@ -453,7 +453,7 @@
return templateRoot;
}
- public static void saveContextValues(Map<String, Object> context, String [] saveKeyNames, Map<String, Object> saveMap ) {
+ public static void saveContextValues(Map<String, Object> context, String [] saveKeyNames, Map<String, Object> saveMap) {
//Map saveMap = new HashMap();
for (String key: saveKeyNames) {
Object o = context.get(key);
@@ -479,7 +479,7 @@
}
- public static void reloadValues(Map<String, Object> context, Map<String, Object> saveValues, Environment env ) {
+ public static void reloadValues(Map<String, Object> context, Map<String, Object> saveValues, Environment env) {
for (Map.Entry<String, Object> entry: saveValues.entrySet()) {
String key = entry.getKey();
Object o = entry.getValue();
@@ -498,7 +498,7 @@
}
}
- public static void removeValues(Map<String, ?> context, String... removeKeyNames ) {
+ public static void removeValues(Map<String, ?> context, String... removeKeyNames) {
for (String key: removeKeyNames) {
context.remove(key);
}
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java Mon Aug 17 08:20:38 2009
@@ -69,7 +69,7 @@
translet = xslTemplatesCache.get(templateName);
}
- if (translet == null ) {
+ if (translet == null) {
String templateUrl = (String)context.get("templateUrl");
String templateString = (String)context.get("templateString");
Document templateDocument = (Document)context.get("templateDocument");
@@ -79,7 +79,7 @@
xslTemplatesCache.put(templateName, translet);
}
}
- if (translet != null ) {
+ if (translet != null) {
Transformer transformer = translet.newTransformer();
if (params != null) {
for (Map.Entry<String, Object> entry: params.entrySet()) {
Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Mon Aug 17 08:20:38 2009
@@ -434,7 +434,7 @@
Manager manager = null;
try {
manager = (Manager)Class.forName(mgrClassName).newInstance();
- } catch(Exception exc) {
+ } catch (Exception exc) {
throw new ContainerException("Cluster configuration requires a valid manager-class property: " + exc.getMessage());
}
//cluster.setManagerClassName(mgrClassName);
@@ -528,7 +528,7 @@
String mgrClassName = ContainerConfig.getPropertyValue(clusterProp, "manager-class", "org.apache.catalina.ha.session.DeltaManager");
try {
sessionMgr = (Manager)Class.forName(mgrClassName).newInstance();
- } catch(Exception exc) {
+ } catch (Exception exc) {
throw new ContainerException("Cluster configuration requires a valid manager-class property: " + exc.getMessage());
}
} else {
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java Mon Aug 17 08:20:38 2009
@@ -157,7 +157,7 @@
CAPTCHA_FILE_NAME = UtilDateTime.nowAsString().concat(".jpg");
request.setAttribute("captchaFileName", URL_FILE_PATH + CAPTCHA_FILE_NAME);
request.setAttribute("ID_KEY", ID_KEY);
- ImageIO.write(image, "jpg", new File( CAPTCHA_FILE_PATH + CAPTCHA_FILE_NAME));
+ ImageIO.write(image, "jpg", new File(CAPTCHA_FILE_PATH + CAPTCHA_FILE_NAME));
} catch (IOException e) {
return;
}
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Mon Aug 17 08:20:38 2009
@@ -294,7 +294,7 @@
GenericDelegator delegator = dctx.getDelegator();
int count = ((Integer) context.get("count")).intValue();
- for (int i = 0; i < count; i++ ) {
+ for (int i = 0; i < count; i++) {
GenericValue v = delegator.makeValue("Visit");
String seqId = delegator.getNextSeqId("Visit");
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java Mon Aug 17 08:20:38 2009
@@ -663,7 +663,7 @@
try {
EntityListIterator it = (EntityListIterator) result.get("listIt");
list = it.getPartialList(1, 1); // list starts at '1'
- if (list != null && list.size() > 0 ) {
+ if (list != null && list.size() > 0) {
item = list.get(0);
}
it.close();
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java Mon Aug 17 08:20:38 2009
@@ -167,7 +167,7 @@
bufImgType = bufImg.getType();
}
- bufNewImg = new BufferedImage( (int) (imgWidth * scaleFactor), (int) (imgHeight * scaleFactor), bufImgType);
+ bufNewImg = new BufferedImage((int) (imgWidth * scaleFactor), (int) (imgHeight * scaleFactor), bufImgType);
result.put("responseMessage", "success");
result.put("bufferedImage", bufNewImg);
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java Mon Aug 17 08:20:38 2009
@@ -948,7 +948,7 @@
}
Debug.logInfo(" password.change.history.limit is set to " + passwordChangeHistoryLimit, module);
Debug.logInfo(" userLogin is set to " + userLogin, module);
- if (passwordChangeHistoryLimit > 0 && userLogin != null ) {
+ if (passwordChangeHistoryLimit > 0 && userLogin != null) {
Debug.logInfo(" checkNewPassword Checking if user is tyring to use old password " + passwordChangeHistoryLimit, module);
GenericDelegator delegator = userLogin.getDelegator();
String newPasswordHash = newPassword;
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java Mon Aug 17 08:20:38 2009
@@ -117,16 +117,16 @@
public static EntityExpr makeCondition(Timestamp moment, String fromDateName, String thruDateName) {
return EntityCondition.makeCondition(
EntityCondition.makeCondition(
- EntityCondition.makeCondition( thruDateName, EntityOperator.EQUALS, null ),
+ EntityCondition.makeCondition(thruDateName, EntityOperator.EQUALS, null),
EntityOperator.OR,
- EntityCondition.makeCondition( thruDateName, EntityOperator.GREATER_THAN, moment )
- ),
+ EntityCondition.makeCondition(thruDateName, EntityOperator.GREATER_THAN, moment)
+ ),
EntityOperator.AND,
EntityCondition.makeCondition(
- EntityCondition.makeCondition( fromDateName, EntityOperator.EQUALS, null ),
+ EntityCondition.makeCondition(fromDateName, EntityOperator.EQUALS, null),
EntityOperator.OR,
- EntityCondition.makeCondition( fromDateName, EntityOperator.LESS_THAN_EQUAL_TO, moment )
- )
- );
+ EntityCondition.makeCondition(fromDateName, EntityOperator.LESS_THAN_EQUAL_TO, moment)
+ )
+ );
}
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java Mon Aug 17 08:20:38 2009
@@ -65,14 +65,14 @@
public static EntityComparisonOperator lookupComparison(String name) {
EntityOperator operator = lookup(name);
- if ( !(operator instanceof EntityComparisonOperator ) )
+ if (!(operator instanceof EntityComparisonOperator))
throw new IllegalArgumentException(name + " is not a comparison operator");
return (EntityComparisonOperator)operator;
}
public static EntityJoinOperator lookupJoin(String name) {
EntityOperator operator = lookup(name);
- if ( !(operator instanceof EntityJoinOperator ) )
+ if (!(operator instanceof EntityJoinOperator))
throw new IllegalArgumentException(name + " is not a join operator");
return (EntityJoinOperator)operator;
}
@@ -91,7 +91,7 @@
}
}
};
- static { register( "equals", EQUALS ); }
+ static { register("equals", EQUALS); }
public static final EntityComparisonOperator NOT_EQUAL = new EntityComparisonOperator(ID_NOT_EQUAL, "<>") {
@Override
public boolean compare(Comparable lhs, Object rhs) { return EntityComparisonOperator.compareNotEqual(lhs, rhs); }
@@ -104,74 +104,74 @@
}
}
};
- static { register( "not-equal", NOT_EQUAL ); }
- static { register( "not-equals", NOT_EQUAL ); }
- static { register( "notEqual", NOT_EQUAL ); }
+ static { register("not-equal", NOT_EQUAL); }
+ static { register("not-equals", NOT_EQUAL); }
+ static { register("notEqual", NOT_EQUAL); }
public static final EntityComparisonOperator LESS_THAN = new EntityComparisonOperator(ID_LESS_THAN, "<") {
@Override
public <T> boolean compare(Comparable<T> lhs, T rhs) { return EntityComparisonOperator.compareLessThan(lhs, rhs); }
};
- static { register( "less", LESS_THAN ); }
- static { register( "less-than", LESS_THAN ); }
- static { register( "lessThan", LESS_THAN ); }
+ static { register("less", LESS_THAN); }
+ static { register("less-than", LESS_THAN); }
+ static { register("lessThan", LESS_THAN); }
public static final EntityComparisonOperator GREATER_THAN = new EntityComparisonOperator(ID_GREATER_THAN, ">") {
@Override
public <T> boolean compare(Comparable<T> lhs, T rhs) { return EntityComparisonOperator.compareGreaterThan(lhs, rhs); }
};
- static { register( "greater", GREATER_THAN ); }
- static { register( "greater-than", GREATER_THAN ); }
- static { register( "greaterThan", GREATER_THAN ); }
+ static { register("greater", GREATER_THAN); }
+ static { register("greater-than", GREATER_THAN); }
+ static { register("greaterThan", GREATER_THAN); }
public static final EntityComparisonOperator LESS_THAN_EQUAL_TO = new EntityComparisonOperator(ID_LESS_THAN_EQUAL_TO, "<=") {
@Override
public <T> boolean compare(Comparable<T> lhs, T rhs) { return EntityComparisonOperator.compareLessThanEqualTo(lhs, rhs); }
};
- static { register( "less-equals", LESS_THAN_EQUAL_TO ); }
- static { register( "less-than-equal-to", LESS_THAN_EQUAL_TO ); }
- static { register( "lessThanEqualTo", LESS_THAN_EQUAL_TO ); }
+ static { register("less-equals", LESS_THAN_EQUAL_TO); }
+ static { register("less-than-equal-to", LESS_THAN_EQUAL_TO); }
+ static { register("lessThanEqualTo", LESS_THAN_EQUAL_TO); }
public static final EntityComparisonOperator GREATER_THAN_EQUAL_TO = new EntityComparisonOperator(ID_GREATER_THAN_EQUAL_TO, ">=") {
@Override
public <T> boolean compare(Comparable<T> lhs, T rhs) { return EntityComparisonOperator.compareGreaterThanEqualTo(lhs, rhs); }
};
- static { register( "greater-equals", GREATER_THAN_EQUAL_TO ); }
- static { register( "greater-than-equal-to", GREATER_THAN_EQUAL_TO ); }
- static { register( "greaterThanEqualTo", GREATER_THAN_EQUAL_TO ); }
+ static { register("greater-equals", GREATER_THAN_EQUAL_TO); }
+ static { register("greater-than-equal-to", GREATER_THAN_EQUAL_TO); }
+ static { register("greaterThanEqualTo", GREATER_THAN_EQUAL_TO); }
public static final EntityComparisonOperator IN = new EntityComparisonOperator(ID_IN, "IN") {
@Override
public <T> boolean compare(Comparable<T> lhs, T rhs) { return EntityComparisonOperator.compareIn(lhs, rhs); }
@Override
protected void makeRHSWhereStringValue(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { appendRHSList(entityConditionParams, sb, field, rhs); }
};
- static { register( "in", IN ); }
+ static { register("in", IN); }
public static final EntityComparisonOperator BETWEEN = new EntityComparisonOperator(ID_BETWEEN, "BETWEEN") {
@Override
public <T> boolean compare(Comparable<T> lhs, T rhs) { return EntityComparisonOperator.compareIn(lhs, rhs); }
@Override
protected void makeRHSWhereStringValue(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { appendRHSBetweenList(entityConditionParams, sb, field, rhs); }
};
- static { register( "between", BETWEEN ); }
+ static { register("between", BETWEEN); }
public static final EntityComparisonOperator NOT = new EntityComparisonOperator(ID_NOT, "NOT");
- static { register( "not", NOT ); }
+ static { register("not", NOT); }
public static final EntityJoinOperator AND = new EntityJoinOperator(ID_AND, "AND", false);
- static { register( "and", AND ); }
+ static { register("and", AND); }
public static final EntityJoinOperator OR = new EntityJoinOperator(ID_OR, "OR", true);
- static { register( "or", OR ); }
+ static { register("or", OR); }
public static final EntityComparisonOperator LIKE = new EntityComparisonOperator(ID_LIKE, "LIKE") {
@Override
public boolean compare(Comparable lhs, Object rhs) { return EntityComparisonOperator.compareLike(lhs, rhs); }
};
- static { register( "like", LIKE ); }
+ static { register("like", LIKE); }
public static final EntityComparisonOperator NOT_LIKE = new EntityComparisonOperator(ID_NOT_LIKE, "NOT LIKE") {
@Override
public <T> boolean compare(Comparable<T> lhs, T rhs) { return !EntityComparisonOperator.compareLike(lhs, rhs); }
};
- static { register( "not-like", NOT_LIKE); }
+ static { register("not-like", NOT_LIKE); }
public static final EntityComparisonOperator NOT_IN = new EntityComparisonOperator(ID_NOT_IN, "NOT IN") {
@Override
public <T> boolean compare(Comparable<T> lhs, T rhs) { return !EntityComparisonOperator.compareIn(lhs, rhs); }
@Override
protected void makeRHSWhereStringValue(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { appendRHSList(entityConditionParams, sb, field, rhs); }
};
- static { register( "not-in", NOT_IN ); }
+ static { register("not-in", NOT_IN); }
protected int idInt;
protected String codeString;
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java Mon Aug 17 08:20:38 2009
@@ -211,7 +211,7 @@
}
}
- if(modelEntity.getField(fieldName) == null) {
+ if (modelEntity.getField(fieldName) == null) {
throw new IllegalArgumentException("Error in Entity Find: could not find field [" + fieldName + "] in entity with name [" + modelEntity.getEntityName() + "]");
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java Mon Aug 17 08:20:38 2009
@@ -901,14 +901,14 @@
public static void addValue(StringBuilder buffer, ModelField field, Object value, List<EntityConditionParam> params) {
if (value instanceof Collection) {
- buffer.append("( ");
+ buffer.append("(");
Iterator<Object> it = UtilGenerics.checkCollection(value).iterator();
while (it.hasNext()) {
Object thisValue = it.next();
addValueSingle(buffer, field, thisValue, params);
if (it.hasNext()) buffer.append(", ");
}
- buffer.append(" )");
+ buffer.append(")");
} else {
addValueSingle(buffer, field, value, params);
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java Mon Aug 17 08:20:38 2009
@@ -224,19 +224,19 @@
if (keyMaps.size() < 1)
return "";
- StringBuilder returnString = new StringBuilder( keyMaps.size() * 10 );
+ StringBuilder returnString = new StringBuilder(keyMaps.size() * 10);
int i=0;
while (true) {
ModelKeyMap kmap = keyMaps.get(i);
- returnString.append( ModelUtil.upperFirstChar( kmap.fieldName));
+ returnString.append(ModelUtil.upperFirstChar(kmap.fieldName));
i++;
if (i >= keyMaps.size()) {
- returnString.append( afterLast );
+ returnString.append(afterLast);
break;
}
- returnString.append( separator );
+ returnString.append(separator);
}
return returnString.toString();
@@ -246,19 +246,19 @@
if (keyMaps.size() < 1)
return "";
- StringBuilder returnString = new StringBuilder( keyMaps.size() * 10 );
+ StringBuilder returnString = new StringBuilder(keyMaps.size() * 10);
int i=0;
while (true) {
ModelKeyMap kmap = keyMaps.get(i);
- returnString.append( ModelUtil.upperFirstChar( kmap.relFieldName ));
+ returnString.append(ModelUtil.upperFirstChar(kmap.relFieldName));
i++;
if (i >= keyMaps.size()) {
- returnString.append( afterLast );
+ returnString.append(afterLast);
break;
}
- returnString.append( separator );
+ returnString.append(separator);
}
return returnString.toString();
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java Mon Aug 17 08:20:38 2009
@@ -574,7 +574,7 @@
int ptr = 0;
ModelConversion[] currentConversions = new ModelConversion[conversions.size()];
for (int j = 0, k; j < currentIndex.length; j++) {
- for (int l = 0; l < maxIndex[ j ]; l++ ) {
+ for (int l = 0; l < maxIndex[ j ]; l++) {
while (true) {
for (i = 0, k = 0; i < currentIndex.length; i++) {
if (i == j && currentIndex[i] == l) continue;
@@ -1242,7 +1242,7 @@
}
}
- if(this.viewEntityCondition.modelViewEntity.getField(fieldName) == null) {
+ if (this.viewEntityCondition.modelViewEntity.getField(fieldName) == null) {
throw new IllegalArgumentException("Error in Entity Find: could not find field [" + fieldName + "] in entity with name [" + this.viewEntityCondition.modelViewEntity.getEntityName() + "]");
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java Mon Aug 17 08:20:38 2009
@@ -158,7 +158,7 @@
GenericValue testing = delegator.makeValue("Testing",
"testingId", delegator.getNextSeqId("Testing"),
"testingTypeId", "TEST-1"
- );
+ );
testing.put("testingName", "leaf-#" + node.getString("testingNodeId"));
testing.put("description", "level1 leaf");
testing.put("comments", "No-comments");
@@ -169,7 +169,7 @@
GenericValue member = delegator.makeValue("TestingNodeMember",
"testingNodeId", node.get("testingNodeId"),
"testingId", testing.get("testingId")
- );
+ );
member.put("fromDate", now);
member.put("thruDate", UtilDateTime.getNextDayStart(now));
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java Mon Aug 17 08:20:38 2009
@@ -366,7 +366,7 @@
if (parentTx == null) return;
try {
TransactionManager txMgr = TransactionFactory.getTransactionManager();
- if (txMgr != null ) {
+ if (txMgr != null) {
setTransactionBeginStack(popTransactionBeginStackSave());
setSetRollbackOnlyCause(popSetRollbackOnlyCauseSave());
txMgr.resume(parentTx);
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java Mon Aug 17 08:20:38 2009
@@ -196,7 +196,7 @@
return results;
}
try {
- boolean check = checkPermissionMethod( delegator, userLogin, targetOperations, "Content", entityIds, passedPurposes, null, privilegeEnumId);
+ boolean check = checkPermissionMethod(delegator, userLogin, targetOperations, "Content", entityIds, passedPurposes, null, privilegeEnumId);
if (check) {
results.put("permissionStatus", "granted");
} else {
@@ -223,7 +223,7 @@
if (!(targetOperationList == null) && userLoginId != null) {
hasRoleOperation = checkHasRoleOperations(partyId, targetOperationList, delegator);
}
- if ( hasRoleOperation ) {
+ if (hasRoleOperation) {
return true;
}
ModelEntity modelEntity = delegator.getModelEntity(entityName);
@@ -277,7 +277,7 @@
if (hasPrivilegeOp && hasPrivilegeField) {
int privilegeEnumSeq = -1;
- if ( UtilValidate.isNotEmpty(privilegeEnumId)) {
+ if (UtilValidate.isNotEmpty(privilegeEnumId)) {
GenericValue privEnum = delegator.findByPrimaryKeyCache("Enumeration", UtilMisc.toMap("enumId", privilegeEnumId));
if (privEnum != null) {
String sequenceId = privEnum.getString("sequenceId");
@@ -382,7 +382,7 @@
if (entity == null) continue;
String entityId = entity.getString(pkFieldName);
List<String> tmpPurposeList = purposes.get(entityId);
- if (purposeList != null ) {
+ if (purposeList != null) {
if (tmpPurposeList != null) {
purposeList.addAll(tmpPurposeList);
}
@@ -391,7 +391,7 @@
}
List<String> tmpRoleList = getUserRoles(entity, userLogin, delegator);
- if (roleList != null ) {
+ if (roleList != null) {
if (tmpRoleList != null) {
roleList.addAll(tmpRoleList);
}
@@ -504,7 +504,7 @@
boolean checkAncestors = false;
boolean hasRoleOperation = checkHasRoleOperations(partyId, permissionConditionGetter, delegator);
- if ( hasRoleOperation ) {
+ if (hasRoleOperation) {
return true;
}
ModelEntity modelEntity = delegator.getModelEntity(entityName);
@@ -674,7 +674,7 @@
public static boolean hasMatch(String entityName, List<GenericValue> targetOperations, List<String> roles, boolean hasPurposeOp, List<String> purposes, boolean hasStatusOp, String targStatusId) {
boolean isMatch = false;
int targPrivilegeSeq = 0;
- // if (UtilValidate.isNotEmpty(targPrivilegeEnumId) && !targPrivilegeEnumId.equals("_NA_") && !targPrivilegeEnumId.equals("_00_") ) {
+ // if (UtilValidate.isNotEmpty(targPrivilegeEnumId) && !targPrivilegeEnumId.equals("_NA_") && !targPrivilegeEnumId.equals("_00_")) {
// need to do a lookup here to find the seq value of targPrivilegeEnumId.
// The lookup could be a static store or it could be done on Enumeration entity.
// }
@@ -692,10 +692,10 @@
//testPrivilegeEnumId = (String)targetOp.get("privilegeEnumId");
//int testPrivilegeSeq = 0;
- boolean purposesCond = ( !hasPurposeOp || (purposes != null && purposes.contains(testContentPurposeTypeId) ) || testContentPurposeTypeId.equals("_NA_") );
- boolean statusCond = ( !hasStatusOp || testStatusId.equals("_NA_") || (targStatusId != null && targStatusId.equals(testStatusId) ) );
- //boolean privilegeCond = ( !hasPrivilegeOp || testPrivilegeEnumId.equals("_NA_") || testPrivilegeSeq <= targPrivilegeSeq || testPrivilegeEnumId.equals(targPrivilegeEnumId) );
- boolean roleCond = ( testRoleTypeId.equals("_NA_") || (roles != null && roles.contains(testRoleTypeId) ) );
+ boolean purposesCond = (!hasPurposeOp || (purposes != null && purposes.contains(testContentPurposeTypeId)) || testContentPurposeTypeId.equals("_NA_"));
+ boolean statusCond = (!hasStatusOp || testStatusId.equals("_NA_") || (targStatusId != null && targStatusId.equals(testStatusId)));
+ //boolean privilegeCond = (!hasPrivilegeOp || testPrivilegeEnumId.equals("_NA_") || testPrivilegeSeq <= targPrivilegeSeq || testPrivilegeEnumId.equals(targPrivilegeEnumId));
+ boolean roleCond = (testRoleTypeId.equals("_NA_") || (roles != null && roles.contains(testRoleTypeId)));
if (purposesCond && statusCond && roleCond) {
@@ -743,14 +743,14 @@
}
if (Debug.verboseOn()) Debug.logVerbose("STATUS:" + targStatusId, module);
- while (permissionConditionGetter.getNext() ) {
+ while (permissionConditionGetter.getNext()) {
String roleConditionId = permissionConditionGetter.getRoleValue();
String auxiliaryConditionId = permissionConditionGetter.getAuxiliaryValue();
String statusConditionId = permissionConditionGetter.getStatusValue();
- boolean auxiliaryCond = ( auxiliaryConditionId == null || auxiliaryConditionId.equals("_NA_") || (auxiliaryValueList != null && auxiliaryValueList.contains(auxiliaryConditionId) ) );
- boolean statusCond = ( statusConditionId == null || statusConditionId.equals("_NA_") || (targStatusId != null && targStatusId.equals(statusConditionId) ) );
- boolean roleCond = ( roleConditionId == null || roleConditionId.equals("_NA_") || (roleValueList != null && roleValueList.contains(roleConditionId) ) );
+ boolean auxiliaryCond = (auxiliaryConditionId == null || auxiliaryConditionId.equals("_NA_") || (auxiliaryValueList != null && auxiliaryValueList.contains(auxiliaryConditionId)) );
+ boolean statusCond = (statusConditionId == null || statusConditionId.equals("_NA_") || (targStatusId != null && targStatusId.equals(statusConditionId)));
+ boolean roleCond = (roleConditionId == null || roleConditionId.equals("_NA_") || (roleValueList != null && roleValueList.contains(roleConditionId)));
if (auxiliaryCond && statusCond && roleCond) {
if (Debug.verboseOn()) Debug.logVerbose("MATCHED: role:" + roleConditionId + " status:" + statusConditionId + " aux:" + auxiliaryConditionId, module);
@@ -770,10 +770,10 @@
List<String> purposeIds = null;
if (passedPurposes == null) {
- purposeIds = FastList.newInstance( );
+ purposeIds = FastList.newInstance();
} else {
- purposeIds = FastList.newInstance( );
- purposeIds.addAll( passedPurposes );
+ purposeIds = FastList.newInstance();
+ purposeIds.addAll(passedPurposes);
}
String entityName = entity.getEntityName();
@@ -811,7 +811,7 @@
roles.remove("OWNER"); // always test with the owner of the current content
- if ( entity.get("createdByUserLogin") != null && userLogin != null) {
+ if (entity.get("createdByUserLogin") != null && userLogin != null) {
String userLoginId = (String)userLogin.get("userLoginId");
String userLoginIdCB = (String)entity.get("createdByUserLogin");
//if (Debug.infoOn()) Debug.logInfo("userLoginId:" + userLoginId + ": userLoginIdCB:" + userLoginIdCB + ":", null);
@@ -825,7 +825,7 @@
List<GenericValue> relatedRoles = null;
List<GenericValue> tmpRelatedRoles = entity.getRelatedCache(entityName + "Role");
relatedRoles = EntityUtil.filterByDate(tmpRelatedRoles);
- if (relatedRoles != null ) {
+ if (relatedRoles != null) {
for (GenericValue contentRole: relatedRoles) {
String roleTypeId = (String)contentRole.get("roleTypeId");
String targPartyId = (String)contentRole.get("partyId");
@@ -840,13 +840,13 @@
try {
party = contentRole.getRelatedOne("Party");
partyTypeId = (String)party.get("partyTypeId");
- if ( partyTypeId != null && partyTypeId.equals("PARTY_GROUP") ) {
+ if (partyTypeId != null && partyTypeId.equals("PARTY_GROUP")) {
Map<String, Object> map = FastMap.newInstance();
// At some point from/thru date will need to be added
map.put("partyIdFrom", partyId);
map.put("partyIdTo", targPartyId);
- if ( isGroupMember( map, delegator ) ) {
+ if (isGroupMember(map, delegator)) {
if (!roles.contains(roleTypeId))
roles.add(roleTypeId);
}
@@ -864,7 +864,7 @@
/**
* Tests to see if the user belongs to a group
*/
- public static boolean isGroupMember( Map<String, ?> partyRelationshipValues, GenericDelegator delegator ) {
+ public static boolean isGroupMember(Map<String, ?> partyRelationshipValues, GenericDelegator delegator) {
boolean isMember = false;
String partyIdFrom = (String)partyRelationshipValues.get("partyIdFrom") ;
String partyIdTo = (String)partyRelationshipValues.get("partyIdTo") ;
@@ -873,16 +873,16 @@
Timestamp fromDate = UtilDateTime.nowTimestamp();
Timestamp thruDate = UtilDateTime.getDayStart(UtilDateTime.nowTimestamp(), 1);
- if (partyRelationshipValues.get("roleTypeIdFrom") != null ) {
+ if (partyRelationshipValues.get("roleTypeIdFrom") != null) {
roleTypeIdFrom = (String)partyRelationshipValues.get("roleTypeIdFrom") ;
}
- if (partyRelationshipValues.get("roleTypeIdTo") != null ) {
+ if (partyRelationshipValues.get("roleTypeIdTo") != null) {
roleTypeIdTo = (String)partyRelationshipValues.get("roleTypeIdTo") ;
}
- if (partyRelationshipValues.get("fromDate") != null ) {
+ if (partyRelationshipValues.get("fromDate") != null) {
fromDate = (Timestamp)partyRelationshipValues.get("fromDate") ;
}
- if (partyRelationshipValues.get("thruDate") != null ) {
+ if (partyRelationshipValues.get("thruDate") != null) {
thruDate = (Timestamp)partyRelationshipValues.get("thruDate") ;
}
@@ -898,7 +898,7 @@
// This method is simplified to make it work, these conditions need to be added back in.
//List joinList = UtilMisc.toList(fromExpr, thruCond, partyFromExpr, partyToExpr, relationExpr);
- List<? extends EntityCondition> joinList = UtilMisc.toList( partyFromExpr, partyToExpr);
+ List<? extends EntityCondition> joinList = UtilMisc.toList(partyFromExpr, partyToExpr);
EntityCondition condition = EntityCondition.makeCondition(joinList);
List<GenericValue> partyRelationships = null;
@@ -956,7 +956,7 @@
this.entityName = "ContentPurposeOperation";
}
- public StdPermissionConditionGetter ( String entityName, String operationFieldName, String roleFieldName, String statusFieldName, String auxiliaryFieldName, String privilegeFieldName) {
+ public StdPermissionConditionGetter (String entityName, String operationFieldName, String roleFieldName, String statusFieldName, String auxiliaryFieldName, String privilegeFieldName) {
this.operationFieldName = operationFieldName;
this.roleFieldName = roleFieldName ;
@@ -966,7 +966,7 @@
this.entityName = entityName;
}
- public StdPermissionConditionGetter ( Element getterElement) {
+ public StdPermissionConditionGetter (Element getterElement) {
this.operationFieldName = getterElement.getAttribute("operation-field-name");
this.roleFieldName = getterElement.getAttribute("role-field-name");
this.statusFieldName = getterElement.getAttribute("status-field-name");
@@ -1003,7 +1003,7 @@
if (UtilValidate.isNotEmpty(privilegeFieldName)) {
privilegeEnumId = currentValue.getString(this.privilegeFieldName);
}
- if ( UtilValidate.isNotEmpty(privilegeEnumId)) {
+ if (UtilValidate.isNotEmpty(privilegeEnumId)) {
GenericValue privEnum = delegator.findByPrimaryKeyCache("Enumeration", UtilMisc.toMap("enumId", privilegeEnumId));
if (privEnum != null) {
String sequenceId = privEnum.getString("sequenceId");
@@ -1042,7 +1042,7 @@
this.entityList = FastList.newInstance();
}
- public void init( GenericDelegator delegator) throws GenericEntityException {
+ public void init(GenericDelegator delegator) throws GenericEntityException {
EntityCondition opCond = EntityCondition.makeCondition(operationFieldName, EntityOperator.IN, this.operationList);
this.entityList = delegator.findList(this.entityName, opCond, null, null, null, true);
}
@@ -1148,14 +1148,14 @@
this.entityIdName = "contentId";
}
- public StdAuxiliaryValueGetter ( String entityName, String auxiliaryFieldName, String entityIdName) {
+ public StdAuxiliaryValueGetter (String entityName, String auxiliaryFieldName, String entityIdName) {
this.auxiliaryFieldName = auxiliaryFieldName ;
this.entityName = entityName;
this.entityIdName = entityIdName;
}
- public StdAuxiliaryValueGetter ( Element getterElement) {
+ public StdAuxiliaryValueGetter (Element getterElement) {
this.auxiliaryFieldName = getterElement.getAttribute("auxiliary-field-name");
this.entityName = getterElement.getAttribute("entity-name");
@@ -1231,7 +1231,7 @@
this.roleEntityIdName = "contentId";
}
- public StdRelatedRoleGetter ( String entityName, String roleTypeFieldName, String roleEntityIdName, String partyFieldName, String ownerEntityFieldName, String roleEntityName) {
+ public StdRelatedRoleGetter (String entityName, String roleTypeFieldName, String roleEntityIdName, String partyFieldName, String ownerEntityFieldName, String roleEntityName) {
this.roleTypeFieldName = roleTypeFieldName ;
this.partyFieldName = partyFieldName ;
@@ -1241,7 +1241,7 @@
this.roleEntityIdName = roleEntityIdName;
}
- public StdRelatedRoleGetter ( Element getterElement) {
+ public StdRelatedRoleGetter (Element getterElement) {
this.roleTypeFieldName = getterElement.getAttribute("role-type-field-name");
this.partyFieldName = getterElement.getAttribute("party-field-name");
@@ -1283,7 +1283,7 @@
}
}
- public boolean isOwner( GenericValue entity, String targetPartyId) {
+ public boolean isOwner(GenericValue entity, String targetPartyId) {
boolean isOwner = false;
if (entity == null || targetPartyId == null) {
return false;
@@ -1293,10 +1293,10 @@
if (modelEntity.getField("createdByUserLogin") == null) {
return false;
}
- if ( entity.get("createdByUserLogin") != null) {
+ if (entity.get("createdByUserLogin") != null) {
String userLoginIdCB = (String)entity.get("createdByUserLogin");
try {
- GenericValue userLogin = delegator.findByPrimaryKeyCache("UserLogin", UtilMisc.toMap("userLoginId", userLoginIdCB ));
+ GenericValue userLogin = delegator.findByPrimaryKeyCache("UserLogin", UtilMisc.toMap("userLoginId", userLoginIdCB));
if (userLogin != null) {
String partyIdCB = userLogin.getString("partyId");
if (partyIdCB != null) {
@@ -1351,7 +1351,7 @@
String pkFieldName = modelEntity.getFirstPkFieldName();
GenericValue ownerContent = delegator.findByPrimaryKeyCache(entityName, UtilMisc.toMap(pkFieldName, ownerContentId));
if (ownerContent != null) {
- getEntityOwners(delegator, ownerContent, contentOwnerList, entityName, ownerIdFieldName );
+ getEntityOwners(delegator, ownerContent, contentOwnerList, entityName, ownerIdFieldName);
}
}
@@ -1360,7 +1360,7 @@
public static int getPrivilegeEnumSeq(GenericDelegator delegator, String privilegeEnumId) throws GenericEntityException {
int privilegeEnumSeq = -1;
- if ( UtilValidate.isNotEmpty(privilegeEnumId)) {
+ if (UtilValidate.isNotEmpty(privilegeEnumId)) {
GenericValue privEnum = delegator.findByPrimaryKeyCache("Enumeration", UtilMisc.toMap("enumId", privilegeEnumId));
if (privEnum != null) {
String sequenceId = privEnum.getString("sequenceId");
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java Mon Aug 17 08:20:38 2009
@@ -434,7 +434,7 @@
}
// if no more results from database to return, save final settings
- if (!esc.hasMoreTimeToSync() ) {
+ if (!esc.hasMoreTimeToSync()) {
esc.saveFinalSyncResults();
}
} catch (SyncAbortException e) {
Modified: ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java (original)
+++ ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java Mon Aug 17 08:20:38 2009
@@ -145,7 +145,7 @@
suffix = "_" + suffix;
}
String language = UtilProperties.getPropertyValue(startupProperties, "Language");
- if (language.compareTo("XuiLabels" + suffix ) != 0) {
+ if (language.compareTo("XuiLabels" + suffix) != 0) {
UtilProperties.setPropertyValue(startupProperties, "Language", "XuiLabels" + suffix);
}
frame.setVisible(true);
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java Mon Aug 17 08:20:38 2009
@@ -35,7 +35,7 @@
public class While extends MethodOperation {
public static final class WhileFactory implements Factory<While> {
public While createMethodOperation(Element element, SimpleMethod simpleMethod) {
- return new While(element, simpleMethod);
+ return new while (element, simpleMethod);
}
public String getName() {
@@ -47,7 +47,7 @@
List<MethodOperation> thenSubOps = FastList.newInstance();
- public While(Element element, SimpleMethod simpleMethod) {
+ public while (Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
Element conditionElement = UtilXml.firstChildElement(element, "condition");
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java Mon Aug 17 08:20:38 2009
@@ -110,7 +110,7 @@
while (i.hasNext()) {
GenericServiceCallback gsc = i.next();
if (gsc.isEnabled()) {
- gsc.receiveEvent(context,t );
+ gsc.receiveEvent(context,t);
} else {
i.remove();
}
Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoader.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoader.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoader.java Mon Aug 17 08:20:38 2009
@@ -87,7 +87,7 @@
private void loadData() {
int size = this.fieldNames.__len__();
- for(int i=0; i<size; i++ ) {
+ for(int i=0; i<size; i++) {
PyObject name = this.fieldNames.__getitem__(i);
PyObject valueList = this.dataList.__getitem__(this.currentRowIndx);
PyObject columnIndx = this.fieldNameMap.__getitem__(name);
@@ -105,12 +105,12 @@
int iter = Integer.parseInt(this.iterations);
//Iterate through entire list of data
- if(iter == -1) {
+ if (iter == -1) {
iter = this.dataList.__len__();
}
this.currentTest = new SeleniumXml(this.parent);
- for( int i=0; i<iter; i++) {
+ for(int i=0; i<iter; i++) {
loadData();
currentTest.runCommands(this.children);
next();
Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoop.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoop.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoop.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoop.java Mon Aug 17 08:20:38 2009
@@ -60,7 +60,7 @@
// TODO, WARNING - these name could collide with names already in the test context
Set eSet = mp.entrySet();
Iterator iter2 = eSet.iterator();
- while(iter2.hasNext()) {
+ while (iter2.hasNext()) {
Map.Entry entry = (Map.Entry)iter2.next();
String name = (String)entry.getKey();
Object value = entry.getValue();
Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/GroovyRunner.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/GroovyRunner.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/GroovyRunner.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/GroovyRunner.java Mon Aug 17 08:20:38 2009
@@ -63,9 +63,9 @@
binding.setVariable("context", map);
binding.setVariable("seleniumXml", this.parent);
InvokerHelper.createScript(scriptClass, binding).run();
- } catch(MalformedURLException e) {
+ } catch (MalformedURLException e) {
System.out.println("Scriptrunner, runTest, MalformedURLException error: " + e.getMessage());
- } catch(IOException e) {
+ } catch (IOException e) {
System.out.println("Scriptrunner, runTest, IOException error: " + e.getMessage());
}
Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/InitJython.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/InitJython.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/InitJython.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/InitJython.java Mon Aug 17 08:20:38 2009
@@ -56,7 +56,7 @@
Properties pyProps = new Properties();
- if( props.getProperty("python.home") == null) {
+ if (props.getProperty("python.home") == null) {
//pyProps.setProperty("python.home", "c:/devtools/jython2.2rc2");
pyProps.setProperty("python.home", "c:/devtools/Python24");
}
Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/JythonRunner.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/JythonRunner.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/JythonRunner.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/JythonRunner.java Mon Aug 17 08:20:38 2009
@@ -61,9 +61,9 @@
String scriptText = TestUtils.readUrlText(this.urlName);
interp.set("context", map);
interp.exec(scriptText);
- } catch(MalformedURLException e) {
+ } catch (MalformedURLException e) {
System.out.println("Scriptrunner, runTest, MalformedURLException error: " + e.getMessage());
- } catch(IOException e) {
+ } catch (IOException e) {
System.out.println("Scriptrunner, runTest, IOException error: " + e.getMessage());
}
Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/RemoteRequest.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/RemoteRequest.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/RemoteRequest.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/RemoteRequest.java Mon Aug 17 08:20:38 2009
@@ -167,7 +167,7 @@
String paramString2 = "USERNAME=" + this.parent.getUserName()
+ "&PASSWORD=" + this.parent.getPassword();
String thisUri2 = this.host + "/eng/control/login?" + paramString2;
- HttpGet req2 = new HttpGet ( thisUri2 );
+ HttpGet req2 = new HttpGet (thisUri2);
req2.setHeader("Connection","Keep-Alive");
HttpResponse rsp = client.execute(req2, localContext);
@@ -202,11 +202,11 @@
String thisUri = this.host + this.requestUrl + ";jsessionid=" + sessionId + "?" + paramString;
//String thisUri = this.host + this.requestUrl + "?" + paramString;
System.out.println("thisUri: " + thisUri);
- HttpGet req = new HttpGet ( thisUri );
+ HttpGet req = new HttpGet (thisUri);
System.out.println("sessionHeader: " + sessionHeader);
req.setHeader(sessionHeader);
- String responseBody = client.execute( req, responseHandler, localContext);
+ String responseBody = client.execute(req, responseHandler, localContext);
/*
entity = rsp.getEntity();
@@ -222,9 +222,9 @@
System.out.println(EntityUtils.toString(rsp.getEntity()));
}
*/
- } catch(HttpResponseException e) {
+ } catch (HttpResponseException e) {
System.out.println(e.getMessage());
- } catch(IOException e) {
+ } catch (IOException e) {
System.out.println(e.getMessage());
} finally {
// If we could be sure that the stream of the entity has been
@@ -235,7 +235,7 @@
try {
if (entity != null)
entity.consumeContent(); // release connection gracefully
- } catch(IOException e) {
+ } catch (IOException e) {
System.out.println("in 'finally' " + e.getMessage());
}
@@ -248,7 +248,7 @@
String paramString = "USERNAME=" + this.parent.getUserName()
+ "&PASSWORD=" + this.parent.getPassword();
String thisUri = this.host + "/eng/control/login?" + paramString;
- HttpGet req = new HttpGet ( thisUri );
+ HttpGet req = new HttpGet (thisUri);
req.setHeader("Connection","Keep-Alive");
client.execute(req, localContext);
@@ -312,8 +312,8 @@
String bodyString = super.handleResponse(response);
JSONObject jsonObject = null;
try {
- jsonObject = JSONObject.fromObject( bodyString );
- } catch(JSONException e) {
+ jsonObject = JSONObject.fromObject(bodyString);
+ } catch (JSONException e) {
throw new HttpResponseException(0, e.getMessage());
}
Set<Map.Entry<String, String>> paramSet = this.parentRemoteRequest.outMap.entrySet();
Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumIDEConverter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumIDEConverter.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumIDEConverter.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumIDEConverter.java Mon Aug 17 08:20:38 2009
@@ -96,29 +96,29 @@
String cmdToCompare = cmdElem.getValue();
System.out.println("Checking for cmd: " + cmdToCompare);
- if("clickAndWait".compareTo(cmdElem.getValue()) == 0 ) {
+ if ("clickAndWait".compareTo(cmdElem.getValue()) == 0) {
System.out.println("Found clickAndWait");
- this.xmlDestRoot.addContent( buildCommand("click", "locator", cmd.get(1).getValue(), null, null) );
- this.xmlDestRoot.addContent( buildCommand("waitForPageToLoad", "value", "10000", null, null) );
+ this.xmlDestRoot.addContent(buildCommand("click", "locator", cmd.get(1).getValue(), null, null));
+ this.xmlDestRoot.addContent(buildCommand("waitForPageToLoad", "value", "10000", null, null));
- } else if("type".compareTo( cmdElem.getValue()) == 0 ) {
+ } else if ("type".compareTo(cmdElem.getValue()) == 0 ) {
System.out.println("Found type");
- this.xmlDestRoot.addContent ( buildCommand("type", "name", cmd.get(1).getValue(), "value", cmd.get(2).getValue()) );
+ this.xmlDestRoot.addContent (buildCommand("type", "name", cmd.get(1).getValue(), "value", cmd.get(2).getValue()));
- } else if("select".compareTo(cmdElem.getValue()) == 0 ) {
+ } else if ("select".compareTo(cmdElem.getValue()) == 0) {
System.out.println("Found select");
- this.xmlDestRoot.addContent( buildCommand("select", "locator", cmd.get(1).getValue(), "option", cmd.get(2).getValue()) );
+ this.xmlDestRoot.addContent(buildCommand("select", "locator", cmd.get(1).getValue(), "option", cmd.get(2).getValue()));
- } else if("open".compareTo(cmdElem.getValue()) == 0 ) {
+ } else if ("open".compareTo(cmdElem.getValue()) == 0) {
System.out.println("Found open");
- this.xmlDestRoot.addContent( buildCommand("open", "value", cmd.get(1).getValue(), null, null) );
+ this.xmlDestRoot.addContent(buildCommand("open", "value", cmd.get(1).getValue(), null, null));
- } else if("click".compareTo(cmdElem.getValue()) == 0 ) {
+ } else if ("click".compareTo(cmdElem.getValue()) == 0) {
Element newCmd = new Element("click");
newCmd.setAttribute("locator", cmd.get(1).getValue());
this.xmlDestRoot.addContent(newCmd);
- } else if("doubleClick".compareTo(cmdElem.getValue()) == 0 ) {
+ } else if ("doubleClick".compareTo(cmdElem.getValue()) == 0) {
Element newCmd = new Element("doubleClick");
newCmd.setAttribute("locator", cmd.get(1).getValue());
this.xmlDestRoot.addContent(newCmd);
@@ -128,23 +128,23 @@
Element newCmd = new Element(cmdElem.getValue());
//List attributes = cmdElem.getAttributes();
int size = cmd.size()-1;
- for(int i=1; i<size; i++ ) {
+ for(int i=1; i<size; i++) {
String paramValue = cmd.get(i).getValue();
System.out.println("param" + (i) + " :" + paramValue);
- newCmd.setAttribute("param" + (i), paramValue );
+ newCmd.setAttribute("param" + (i), paramValue);
}
this.xmlDestRoot.addContent(newCmd);
}
}
- private Element buildCommand(String name, String attrib1, String value1, String attrib2, String value2 ) {
+ private Element buildCommand(String name, String attrib1, String value1, String attrib2, String value2) {
Element newCmd = new Element(name);
- if(attrib1 != null) {
+ if (attrib1 != null) {
newCmd.setAttribute(attrib1, value1);
}
- if(attrib2 != null) {
+ if (attrib2 != null) {
newCmd.setAttribute(attrib2, value2);
}
return newCmd;
@@ -153,7 +153,7 @@
try {
FileOutputStream out = new FileOutputStream(outputFile);
- XMLOutputter serializer = new XMLOutputter( Format.getPrettyFormat());
+ XMLOutputter serializer = new XMLOutputter(Format.getPrettyFormat());
serializer.output(this.xmlDestRoot, out);
out.flush();
out.close();
@@ -166,7 +166,7 @@
*/
public static void main(String[] args) {
// TODO Auto-generated method stub
- if(args.length != 2) {
+ if (args.length != 2) {
System.out.println("Please include the source and destination file paths.");
} else {
SeleniumIDEConverter sel = new SeleniumIDEConverter();
Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java Mon Aug 17 08:20:38 2009
@@ -65,7 +65,7 @@
private String password;
public static void main(String[] args) throws JDOMException, IOException{
- if(args.length == 0) {
+ if (args.length == 0) {
System.out.println("Please include a path for the selenium XML test file.");
} else {
SeleniumXml sel = new SeleniumXml();
@@ -132,81 +132,81 @@
runCommands();
}
- public void runCommands(){
+ public void runCommands() {
Element root = this.doc.getRootElement();
List<Element> nodes = root.getChildren();
runCommands(nodes);
}
- public void runCommands(List<Element> nodes){
+ public void runCommands(List<Element> nodes) {
for(Element elem: nodes) {
- if("type" == elem.getName()) {
+ if ("type" == elem.getName()) {
typeCmd(elem);
- } else if("clickAt" == elem.getName()) {
+ } else if ("clickAt" == elem.getName()) {
clickAt(elem);
- } else if("waitForValue" == elem.getName()) {
+ } else if ("waitForValue" == elem.getName()) {
waitForValue(elem);
- } else if("waitForCondition" == elem.getName()) {
+ } else if ("waitForCondition" == elem.getName()) {
waitForCondition(elem);
- } else if("loadData" == elem.getName()) {
+ } else if ("loadData" == elem.getName()) {
loadData(elem);
- } else if("loadData" == elem.getName()) {
+ } else if ("loadData" == elem.getName()) {
loadData(elem);
- } else if("jythonRunner" == elem.getName()) {
+ } else if ("jythonRunner" == elem.getName()) {
jythonRunner(elem);
- } else if("groovyRunner" == elem.getName()) {
+ } else if ("groovyRunner" == elem.getName()) {
groovyRunner(elem);
- } else if("dataLoop" == elem.getName()) {
+ } else if ("dataLoop" == elem.getName()) {
dataLoop(elem);
- } else if("remoteRequest" == elem.getName()) {
+ } else if ("remoteRequest" == elem.getName()) {
remoteRequest(elem);
- } else if("selectPopup" == elem.getName()) {
+ } else if ("selectPopup" == elem.getName()) {
selectPopup(elem);
- } else if("getAllWindowIds" == elem.getName()) {
+ } else if ("getAllWindowIds" == elem.getName()) {
getAllWindowIds(elem);
- } else if("captureTextInPage" == elem.getName()) {
+ } else if ("captureTextInPage" == elem.getName()) {
captureTextInPageCmd(elem);
- } else if("getSelectedLabel" == elem.getName()) {
+ } else if ("getSelectedLabel" == elem.getName()) {
getSelectedLabel(elem);
- } else if("getSelectedValue" == elem.getName()) {
+ } else if ("getSelectedValue" == elem.getName()) {
getSelectedValue(elem);
- } else if("getSelectedId" == elem.getName()) {
+ } else if ("getSelectedId" == elem.getName()) {
getSelectedId(elem);
- } else if("testcase" == elem.getName()) {
+ } else if ("testcase" == elem.getName()) {
testcase(elem);
- } else if("assertContains" == elem.getName()) {
+ } else if ("assertContains" == elem.getName()) {
assertContains(elem);
- } else if("getHtmlSource" == elem.getName()) {
+ } else if ("getHtmlSource" == elem.getName()) {
getHtmlSource(elem);
- } else if("getBodyText" == elem.getName()) {
+ } else if ("getBodyText" == elem.getName()) {
getBodyText(elem);
- } else if("setup" == elem.getName()) {
+ } else if ("setup" == elem.getName()) {
continue; //setup is handled previously
- } else if("print" == elem.getName()) {
+ } else if ("print" == elem.getName()) {
printCmd(elem);
- } else if("waitForPageToLoad" == elem.getName()) {
+ } else if ("waitForPageToLoad" == elem.getName()) {
waitForPageToLoadCmd(elem);
- } else if("getSelectedIds" == elem.getName()) {
+ } else if ("getSelectedIds" == elem.getName()) {
getSelectedIdsCmd(elem);
- } else if("copy" == elem.getName()) {
+ } else if ("copy" == elem.getName()) {
copyCmd(elem);
- } else if("append" == elem.getName()) {
+ } else if ("append" == elem.getName()) {
appendCmd(elem);
- } else if("open" == elem.getName()) {
+ } else if ("open" == elem.getName()) {
openCmd(elem);
- } else if("click" == elem.getName()) {
+ } else if ("click" == elem.getName()) {
clickCmd(elem);
- } else if("select" == elem.getName()) {
+ } else if ("select" == elem.getName()) {
selectCmd(elem);
- } else if("uniqueId" == elem.getName()) {
+ } else if ("uniqueId" == elem.getName()) {
uniqueIdCmd(elem);
- } else if("randomAlphaString" == elem.getName()) {
+ } else if ("randomAlphaString" == elem.getName()) {
randomAlphaStringCmd(elem);
- } else if("randomString" == elem.getName()) {
+ } else if ("randomString" == elem.getName()) {
randomStringCmd(elem);
- } else if("setSpeed" == elem.getName()) {
+ } else if ("setSpeed" == elem.getName()) {
setSpeed(elem);
} else {
//logger.error("Unknown SeleniumXml command found:"+elem.getName());
@@ -228,7 +228,7 @@
Class[] paramTypes = null;
Object[] args = null;
- if( (param1 != null) && (param2 != null) ) {
+ if ((param1 != null) && (param2 != null)) {
paramTypes = new Class[] {String.class, String.class};
args = new Object[] {param1, param2};
} else if (param1 != null) {
@@ -248,7 +248,7 @@
Object results = m.invoke(this.sel, args);
//Add output parameter to common map
- if( (out != null) && (results != null)) {
+ if ((out != null) && (results != null)) {
addParam(out, results);
}
} catch (Exception e) {
@@ -272,19 +272,19 @@
//this.sel.waitForCondition(script, timeout);
String foundValue = null;
for(int second=0;; second++) {
- if(second >= maxSeconds) {
+ if (second >= maxSeconds) {
// throw new SeleniumException("waitForValue exceeded timeout: " + maxTime);
}
- try{
+ try {
//getValue throws an exception if it can't find locator
// - sleep for 1 sec and try again
// - otherwise break as we found the value
foundValue = sel.getValue(locator);
- if(outParam != null) {
+ if (outParam != null) {
this.addParam(outParam, foundValue);
}
break; //
- } catch(Exception e) {
+ } catch (Exception e) {
//wait for 1 second and then resume
try {
Thread.sleep(1000);
@@ -349,7 +349,7 @@
String responseHandlerMode = elem.getAttributeValue("responseHandlerMode");
List <Element> children = elem.getChildren();
- RemoteRequest loader = new RemoteRequest( this, children, requestUrl, host, responseHandlerMode);
+ RemoteRequest loader = new RemoteRequest(this, children, requestUrl, host, responseHandlerMode);
loader.runTest();
}
@@ -375,7 +375,7 @@
String src = replaceParam(elem.getAttributeValue("src"));
String test = replaceParam(elem.getAttributeValue("test"));
int indxSearch = src.indexOf(test);
- if(indxSearch == -1) {
+ if (indxSearch == -1) {
logger.info("assertContains didn't find " + test + " in the src");
} else {
logger.info("assertContains found " + test + " in the src");
@@ -555,7 +555,7 @@
// Find all the matches.
if (matcher.find()) {
String resultsValue = null;
- if(group != null) {
+ if (group != null) {
resultsValue = matcher.group(Integer.parseInt(group));
} else {
resultsValue = matcher.group();
@@ -585,16 +585,16 @@
int nPrefixSize = 0;
String paramName = elem.getAttributeValue("out");
String size = elem.getAttributeValue("size");
- if(size != null) {
+ if (size != null) {
nSize = Integer.parseInt(size);
}
String prefix = elem.getAttributeValue("prefix");
- if(prefix != null) {
+ if (prefix != null) {
nPrefixSize = prefix.length();
}
String paramValue = null;
- if(prefix != null) {
+ if (prefix != null) {
paramValue = prefix + RandomStringUtils.randomAlphabetic(nSize - nPrefixSize);
} else {
paramValue = RandomStringUtils.randomAlphabetic(nSize);
@@ -660,10 +660,10 @@
return buf.toString();
}
- private boolean isParam(String value ) {
+ private boolean isParam(String value) {
- if( (value.indexOf("${") != -1) &&
- (value.indexOf("}", 1) != -1) ) {
+ if ((value.indexOf("${") != -1) &&
+ (value.indexOf("}", 1) != -1)) {
return true;
}
return false;
@@ -674,7 +674,7 @@
//return if Selenium has already been setup
//e.g. nested selenium test cases.
- if(this.sel != null) return;
+ if (this.sel != null) return;
String serverHost = null;
String serverPort = null;
@@ -682,7 +682,7 @@
String startUrl = null;
//First initialize with property values
- if(props != null ) { //Get setup params from property value
+ if (props != null) { //Get setup params from property value
serverHost = props.getProperty("serverHost", "localhost");
serverPort = props.getProperty("proxyPort", "4444");
@@ -695,16 +695,16 @@
if (elem != null) {
//Override properties if specified
- if( elem.getAttributeValue("serverHost") != null ) {
+ if (elem.getAttributeValue("serverHost") != null) {
serverHost = elem.getAttributeValue("serverHost");
}
- if( elem.getAttributeValue("serverPort") != null ) {
+ if (elem.getAttributeValue("serverPort") != null) {
serverPort = elem.getAttributeValue("serverPort");
}
- if( elem.getAttributeValue("browser") != null ) {
+ if (elem.getAttributeValue("browser") != null) {
browser = elem.getAttributeValue("browser");
}
- if( elem.getAttributeValue("startUrl") != null ) {
+ if (elem.getAttributeValue("startUrl") != null) {
startUrl = elem.getAttributeValue("startUrl");
}
}
Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/TestUtils.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/TestUtils.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/TestUtils.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/TestUtils.java Mon Aug 17 08:20:38 2009
@@ -52,13 +52,13 @@
StringBuffer buff = new StringBuffer(size);
int startIndx = 0;
- if(prefix != null) {
+ if (prefix != null) {
buff.append(prefix);
startIndx = prefix.length();
}
Random rad = new Random();
- for(int i=startIndx; i<size; i++ ) {
+ for(int i=startIndx; i<size; i++) {
buff.append(charMap[rad.nextInt(charMap.length)]);
}
return buff.toString();
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/DojoJSONServiceEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/DojoJSONServiceEventHandler.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/DojoJSONServiceEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/DojoJSONServiceEventHandler.java Mon Aug 17 08:20:38 2009
@@ -115,7 +115,7 @@
throw new EventHandlerException("JSON Object was empty; fatal error!");
}
String htmlJsonStr = "<html><head></head><body><textarea style=\"width: 350px; height: 100px;\">" + jsonStr + "</textarea></body></html>";
- Debug.logInfo( "htmlJsonStr:" + htmlJsonStr, module);
+ Debug.logInfo("htmlJsonStr:" + htmlJsonStr, module);
// set the X-JSON content type
response.setContentType("text/html");
// jsonStr.length is not reliable for unicode characters
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java Mon Aug 17 08:20:38 2009
@@ -76,17 +76,17 @@
if (o instanceof NumberModel) {
NumberModel s = (NumberModel) o;
- return Double.valueOf( s.getAsNumber().doubleValue() );
+ return Double.valueOf(s.getAsNumber().doubleValue());
}
if (o instanceof SimpleNumber) {
SimpleNumber s = (SimpleNumber) o;
- return Double.valueOf( s.getAsNumber().doubleValue() );
+ return Double.valueOf(s.getAsNumber().doubleValue());
}
if (o instanceof SimpleScalar) {
SimpleScalar s = (SimpleScalar) o;
- return Double.valueOf( s.getAsString() );
+ return Double.valueOf(s.getAsString());
}
- return Double.valueOf( o.toString() );
+ return Double.valueOf(o.toString());
}
return Double.valueOf(0.00);
}
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java Mon Aug 17 08:20:38 2009
@@ -103,7 +103,7 @@
}
if (o instanceof SimpleScalar) {
SimpleScalar s = (SimpleScalar) o;
- return Integer.valueOf( s.getAsString() );
+ return Integer.valueOf(s.getAsString());
}
return Integer.valueOf(o.toString());
}
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java Mon Aug 17 08:20:38 2009
@@ -70,7 +70,7 @@
return out;
} catch (TransformerException e) {
- Debug.logError("FOP transform failed:" + e, module );
+ Debug.logError("FOP transform failed:" + e, module);
throw new GeneralException("Unable to transform FO to PDF", e);
}
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Mon Aug 17 08:20:38 2009
@@ -1848,7 +1848,7 @@
String name = modelFormField.getParameterName(context);
String value = modelFormField.getEntry(context, lookupField.getDefaultValue(context));
- if ( value == null) {
+ if (value == null) {
value = "";
}
String size = Integer.toString(lookupField.getSize());
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Mon Aug 17 08:20:38 2009
@@ -314,7 +314,7 @@
this.type = formElement.getAttribute("type");
}
if (this.target == null || formElement.hasAttribute("target")) {
- setTarget( formElement.getAttribute("target") );
+ setTarget(formElement.getAttribute("target"));
}
if (this.targetWindowExdr == null || formElement.hasAttribute("target-window")) {
setTargetWindow(formElement.getAttribute("target-window"));
@@ -930,7 +930,7 @@
}
currentFieldGroupName = currentFieldGroup.getId();
- if (lastFieldGroup != null ) {
+ if (lastFieldGroup != null) {
lastFieldGroupName = lastFieldGroup.getId();
if (!lastFieldGroupName.equals(currentFieldGroupName)) {
lastFieldGroup.renderEndString(writer, context, formStringRenderer);
@@ -2294,7 +2294,7 @@
return this.targetWindowExdr.expandString(context);
}
- public void setTargetWindow( String val ) {
+ public void setTargetWindow(String val) {
this.targetWindowExdr = FlexibleStringExpander.getInstance(val);
}
@@ -2732,7 +2732,7 @@
return this.id;
}
- public void setId( String id) {
+ public void setId(String id) {
this.id = id;
}
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Mon Aug 17 08:20:38 2009
@@ -874,7 +874,7 @@
* @return
*/
public boolean shouldBeRed(Map<String, Object> context) {
- // red-when ( never | before-now | after-now | by-name ) "by-name"
+ // red-when (never | before-now | after-now | by-name) "by-name"
String redCondition = this.redWhen;
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=804895&r1=804894&r2=804895&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Mon Aug 17 08:20:38 2009
@@ -1286,7 +1286,7 @@
writer.append("\" ");
String formType = modelForm.getType();
- if (formType.equals("upload") ) {
+ if (formType.equals("upload")) {
writer.append(" enctype=\"multipart/form-data\"");
}
@@ -1813,7 +1813,7 @@
writer.append("_ic\" value=\"Y\"").append((ignCase ? " checked=\"checked\"" : "")).append("/>");
writer.append(ignoreCase);
} else {
- writer.append( "<input type=\"hidden\" name=\"");
+ writer.append("<input type=\"hidden\" name=\"");
writer.append(modelFormField.getParameterName(context));
writer.append("_ic\" value=\"").append((ignCase ? "Y" : "")).append("\"/>");
}
@@ -2354,7 +2354,7 @@
if (viewIndex > 0) {
writer.append("\"><a href=\"");
if (ajaxEnabled) {
- writer.append("javascript:ajaxUpdateAreas('").append(createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + 0 + anchor, context)).append( "')");
+ writer.append("javascript:ajaxUpdateAreas('").append(createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + 0 + anchor, context)).append("')");
} else {
linkText = prepLinkText + 0 + anchor;
appendOfbizUrl(writer, urlPath + linkText);
@@ -2792,7 +2792,7 @@
writer.append(" class=\"");
writer.append(leftStyle);
writer.append("\"");
- writer.append(">" );
+ writer.append(">");
}
writer.append(leftText);
if (UtilValidate.isNotEmpty(leftStyle)) {
@@ -2809,7 +2809,7 @@
writer.append(" class=\"");
writer.append(style);
writer.append("\"");
- writer.append(">" );
+ writer.append(">");
}
writer.append(text);
if (UtilValidate.isNotEmpty(style)) {
@@ -2826,7 +2826,7 @@
writer.append(" class=\"");
writer.append(rightStyle);
writer.append("\"");
- writer.append(">" );
+ writer.append(">");
}
writer.append(rightText);
if (UtilValidate.isNotEmpty(rightStyle)) {