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 2013/08/08 14:28:03 UTC
svn commit: r1511742 [5/5] - in /ofbiz/trunk:
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/src/org/ofbiz/accounting/tax/
applications/accounting/src/org/ofbi...
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java Thu Aug 8 12:28:01 2013
@@ -87,7 +87,7 @@ public class CachedClassLoader extends U
registerClass(org.ofbiz.base.util.TimeDuration.class);
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- for(Init cachedClassLoader : ServiceLoader.load(Init.class, loader)) {
+ for (Init cachedClassLoader : ServiceLoader.load(Init.class, loader)) {
try {
cachedClassLoader.loadClasses(loader);
} catch (Exception e) {
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java Thu Aug 8 12:28:01 2013
@@ -77,7 +77,7 @@ public class OfbizBshBsfEngine extends B
throw new BSFException("bsh internal error: "+e.toString());
}
- for(int i=0; i<declaredBeans.size(); i++) {
+ for (int i=0; i<declaredBeans.size(); i++) {
BSFDeclaredBean bean = (BSFDeclaredBean)declaredBeans.get(i);
declareBean(bean);
}
@@ -127,7 +127,7 @@ public class OfbizBshBsfEngine extends B
*/
final static String bsfApplyMethod =
"_bsfApply(_bsfNames, _bsfArgs, _bsfText) {"
- +"for(i=0;i<_bsfNames.length;i++)"
+ +"for (i=0;i<_bsfNames.length;i++)"
+"this.namespace.setVariable(_bsfNames[i], _bsfArgs[i]);"
+"return this.interpreter.eval(_bsfText, this.namespace);"
+"}";
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java Thu Aug 8 12:28:01 2013
@@ -569,7 +569,7 @@ public class UtilFormatOut {
if (original.length() <= 4) return original;
StringBuilder buffer = new StringBuilder();
- for(int i=0; i < original.length()-4 ; i++) {
+ for (int i=0; i < original.length()-4 ; i++) {
buffer.append('*');
}
buffer.append(original.substring(original.length()-4));
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java Thu Aug 8 12:28:01 2013
@@ -920,7 +920,7 @@ public class UtilHttp {
public static String getContentTypeByFileName(String fileName) {
FileNameMap mime = URLConnection.getFileNameMap();
- return mime.getContentTypeFor(fileName);
+ return mime.getContentTypefor (fileName);
}
/**
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=1511742&r1=1511741&r2=1511742&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 Thu Aug 8 12:28:01 2013
@@ -300,7 +300,7 @@ public class UtilValidate {
/** Returns true if single character c(actually a string) is contained within string s. */
public static boolean charInString(char c, String s) {
return (s.indexOf(c) != -1);
- // for(int i = 0; i < s.length; i++) {
+ // for (int i = 0; i < s.length; i++) {
// if (s.charAt(i) == c) return true;
// }
// return false;
Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java Thu Aug 8 12:28:01 2013
@@ -50,7 +50,7 @@ public class CrossSubdomainSessionValve
// replace any Tomcat-generated session cookies with our own
Cookie[] cookies = request.getCookies();
if (cookies != null) {
- for(Cookie cookie : cookies) {
+ for (Cookie cookie : cookies) {
if (SessionConfig.getSessionCookieName(null).equals(cookie.getName())) {
replaceCookie(request, response, cookie);
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java Thu Aug 8 12:28:01 2013
@@ -1213,7 +1213,7 @@ public class ModelEntity implements Comp
if (relation.keyMaps.size() < 1) { return ""; }
int i = 0;
- for(; i < relation.keyMaps.size() - 1; i++) {
+ for (; i < relation.keyMaps.size() - 1; i++) {
ModelKeyMap keyMap = (ModelKeyMap)relation.keyMaps.get(i);
if (keyMap != null)
returnString = returnString + "\"" + tableName + "_" + keyMap.relColName + "=\" + " + ModelUtil.lowerFirstChar(relation.mainEntity.entityName) + ".get" + ModelUtil.upperFirstChar(keyMap.fieldName) + "() + \"&\" + ";
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=1511742&r1=1511741&r2=1511742&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 Thu Aug 8 12:28:01 2013
@@ -273,7 +273,7 @@ public class EntityTestSuite extends Ent
"primaryParentNodeId", GenericEntity.NULL_FIELD,
"description", "root");
int level1;
- for(level1 = 0; level1 < _level1max; level1++) {
+ for (level1 = 0; level1 < _level1max; level1++) {
String nextSeqId = delegator.getNextSeqId("TestingNode");
GenericValue v = delegator.create("TestingNode", "testingNodeId", nextSeqId,
"primaryParentNodeId", root.get("testingNodeId"),
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java Thu Aug 8 12:28:01 2013
@@ -371,7 +371,7 @@ public class CoreEvents {
String[] sp = servicePath.split("\\|\\|");
Object servicePathObject = null;
Map<String, Object> servicePathMap = null;
- for(int i=0;i<sp.length;i++) {
+ for (int i=0;i<sp.length;i++) {
String servicePathEntry = sp[i];
if (null==servicePathMap) {
servicePathObject = serviceResult.get(servicePathEntry);
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java Thu Aug 8 12:28:01 2013
@@ -182,7 +182,7 @@ public class HtmlWidget extends ModelScr
}
contextMs.push();
- for(Map.Entry<String, Object> mapEntry: contextMs.entrySet()) {
+ for (Map.Entry<String, Object> mapEntry: contextMs.entrySet()) {
Object value = mapEntry.getValue();
if (value instanceof GenericValue) {
contextMs.put(mapEntry.getKey(), GenericValueHtmlWrapper.create((GenericValue) value));
Modified: ofbiz/trunk/specialpurpose/appserver/src/org/ofbiz/appservers/GenerateContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/appserver/src/org/ofbiz/appservers/GenerateContainer.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/appserver/src/org/ofbiz/appservers/GenerateContainer.java (original)
+++ ofbiz/trunk/specialpurpose/appserver/src/org/ofbiz/appservers/GenerateContainer.java Thu Aug 8 12:28:01 2013
@@ -156,7 +156,7 @@ public class GenerateContainer implement
throw new ContainerException("Error in Geronimo deployment, please check the log");
}
- for(int inst = 0; inst <= instancesNumber; inst++) {
+ for (int inst = 0; inst <= instancesNumber; inst++) {
instanceNumber = (inst == 0 ? "" : inst).toString();
GenerateGeronimoDeployment geronimoDeployment = new GenerateGeronimoDeployment();
List<String> classpathJars = geronimoDeployment.generate(args[0], geronimoHostHome, instanceNumber);
@@ -291,8 +291,8 @@ public class GenerateContainer implement
}
}
is.close();
- process.waitFor();
- // System.out.println(process.waitFor());
+ process.waitfor ();
+ // System.out.println(process.waitfor ());
// System.out.println("exit value" + process.exitValue());
Debug.logInfo(ofbizName + " undeployment ended" , module);
} catch (IOException e) {
@@ -352,8 +352,8 @@ public class GenerateContainer implement
}
}
is.close();
- process.waitFor();
-// System.out.println(process.waitFor());
+ process.waitfor ();
+// System.out.println(process.waitfor ());
// System.out.println("exit value" + process.exitValue());
Debug.logInfo(ofbizName + " deployment ended" , module);
} catch (IOException e) {
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java Thu Aug 8 12:28:01 2013
@@ -2332,7 +2332,7 @@ public class EbayStore {
if (UtilValidate.isNotEmpty(getMyeBaySelling.getReturnedSoldList())) tempSoldItems = (getMyeBaySelling.getReturnedSoldList().getOrderTransactionArray()).getOrderTransaction();
if (UtilValidate.isNotEmpty(tempSoldItems)) {
- for(int i = 0; i < tempSoldItems.length; i++) {
+ for (int i = 0; i < tempSoldItems.length; i++) {
ItemType soldItem = tempSoldItems[i].getTransaction().getItem();
Map <String, Object> soldItemMap = getClosedItem(soldItem);
soldItemMap.put("sellingStatus", "sold");
Modified: ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java (original)
+++ ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java Thu Aug 8 12:28:01 2013
@@ -87,7 +87,7 @@ public class GoogleBaseSearchEvents {
List<String> listTemp = FastList.newInstance();
String temp = selectResult.substring(1, selectResult.length()-1);
String arrayTemp[] = temp.split(",");
- for(int i=0; i<arrayTemp.length; i++){
+ for (int i=0; i<arrayTemp.length; i++){
listTemp.add(arrayTemp[i].trim());
}
productExportList = listTemp;
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Thu Aug 8 12:28:01 2013
@@ -301,7 +301,7 @@ public class PosTransaction implements S
ProductConfigWrapper pcw = null;
pcw = item.getConfigWrapper();
List<ConfigOption> selected = pcw.getSelectedOptions();
- for(ConfigOption configoption : selected) {
+ for (ConfigOption configoption : selected) {
Map<String, Object> itemInfo = FastMap.newInstance();
if (configoption.isSelected() && !configoption.isDefault()) {
itemInfo.put("productId", "");
@@ -615,7 +615,7 @@ public class PosTransaction implements S
cart.removeAdjustment(cartDiscount);
cartDiscount = -1;
}
- for(String productId : skuDiscounts.keySet()) {
+ for (String productId : skuDiscounts.keySet()) {
ShoppingCartItem item = cart.findCartItem(productId, null, null, null, BigDecimal.ZERO);
Integer itemAdj = skuDiscounts.remove(productId);
if (itemAdj != null) {
@@ -1502,7 +1502,7 @@ public class PosTransaction implements S
}
String selectedCartItems[] = new String[cart.size()];
- for(int i = 0; i < cart.size(); i++) {
+ for (int i = 0; i < cart.size(); i++) {
Integer integer = i;
selectedCartItems[i] = integer.toString();
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java Thu Aug 8 12:28:01 2013
@@ -147,7 +147,7 @@ public class ConfigureItem extends XPage
private void resetButtons() {
Object[] questions = questionHashMap.values().toArray();
- for(Object question : questions) {
+ for (Object question : questions) {
((Question)question).reset();
}
return;
@@ -199,8 +199,8 @@ public class ConfigureItem extends XPage
private void getButtons() {
ArrayList<XButton> buttonList = new ArrayList<XButton>();
- for(String[] buttonSingleArray : buttonArray) {
- for(String buttonName : buttonSingleArray) {
+ for (String[] buttonSingleArray : buttonArray) {
+ for (String buttonName : buttonSingleArray) {
//Debug.logInfo("ButtonName: "+buttonName, module);
XButton button = (XButton) m_dialog.findComponent(buttonName);
buttonList.add(button);
@@ -409,14 +409,14 @@ public class ConfigureItem extends XPage
boolean isAdjusting = event.getValueIsAdjusting();
if (!isAdjusting) {
int[] selected = jlist.getSelectedIndices();
- //for(int i: selected) {
+ //for (int i: selected) {
// Debug.logInfo(""+i, module);
//}
List<ConfigOption> options = question.getOptions();
for (ConfigOption option: options) {
option.setSelected(false);
}
- for(int i: selected) {
+ for (int i: selected) {
ConfigOption option = options.get(i);
option.setSelected(true);
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java Thu Aug 8 12:28:01 2013
@@ -97,7 +97,7 @@ public class Keyboard extends XPage {
"1" ,"2" ,"3" ,"4" ,"5" ,"6" ,"7" ,"8" ,"9" ,"0" , "At",
"Dot", "Dash", "Del", "Space", "Clear", "Enter", "Cancel", "Shift", "ShiftLock"};
XButton button = null;
- for(String key : keys) {
+ for (String key : keys) {
button = (XButton) m_dialog.findComponent("char" + key);
XEventHelper.addMouseHandler(this, button, "trigger" + key);
}
@@ -110,7 +110,7 @@ public class Keyboard extends XPage {
private void setUppercase() {
String[] keys = {"A" ,"B" ,"C" ,"D" ,"E" ,"F" ,"G" ,"H" ,"I" ,"J" ,"K" ,"L" ,"M" ,"N" ,"O" ,"P" ,"Q" ,"R" ,"S" ,"T" ,"U" ,"V" ,"W" ,"X" ,"Y" ,"Z"};
- for(String key : keys) {
+ for (String key : keys) {
setButtonText("char" + key, key);
}
}
@@ -118,7 +118,7 @@ public class Keyboard extends XPage {
private void setLowercase() {
String[] keys = {"a" ,"b" ,"c" ,"d" ,"e" ,"f" ,"g" ,"h" ,"i" ,"j" ,"k" ,"l" ,"m" ,"n" ,"o" ,"p" ,"q" ,"r" ,"s" ,"t" ,"u" ,"v" ,"w" ,"x" ,"y" ,"z"};
- for(String key : keys) {
+ for (String key : keys) {
setButtonText("char" + key, key);
}
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java?rev=1511742&r1=1511741&r2=1511742&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java Thu Aug 8 12:28:01 2013
@@ -249,7 +249,7 @@ public class NumericKeypad extends XPage
private int countChars(String string, char c) {
int count = 0;
- for(int i=0; i<string.length(); i++) {
+ for (int i=0; i<string.length(); i++) {
if (string.charAt(i) == c) {
count++;
}
@@ -259,7 +259,7 @@ public class NumericKeypad extends XPage
private String stripChars(String string, char c) {
StringBuffer buf = new StringBuffer();
- for(int i=0; i<string.length(); i++) {
+ for (int i=0; i<string.length(); i++) {
char current = string.charAt(i);
if (current != c) {
buf.append(current);