svn commit: r757046 [3/4] - in /ofbiz/trunk/framework/base/sr
Locked
 
|
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=757046&r1=757045&r2=757046&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 Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -30,7 +30,7 @@ public class UtilFormatOut { public static final String module = UtilFormatOut.class.getName(); - + public static String safeToString(Object obj) { if (obj != null) { return obj.toString(); @@ -38,7 +38,7 @@ return ""; } } - + // ------------------- price format handlers ------------------- static DecimalFormat priceDecimalFormat = new DecimalFormat("#,##0.00"); static DecimalFormat priceNumberFormat = new DecimalFormat("##0.00"); @@ -270,7 +270,7 @@ public static String formatQuantity(double quantity) { return quantityDecimalFormat.format(quantity); } - + public static String formatPaddedNumber(long number, int numericPadding) { StringBuilder outStrBfr = new StringBuilder(Long.toString(number)); while (numericPadding > outStrBfr.length()) { @@ -278,7 +278,7 @@ } return outStrBfr.toString(); } - + public static String formatPaddingRemove(String original) { if (original == null) return null; StringBuilder orgBuf = new StringBuilder(original); @@ -287,9 +287,9 @@ } return orgBuf.toString(); } - - - // ------------------- date handlers ------------------- + + + // ------------------- date handlers ------------------- /** Formats a String timestamp into a nice string * @param timestamp String timestamp to be formatted * @return A String with the formatted date/time @@ -299,7 +299,7 @@ return ""; DateFormat df = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.FULL); java.util.Date date = timestamp; - return df.format(date); + return df.format(date); } // ------------------- null string handlers ------------------- @@ -517,11 +517,11 @@ public static String makeSqlSafe(String unsafeString) { return unsafeString.replaceAll("'","''"); } - + public static String formatPrintableCreditCard(String original) { if (original == null) return null; if (original.length() <= 4) return original; - + StringBuffer buffer = new StringBuffer(); for(int i=0; i < original.length()-4 ; i++) { buffer.append('*'); Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilGenerics.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 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=757046&r1=757045&r2=757046&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 Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -60,14 +60,14 @@ public class UtilHttp { public static final String module = UtilHttp.class.getName(); - + public static final String MULTI_ROW_DELIMITER = "_o_"; public static final String ROW_SUBMIT_PREFIX = "_rowSubmit_o_"; public static final String COMPOSITE_DELIMITER = "_c_"; public static final int MULTI_ROW_DELIMITER_LENGTH = MULTI_ROW_DELIMITER.length(); public static final int ROW_SUBMIT_PREFIX_LENGTH = ROW_SUBMIT_PREFIX.length(); public static final int COMPOSITE_DELIMITER_LENGTH = COMPOSITE_DELIMITER.length(); - + /** * Create a combined map from servlet context, session, attributes and parameters * @return The resulting Map @@ -87,7 +87,7 @@ combinedMap.putAll(getSessionMap(request, namesToSkip)); // session overrides application combinedMap.putAll(getParameterMap(request)); // parameters override session combinedMap.putAll(getAttributeMap(request)); // attributes trump them all - + return combinedMap; } @@ -132,7 +132,7 @@ } paramMap.put(name, value); } - + paramMap.putAll(getPathInfoOnlyParameterMap(request, nameSet, onlyIncludeOrSkip)); if (paramMap.size() == 0) { @@ -147,10 +147,10 @@ Debug.logVerbose("Made Request Parameter Map with [" + paramMap.size() + "] Entries", module); Debug.logVerbose("Request Parameter Map Entries: " + System.getProperty("line.separator") + UtilMisc.printMap(paramMap), module); } - + return canonicalizeParameterMap(paramMap); } - + public static Map<String, Object> getQueryStringOnlyParameterMap(HttpServletRequest request) { Map<String, Object> paramMap = FastMap.newInstance(); String queryString = request.getQueryString(); @@ -173,11 +173,11 @@ } return canonicalizeParameterMap(paramMap); } - + public static Map<String, Object> getPathInfoOnlyParameterMap(HttpServletRequest request, Set<? extends String> nameSet, Boolean onlyIncludeOrSkip) { boolean onlyIncludeOrSkipPrim = onlyIncludeOrSkip == null ? true : onlyIncludeOrSkip.booleanValue(); Map<String, Object> paramMap = FastMap.newInstance(); - + // now add in all path info parameters /~name1=value1/~name2=value2/ // note that if a parameter with a given name already exists it will be put into a list with all values String pathInfoStr = request.getPathInfo(); @@ -217,17 +217,17 @@ } } } - + return canonicalizeParameterMap(paramMap); } - + public static Map<String, Object> getUrlOnlyParameterMap(HttpServletRequest request) { // NOTE: these have already been through canonicalizeParameterMap, so not doing it again here Map<String, Object> paramMap = getQueryStringOnlyParameterMap(request); paramMap.putAll(getPathInfoOnlyParameterMap(request, null, null)); return paramMap; } - + public static Map<String, Object> canonicalizeParameterMap(Map<String, Object> paramMap) { for (Map.Entry<String, Object> paramEntry: paramMap.entrySet()) { if (paramEntry.getValue() instanceof String) { @@ -242,7 +242,7 @@ } return paramMap; } - + public static String canonicalizeParameter(String paramValue) { try { String cannedStr = StringUtil.defaultWebEncoder.canonicalize(paramValue, StringUtil.esapiCanonicalizeStrict); @@ -253,7 +253,7 @@ return paramValue; } } - + /** * Create a map from a HttpRequest (attributes) object used in JSON requests * @return The resulting Map @@ -274,7 +274,7 @@ return returnMap; } - + /** * Create a map from a HttpRequest (attributes) object * @return The resulting Map @@ -373,7 +373,7 @@ if (Debug.verboseOn()) { Debug.logVerbose("Made ServletContext Attribute Map with [" + servletCtxMap.size() + "] Entries", module); - Debug.logVerbose("ServletContext Attribute Map Entries: " + System.getProperty("line.separator") + UtilMisc.printMap(servletCtxMap), module); + Debug.logVerbose("ServletContext Attribute Map Entries: " + System.getProperty("line.separator") + UtilMisc.printMap(servletCtxMap), module); } return servletCtxMap; @@ -518,14 +518,14 @@ } return appName; } - + public static void setInitialRequestInfo(HttpServletRequest request) { HttpSession session = request.getSession(); if (UtilValidate.isNotEmpty((String) session.getAttribute("_WEBAPP_NAME_"))) { // oops, info already in place... return; } - + StringBuffer fullRequestUrl = UtilHttp.getFullRequestUrl(request); session.setAttribute("_WEBAPP_NAME_", UtilHttp.getApplicationName(request)); @@ -533,7 +533,7 @@ session.setAttribute("_CLIENT_REQUEST_", fullRequestUrl.toString()); session.setAttribute("_CLIENT_USER_AGENT_", request.getHeader("User-Agent") != null ? request.getHeader("User-Agent") : ""); session.setAttribute("_CLIENT_REFERER_", request.getHeader("Referer") != null ? request.getHeader("Referer") : ""); - + session.setAttribute("_CLIENT_FORWARDED_FOR_", request.getHeader("X-Forwarded-For")); session.setAttribute("_CLIENT_REMOTE_ADDR_", request.getRemoteAddr()); session.setAttribute("_CLIENT_REMOTE_HOST_", request.getRemoteHost()); @@ -571,7 +571,7 @@ } public static Locale getLocale(HttpServletRequest request, HttpSession session, Object appDefaultLocale) { - // check session first, should override all if anything set there + // check session first, should override all if anything set there Object localeObject = session != null ? session.getAttribute("locale") : null; // next see if the userLogin has a value @@ -585,7 +585,7 @@ localeObject = userLogin.get("lastLocale"); } } - + // no user locale? before global default try appDefaultLocale if specified if (localeObject == null && !UtilValidate.isEmpty(appDefaultLocale)) { localeObject = appDefaultLocale; @@ -641,7 +641,7 @@ public static void setTimeZone(HttpSession session, TimeZone timeZone) { session.setAttribute("timeZone", timeZone); } - + public static TimeZone getTimeZone(HttpServletRequest request) { HttpSession session = request.getSession(); TimeZone timeZone = (TimeZone) session.getAttribute("timeZone"); @@ -777,7 +777,7 @@ } return buf.toString(); } - + public static String getRequestUriFromTarget(String target) { if (target == null || target.length() == 0) return null; int endOfRequestUri = target.length(); @@ -1027,7 +1027,7 @@ public static String stripViewParamsFromQueryString(String queryString) { return stripViewParamsFromQueryString(queryString, null); } - + public static String stripViewParamsFromQueryString(String queryString, String paginatorNumber) { Set<String> paramNames = new HashSet<String>(); if (UtilValidate.isNotEmpty(paginatorNumber)) { @@ -1039,7 +1039,7 @@ paramNames.add("viewSize" + paginatorNumber); return stripNamedParamsFromQueryString(queryString, paramNames); } - + public static String stripNamedParamsFromQueryString(String queryString, Collection<String> paramNames) { String retStr = null; if (UtilValidate.isNotEmpty(queryString)) { @@ -1066,12 +1066,12 @@ } return retStr; } - + /** - * Given multi form data with the ${param}_o_N notation, creates a Collection + * Given multi form data with the ${param}_o_N notation, creates a Collection * of Maps for the submitted rows. Each Map contains the key/value pairs - * of a particular row. The keys will be stripped of the _o_N suffix. - * There is an additionaly key "row" for each Map that holds the + * of a particular row. The keys will be stripped of the _o_N suffix. + * There is an additionaly key "row" for each Map that holds the * index of the row. */ public static Collection<Map<String, Object>> parseMultiFormData(Map<String, Object> parameters) { @@ -1134,30 +1134,30 @@ * The prefix should be a regular paramter name such as meetingDate. The * suffix is the composite field, such as the hour of the meeting. The * result would be meetingDate_${COMPOSITE_DELIMITER}_hour. - * + * * @param prefix * @param suffix * @return the composite parameter */ public static String makeCompositeParam(String prefix, String suffix) { - return prefix + COMPOSITE_DELIMITER + suffix; + return prefix + COMPOSITE_DELIMITER + suffix; } /** - * Given the prefix of a composite parameter, recomposes a single Object from + * Given the prefix of a composite parameter, recomposes a single Object from * the composite according to compositeType. For example, consider the following * form widget field, - * + * * <field name="meetingDate"> * <date-time type="timestamp" input-method="time-dropdown"> * </field> - * + * * The result in HTML is three input boxes to input the date, hour and minutes separately. * The parameter names are named meetingDate_c_date, meetingDate_c_hour, meetingDate_c_minutes. * Additionally, there will be a field named meetingDate_c_compositeType with a value of "Timestamp". * where _c_ is the COMPOSITE_DELIMITER. These parameters will then be recomposed into a Timestamp * object from the composite fields. - * + * * @param request * @param prefix * @return Composite object from data or nulll if not supported or a parsing error occured. @@ -1179,7 +1179,7 @@ String value = request.getParameter(name); // key = suffix, value = parameter data - data.put(suffix, value); + data.put(suffix, value); } if (Debug.verboseOn()) { Debug.logVerbose("Creating composite type with parameter data: " + data.toString(), module); } @@ -1225,13 +1225,13 @@ } /** * checks, if the current request comes from a searchbot - * + * * @param request * @return whether the request is from a web searchbot */ public static boolean checkURLforSpiders(HttpServletRequest request) { boolean result = false; - + String spiderRequest = (String) request.getAttribute("_REQUEST_FROM_SPIDER_"); if (UtilValidate.isNotEmpty(spiderRequest)) { if ("Y".equals(spiderRequest)) { @@ -1244,7 +1244,7 @@ List<String> spiderList = StringUtil.split(UtilProperties.getPropertyValue("url", "link.remove_lsessionid.user_agent_list"), ","); if (UtilValidate.isNotEmpty(spiderList)) { for (String spiderNameElement: spiderList) { - Pattern p = Pattern.compile("^.*" + spiderNameElement + ".*$", Pattern.CASE_INSENSITIVE); + Pattern p = Pattern.compile("^.*" + spiderNameElement + ".*$", Pattern.CASE_INSENSITIVE); Matcher m = p.matcher(initialUserAgent); if (m.find()) { request.setAttribute("_REQUEST_FROM_SPIDER_", "Y"); @@ -1254,10 +1254,10 @@ } } } - - if (!result) + + if (!result) request.setAttribute("_REQUEST_FROM_SPIDER_", "N"); - + return result; } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJ2eeCompat.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJ2eeCompat.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJ2eeCompat.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJ2eeCompat.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,7 +25,7 @@ * */ public class UtilJ2eeCompat { - + public static final String module = UtilJ2eeCompat.class.getName(); public static final String TOMCAT = "apache tomcat"; Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,7 +29,7 @@ /** * Java Source Parsing Utilities - * + * * NOTE: the approach here is not the best and it may be better to use a parser, line one based on antlr, or using a Java Bytecode parser to look at .class files. * */ @@ -39,29 +39,29 @@ public static String findRealPathAndFileForClass(String fullyQualifiedClassName) { // search through the component directories, in the src directory for each, using the class path as the path within it - + String sourceSubPath = fullyQualifiedClassName.substring(0, fullyQualifiedClassName.lastIndexOf(".")).replace('.', File.separatorChar); String classFileName = fullyQualifiedClassName.substring(fullyQualifiedClassName.lastIndexOf(".")+1) + ".java"; - + Collection<ComponentConfig> allComponentConfigs = ComponentConfig.getAllComponents(); for (ComponentConfig cc: allComponentConfigs) { String rootDirectory = cc.getRootLocation(); if (!rootDirectory.endsWith(File.separatorChar + "")) rootDirectory += File.separatorChar; rootDirectory += "src" + File.separatorChar; - + File rootDirFile = new File(rootDirectory); if (!rootDirFile.exists()) { // no src directory, move along continue; } - + String classDir = rootDirectory + sourceSubPath; File classDirFile = new File(classDir); if (!classDirFile.exists()) { // no src class sub-directory, move along continue; } - + String fullPathAndFile = classDir + File.separatorChar + classFileName; File classFile = new File(fullPathAndFile); if (classFile.exists()) { @@ -69,15 +69,15 @@ return fullPathAndFile; } } - + return null; } - + public static int findServiceMethodBlockStart(String methodName, String javaFile) { if (Debug.verboseOn()) Debug.logVerbose("In findServiceMethodBlockStart for " + methodName, module); - + // starts with something like this: public static Map exportServiceEoModelBundle(DispatchContext dctx, Map context) { - + // start with the main pattern int methodNameIndex = javaFile.indexOf("public static Map " + methodName + "(DispatchContext dctx, Map context) {"); // try a little less... and some nice messy variations... @@ -86,17 +86,17 @@ if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + " (DispatchContext "); if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + "( DispatchContext "); if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + " ( DispatchContext "); - + // not found! if (methodNameIndex < 0) return -1; - + // find the open brace and return its position return javaFile.indexOf("{", methodNameIndex); } - + public static int findEndOfBlock(int blockStart, String javaFile) { //Debug.logInfo("In findEndOfBlock for blockStart " + blockStart, module); - + int nextOpen = javaFile.indexOf("{", blockStart+1); int nextClose = javaFile.indexOf("}", blockStart+1); if (nextOpen > 0 && nextClose > 0 && nextClose > nextOpen) { @@ -104,7 +104,7 @@ } // if no close, end with couldn't find if (nextClose < 0) return -1; - // while nextOpen is found and is before the next close, then recurse (list + // while nextOpen is found and is before the next close, then recurse (list while (nextOpen > -1 && nextOpen < nextClose) { int endOfSubBlock = findEndOfBlock(nextOpen, javaFile); if (endOfSubBlock < 0) return -1; @@ -112,7 +112,7 @@ nextClose = javaFile.indexOf("}", endOfSubBlock+1); //Debug.logInfo("In loop in findEndOfBlock for nextOpen=" + nextOpen + ", nextClose=" + nextClose + ", endOfSubBlock=" + endOfSubBlock, module); } - + // at this point there should be no nextOpen or nextOpen is after the nextClose, meaning we're at the end of the block return nextClose; } @@ -130,7 +130,7 @@ } public static Set<String> findServiceCallsInBlock(int blockStart, int blockEnd, String javaFile) { Set<String> serviceNameSet = FastSet.newInstance(); - + int dispatcherIndex = javaFile.indexOf("dispatcher.", blockStart+1); while (dispatcherIndex > 0 && dispatcherIndex < blockEnd) { // verify it is a call we're looking for @@ -150,7 +150,7 @@ dispatcherIndex = javaFile.indexOf("dispatcher.", openParenIndex); } - + return serviceNameSet; } @@ -162,7 +162,7 @@ entityMethodNames.add("getGroupHelperName"); entityMethodNames.add("getEntityHelperName"); entityMethodNames.add("getEntityHelper"); - + entityMethodNames.add("makeValue"); entityMethodNames.add("makeValueSingle"); entityMethodNames.add("makeValidValue"); @@ -173,7 +173,7 @@ entityMethodNames.add("createSingle"); entityMethodNames.add("removeByAnd"); entityMethodNames.add("removeByCondition"); - + entityMethodNames.add("create"); entityMethodNames.add("createSingle"); entityMethodNames.add("removeByAnd"); @@ -218,10 +218,10 @@ entityNameSet.add(entityName); } } - + delegatorIndex = javaFile.indexOf("delegator.", openParenIndex); } - + return entityNameSet; } 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=757046&r1=757045&r2=757046&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 Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -43,7 +43,7 @@ public class UtilMisc { public static final String module = UtilMisc.class.getName(); - + public static final BigDecimal ZERO_BD = BigDecimal.ZERO; /** @@ -172,11 +172,11 @@ theBuf.append(entry.getKey()); theBuf.append(" --> "); theBuf.append(entry.getValue()); - theBuf.append(System.getProperty("line.separator")); + theBuf.append(System.getProperty("line.separator")); } return theBuf.toString(); } - + public static <T> List<T> makeListWritable(Collection<? extends T> col) { List<T> result = FastList.newInstance(); if (col != null) result.addAll(col); @@ -194,10 +194,10 @@ if (col != null) result.addAll(col); return result; } - - /** - * This change a Map to be Serializable by removing all entries with values that are not Serializable. - * + + /** + * This change a Map to be Serializable by removing all entries with values that are not Serializable. + * * @param <V> * @param map * @return @@ -216,7 +216,7 @@ //if (!(map instanceof Serializable)) { // Debug.logInfo("Parameter Map is not Serializable!", module); //} - + //for (Map.Entry<String, V> mapEntry: map.entrySet()) { // Debug.logInfo("Entry in Map made serializable: " + mapEntry.getKey() + "=" + mapEntry.getValue(), module); //} @@ -242,9 +242,9 @@ } return toSort; } - + /** - * Assuming outerMap not null; if null will throw a NullPointerException + * Assuming outerMap not null; if null will throw a NullPointerException */ public static <K, IK, V> Map<IK, V> getMapFromMap(Map<K, Map<IK, V>> outerMap, K key) { Map<IK, V> innerMap = outerMap.get(key); @@ -256,7 +256,7 @@ } /** - * Assuming outerMap not null; if null will throw a NullPointerException + * Assuming outerMap not null; if null will throw a NullPointerException */ public static <K, V> List<V> getListFromMap(Map<K, List<V>> outerMap, K key) { List<V> innerList = outerMap.get(key); @@ -266,9 +266,9 @@ } return innerList; } - + /** - * Assuming theMap not null; if null will throw a NullPointerException + * Assuming theMap not null; if null will throw a NullPointerException */ public static <K> BigDecimal addToBigDecimalInMap(Map<K, Object> theMap, K mapKey, BigDecimal addNumber) { Object currentNumberObj = theMap.get(mapKey); @@ -284,7 +284,7 @@ } else { throw new IllegalArgumentException("In addToBigDecimalInMap found a Map value of a type not supported: " + currentNumberObj.getClass().getName()); } - + if (addNumber == null || ZERO_BD.equals(addNumber)) { return currentNumber; } @@ -296,7 +296,7 @@ public static <T> T removeFirst(List<T> lst) { return lst.remove(0); } - + public static <T> Set<T> collectionToSet(Collection<T> c) { if (c == null) return null; Set<T> theSet = null; @@ -309,7 +309,7 @@ } return theSet; } - + /** * Create a Set from passed objX parameters * @return The resulting Set @@ -509,7 +509,7 @@ } return list; } - + public static <K, V> void addToListInMap(V element, Map<K, Object> theMap, K listKey) { List<V> theList = UtilGenerics.checkList(theMap.get(listKey)); if (theList == null) { @@ -518,7 +518,7 @@ } theList.add(element); } - + public static <K, V> void addToSetInMap(V element, Map<K, Set<V>> theMap, K setKey) { Set<V> theSet = UtilGenerics.checkSet(theMap.get(setKey)); if (theSet == null) { @@ -527,7 +527,7 @@ } theSet.add(element); } - + public static <K, V> void addToSortedSetInMap(V element, Map<K, Set<V>> theMap, K setKey) { Set<V> theSet = UtilGenerics.checkSet(theMap.get(setKey)); if (theSet == null) { @@ -536,7 +536,7 @@ } theSet.add(element); } - + /** Converts an <code>Object</code> to a <code>double</code>. Returns * zero if conversion is not possible. * @param obj Object to convert @@ -647,7 +647,7 @@ theMap.put(key, value); } } - + /** * Parse a locale string Locale object * @param localeString The locale string (en_US) @@ -966,7 +966,7 @@ } } } - + public static void staticWait(long timeout) throws InterruptedException { new UtilMiscWaiter().safeWait(timeout); } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilName.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilName.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilName.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilName.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -69,7 +69,7 @@ public String getRawString() { return this.raw; } - + public String getPrefix() { return this.getField(PREFIX); } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -34,7 +34,7 @@ // default scale and rounding mode for BigDecimals private static final int DEFAULT_BD_SCALE = 2; - private static final int DEFAULT_BD_ROUNDING_MODE = BigDecimal.ROUND_HALF_UP; + private static final int DEFAULT_BD_ROUNDING_MODE = BigDecimal.ROUND_HALF_UP; /** * Method to get BigDecimal scale factor from a property @@ -60,7 +60,7 @@ } return scale; } - + /** * As above, but use the default properties file */ @@ -158,11 +158,11 @@ rbnfRuleSets = new HashMap<Locale, String>(); rbnfRuleSets.put(Locale.US, ruleSet_en_US); } - + /** * Method to format an amount using a custom rule set. * Current rule sets available: - * + * * en_US * %dollars-and-cents - 1,225.25 becomes "one thousand two hundred twenty five dollars and twenty five cents" (useful for checks) * %dollars-and-hundreths - 1,225.25 becomes "one thousand two hundred twenty five and 25/00" (alternate for checks) Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilObject.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilObject.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilObject.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilObject.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -38,7 +38,7 @@ byte[] data = null; try { bos = new ByteArrayOutputStream(); - + int numBytesRead; while ((numBytesRead = is.read(buffer)) != -1) { bos.write(buffer, 0, numBytesRead); Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilParse.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilParse.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilParse.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilParse.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilPlist.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilPlist.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilPlist.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilPlist.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -75,7 +75,7 @@ public static void writePlistPropertyValueList(List<Object> propertyValueList, int indentLevel, PrintWriter writer) { for (int i = 0; i < indentLevel; i++) writer.print(indentFourString); writer.print("("); - + Iterator<Object> propertyValueIter = propertyValueList.iterator(); while (propertyValueIter.hasNext()) { Object propertyValue = propertyValueIter.next(); @@ -87,7 +87,7 @@ if (propertyValueIter.hasNext()) writer.print(", "); } } - + for (int i = 0; i < indentLevel; i++) writer.print(indentFourString); writer.println(");"); } @@ -122,7 +122,7 @@ public static void writePlistPropertyValueListXml(List<Object> propertyValueList, int indentLevel, PrintWriter writer) { for (int i = 0; i < indentLevel; i++) writer.print(indentFourString); writer.println("<array>"); - + indentLevel++; Iterator<Object> propertyValueIter = propertyValueList.iterator(); while (propertyValueIter.hasNext()) { @@ -138,16 +138,16 @@ } } indentLevel--; - + for (int i = 0; i < indentLevel; i++) writer.print(indentFourString); writer.println("</array>"); } - + /** - * Writes model information in the Apple EOModelBundle format. - * + * Writes model information in the Apple EOModelBundle format. + * * For document structure and definition see: http://developer.apple.com/documentation/InternetWeb/Reference/WO_BundleReference/Articles/EOModelBundle.html - * + * * @param eoModelMap * @param eomodeldFullPath * @param filename Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -77,7 +77,7 @@ protected static Locale fallbackLocale = null; protected static Set<Locale> defaultCandidateLocales = null; protected static Set<String> propertiesNotFound = FastSet.newInstance(); - + /** Compares the specified property to the compareString, returns true if they are the same, false otherwise * @param resource The name of the resource - if the properties file is 'webevent.properties', the resource name is 'webevent' * @param name The name of the property in the properties file @@ -152,7 +152,7 @@ Debug.log(e.getMessage(), module); } return value == null ? "" : value.trim(); - } + } /** Returns the specified resource/properties file * @param resource The name of the resource - can be a file, class, or URL @@ -323,11 +323,11 @@ } return value == null ? "" : value.trim(); } - + /** Sets the specified value of the specified property name to the specified resource/properties file * @param resource The name of the resource - must be a file * @param name The name of the property in the properties file - * @param value The value of the property in the properties file */ + * @param value The value of the property in the properties file */ public static void setPropertyValue(String resource, String name, String value) { if (resource == null || resource.length() <= 0) return; if (name == null || name.length() <= 0) return; @@ -340,7 +340,7 @@ try { properties.setProperty(name, value); FileOutputStream propFile = new FileOutputStream(resource); - properties.store(propFile, + properties.store(propFile, "##############################################################################\n" +"# Licensed to the Apache Software Foundation (ASF) under one \n" +"# or more contributor license agreements. See the NOTICE file \n" @@ -361,7 +361,7 @@ +"###############################################################################\n" +"# \n" +"#Dynamically modified by OFBiz Framework (org.ofbiz.base.util : UtilProperties.setPropertyValue)"); - + propFile.close(); } catch (FileNotFoundException e) { Debug.log(e, "Unable to located the resource file.", module); @@ -659,7 +659,7 @@ } return resourceName; } - + public static boolean isPropertiesResourceNotFound(String resource, Locale locale, boolean removeExtension) { return propertiesNotFound.contains(UtilProperties.createResourceName(resource, locale, removeExtension)); } @@ -681,7 +681,7 @@ * The <code>component://</code> protocol is supported in the * <code>resource</code> parameter. * </p> - * + * * @param resource The resource to resolve * @param locale The desired locale * @return A URL instance or null if not found. @@ -748,7 +748,7 @@ * ...<br /> * </resource><br /><br /></code> where <em>"locale 1", "locale 2"</em> are valid Locale strings. * </p> - * + * * @param in XML file InputStream * @param locale The desired locale * @param properties Optional Properties object to populate @@ -817,7 +817,7 @@ protected int hashCode = hashCode(); protected UtilResourceBundle() {} - + public UtilResourceBundle(Properties properties, Locale locale, UtilResourceBundle parent) { this.properties = properties; this.locale = locale; @@ -873,11 +873,11 @@ } return bundle; } - + public int hashCode() { return this.hashCode; } - + public boolean equals(Object obj) { return obj == null ? false : obj.hashCode() == this.hashCode; } @@ -885,11 +885,11 @@ public Locale getLocale() { return this.locale; } - + protected Object handleGetObject(String key) { return properties.get(key); } - + public Enumeration<String> getKeys() { return new Enumeration<String>() { Iterator i = properties.keySet().iterator(); Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilTimer.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -24,13 +24,13 @@ /** * Timer handling utility - * Utility class for simple reporting of the progress of a process. - * Steps are labelled, and the time between each label (or message) + * Utility class for simple reporting of the progress of a process. + * Steps are labelled, and the time between each label (or message) * and the time since the start are reported in each call to timerString. * */ public class UtilTimer { - + public static final String module = UtilTimer.class.getName(); protected static Map<String, UtilTimer> staticTimers = FastMap.newInstance(); @@ -42,7 +42,7 @@ protected long lastMessageTime; protected boolean running = false; protected boolean log = false; - + public static UtilTimer makeTimer() { return new UtilTimer(); } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -98,14 +98,14 @@ } return url; } - + public static URL fromUrlString(String urlString) { - URL url = null; + URL url = null; try { url = new URL(urlString); - } catch (MalformedURLException e) { + } catch (MalformedURLException e) { } - + return url; } @@ -122,7 +122,7 @@ newFilename = newFilename + filename; return fromFilename(newFilename); } - + public static String getOfbizHomeRelativeLocation(URL fileUrl) { String ofbizHome = System.getProperty("ofbiz.home"); String path = fileUrl.getPath(); @@ -132,10 +132,10 @@ } return path; } - + public static String readUrlText(URL url) throws IOException { InputStream stream = url.openStream(); - + StringBuilder buf = new StringBuilder(); BufferedReader in = null; try { @@ -158,7 +158,7 @@ } } } - + return buf.toString(); } } 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=757046&r1=757045&r2=757046&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 Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -895,7 +895,7 @@ return false; } } - + /** isTime returns true if string arguments hour, minute, and second form a valid time. */ public static boolean isTime(String hour, String minute, String second) { // catch invalid years(not 2- or 4-digit) and invalid months and days. @@ -1145,7 +1145,7 @@ public static boolean isSolo(String cc) { String first4digs = cc.substring(0, 4); String first2digs = cc.substring(0, 2); - if (((cc.length() == 16) || (cc.length() == 18) || (cc.length() == 19)) && + if (((cc.length() == 16) || (cc.length() == 18) || (cc.length() == 19)) && (first2digs.equals("63") || first4digs.equals("6767"))) return isCreditCard(cc); return false; @@ -1170,7 +1170,7 @@ return false; } - + /** Checks to see if the cc number is a valid number for any accepted credit card * @param ccPassed - a string representing a credit card number * @return true, if the credit card number is any valid credit card number for any of the accepted card types, false otherwise @@ -1301,7 +1301,7 @@ if (check >= 10) check = 0; return Character.forDigit(check, 10); } - + public static String checkValidDatabaseId(String fieldStr) { if (fieldStr.indexOf(' ') >= 0) { return "[space found at position " + (fieldStr.indexOf(' ') + 1) + "]"; 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=757046&r1=757045&r2=757046&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 Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -57,7 +57,7 @@ public class UtilXml { public static final String module = UtilXml.class.getName(); - + public static String writeXmlDocument(Document document) throws java.io.IOException { if (document == null) { Debug.logWarning("[UtilXml.writeXmlDocument] Document was null, doing nothing", module); @@ -152,9 +152,9 @@ XMLSerializer serializer = new XMLSerializer(os, format); serializer.asDOMSerializer(); - serializer.serialize(element); + serializer.serialize(element); } - + public static Document readXmlDocument(String content) throws SAXException, ParserConfigurationException, java.io.IOException { return readXmlDocument(content, true); @@ -205,10 +205,10 @@ } long startTime = System.currentTimeMillis(); - + // DON'T do this: seems to be causing problems with Catalina/Tomcat, maybe it is expecting a different parser? //System.setProperty("javax.xml.parsers.DocumentBuilderFactory", "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"); - + Document document = null; /* Xerces DOMParser direct interaction; the other seems to be working better than this, so we'll stay with the standard JAXP stuff @@ -222,7 +222,7 @@ parser.parse(new InputSource(is)); document = parser.getDocument(); */ - + /* Standard JAXP (mostly), but doesn't seem to be doing XML Schema validation, so making sure that is on... */ DocumentBuilderFactory factory = new org.apache.xerces.jaxp.DocumentBuilderFactoryImpl(); factory.setValidating(validate); @@ -230,7 +230,7 @@ factory.setAttribute("http://xml.org/sax/features/validation", validate); factory.setAttribute("http://apache.org/xml/features/validation/schema", validate); - + // with a SchemaUrl, a URL object //factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage", "http://www.w3.org/2001/XMLSchema"); //factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource", SchemaUrl); @@ -243,7 +243,7 @@ builder.setErrorHandler(eh); } document = builder.parse(is); - + double totalSeconds = (System.currentTimeMillis() - startTime)/1000.0; if (Debug.verboseOn()) Debug.logVerbose("XML Read " + totalSeconds + "s: " + docDescription, module); return document; @@ -268,7 +268,7 @@ } if (document == null) return null; - + if (rootElementName != null) { Element rootElement = document.createElement(rootElementName); document.appendChild(rootElement); @@ -316,7 +316,7 @@ if (node != null) { do { - if (node.getNodeType() == Node.ELEMENT_NODE) { + if (node.getNodeType() == Node.ELEMENT_NODE) { Element childElement = (Element) node; elements.add(childElement); } @@ -382,7 +382,7 @@ Node node = fragment.getFirstChild(); if (node != null) { do { - if (node.getNodeType() == Node.ELEMENT_NODE) { + if (node.getNodeType() == Node.ELEMENT_NODE) { Element childElement = (Element) node; elements.add(childElement); } @@ -391,20 +391,20 @@ return elements; } - /** Return a List of Node objects that have the given name and are immediate children of the given element; + /** Return a List of Node objects that have the given name and are immediate children of the given element; * if name is null, all child elements will be included. */ public static List<? extends Node> childNodeList(Node node) { if (node == null) return null; - + List<Node> nodes = FastList.newInstance(); - + if (node != null) { do { if (node.getNodeType() == Node.ELEMENT_NODE || node.getNodeType() == Node.COMMENT_NODE) { nodes.add(node); } } while ((node = node.getNextSibling()) != null); - } + } return nodes; } @@ -535,11 +535,11 @@ } while ((textNode = textNode.getNextSibling()) != null); return valueBuffer.toString(); } - + /** Return the text (node value) of the first node under this */ public static String nodeValue(Node node) { if (node == null) return null; - + StringBuilder valueBuffer = new StringBuilder(); do { if (node.getNodeType() == Node.CDATA_SECTION_NODE || node.getNodeType() == Node.TEXT_NODE || node.getNodeType() == Node.COMMENT_NODE) { @@ -622,7 +622,7 @@ try { URL dtdURL = UtilURL.fromResource(dtd); if (dtdURL == null) { - throw new GeneralException("Local DTD not found - " + dtd); + throw new GeneralException("Local DTD not found - " + dtd); } InputStream dtdStream = dtdURL.openStream(); InputSource inputSource = new InputSource(dtdStream); @@ -644,13 +644,13 @@ } else { filename = systemId.substring(lastSlash + 1); } - + URL resourceUrl = UtilURL.fromResource(filename); - + if (resourceUrl != null) { InputStream resStream = resourceUrl.openStream(); InputSource inputSource = new InputSource(resStream); - + if (UtilValidate.isNotEmpty(publicId)) { inputSource.setPublicId(publicId); } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLine.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLine.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLine.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -131,7 +131,7 @@ if (fileTable != null) { try { if (oldValue == null) oldValue = getFileTable(key); - fileTable.put(key != null ? key : ObjectType.NULL, value); + fileTable.put(key != null ? key : ObjectType.NULL, value); CacheLineTable.jdbmMgr.commit(); } catch (IOException e) { Debug.logError(e, module); @@ -213,7 +213,7 @@ } /** - * + * * @return An unmodifiable Set for the keys for this cache; to remove while iterating call the remove method on this class. */ public synchronized Set<? extends K> keySet() { @@ -241,7 +241,7 @@ long recid = fileTable.getRecid(); CacheLineTable.jdbmMgr.delete(recid); CacheLineTable.jdbmMgr.commit(); - this.fileTable = null; + this.fileTable = null; // create a new table this.fileTable = jdbm.htree.HTree.createInstance(CacheLineTable.jdbmMgr); Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheListener.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheListener.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheListener.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheListener.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmRecordManager.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmRecordManager.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmRecordManager.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmRecordManager.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -24,7 +24,7 @@ /** * Customer JDBM Record Manager - * + * */ public class JdbmRecordManager implements jdbm.RecordManager { Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/JdbmSerializer.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,7 +25,7 @@ /** * JDBC Serializer which uses OFBiz internal serialization * (needed do to the fact that we do dynamic class loading) - * + * */ public class JdbmSerializer implements jdbm.helper.Serializer { Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -49,7 +49,7 @@ public class UtilCache<K, V> implements Serializable { public static final String module = UtilCache.class.getName(); - + /** A static Map to keep track of all of the UtilCache instances. */ public static Map<String, UtilCache<?, ?>> utilCacheTable = new WeakHashMap<String, UtilCache<?, ?>>(); @@ -76,7 +76,7 @@ protected long removeHitCount = 0; /** A count of the number of cache misses on removes */ protected long removeMissCount = 0; - + /** The maximum number of elements in the cache. * If set to 0, there will be no limit on the number of elements in the cache. */ @@ -97,7 +97,7 @@ /** The set of listeners to receive notifcations when items are modidfied(either delibrately or because they were expired). */ protected Set<CacheListener<K, V>> listeners = FastSet.newInstance(); - + /** Constructor which specifies the cacheName as well as the maxSize, expireTime and useSoftReference. * The passed maxSize, expireTime and useSoftReference will be overridden by values from cache.properties if found. * @param maxSize The maxSize member is set to this value @@ -322,7 +322,7 @@ CacheLine<V> line = cacheLineTable.get(key); return line; } - + protected CacheLine<V> getInternal(Object key, boolean countGet) { CacheLine<V> line = getInternalNoCheck(key); if (line == null) { @@ -347,7 +347,7 @@ if (cacheLineTable == null) { return null; } - + List<V> valuesList = FastList.newInstance(); for (K key: cacheLineTable.keySet()) { valuesList.add(this.get(key)); @@ -371,10 +371,10 @@ public V remove(Object key) { return this.removeInternal(key, true); } - + /** This is used for internal remove calls because we only want to count external calls */ @SuppressWarnings("unchecked") - protected synchronized V removeInternal(Object key, boolean countRemove) { + protected synchronized V removeInternal(Object key, boolean countRemove) { CacheLine<V> line = cacheLineTable.remove(key); if (line != null) { noteRemoval((K) key, line.getValue()); @@ -445,11 +445,11 @@ public long getMissCountTotal() { return this.missCountSoftRef + this.missCountNotFound + this.missCountExpired; } - + public long getRemoveHitCount() { return this.removeHitCount; } - + public long getRemoveMissCount() { return this.removeMissCount; } @@ -527,7 +527,7 @@ public boolean getUseSoftReference() { return this.useSoftReference; } - + public boolean getUseFileSystemStore() { return this.useFileSystemStore; } @@ -552,11 +552,11 @@ return false; } } - - /** - * NOTE: this returns an unmodifiable copy of the keySet, so removing from here won't have an effect, + + /** + * NOTE: this returns an unmodifiable copy of the keySet, so removing from here won't have an effect, * and calling a remove while iterating through the set will not cause a concurrent modification exception. - * This behavior is necessary for now for the persisted cache feature. + * This behavior is necessary for now for the persisted cache feature. */ public Set<? extends K> getCacheLineKeys() { return cacheLineTable.keySet(); @@ -622,14 +622,14 @@ listeners.add(listener); } } - + /** Removes an event listener for key removals */ public void removeListener(CacheListener<K, V> listener) { synchronized (listeners) { listeners.remove(listener); } } - + /** Clears all expired cache entries from all caches */ public static void clearExpiredFromAllCaches() { for (Map.Entry<String, UtilCache<?, ?>> entry: utilCacheTable.entrySet()) { @@ -637,7 +637,7 @@ utilCache.clearExpired(); } } - + /** Checks for a non-expired key in a specific cache */ public static boolean validKey(String cacheName, Object key) { UtilCache<?, ?> cache = findCache(cacheName); @@ -647,14 +647,14 @@ } return false; } - + public static void clearCachesThatStartWith(String startsWith) { synchronized (utilCacheTable) { for (Map.Entry<String, UtilCache<?, ?>> entry: utilCacheTable.entrySet()) { - String name = entry.getKey(); - if (name.startsWith(startsWith)) { - UtilCache<?, ?> cache = entry.getValue(); - cache.clear(); + String name = entry.getKey(); + if (name.startsWith(startsWith)) { + UtilCache<?, ?> cache = entry.getValue(); + cache.clear(); } } } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -70,7 +70,7 @@ Debug.logVerbose("FlexibleMapAccessor created, original = " + this.original, module); } } - + /** Returns a FlexibleMapAccessor instance. * @param original The original String expression * @return A FlexibleMapAccessor instance @@ -105,7 +105,7 @@ return this.original == null || this.original.length() == 0; } - /** Given the name based information in this accessor, get the value from the passed in Map. + /** Given the name based information in this accessor, get the value from the passed in Map. * Supports LocalizedMaps by getting a String or Locale object from the base Map with the key "locale", or by explicit locale parameter. * @param base * @return the found value @@ -114,7 +114,7 @@ return get(base, null); } - /** Given the name based information in this accessor, get the value from the passed in Map. + /** Given the name based information in this accessor, get the value from the passed in Map. * Supports LocalizedMaps by getting a String or Locale object from the base Map with the key "locale", or by explicit locale parameter. * Note that the localization functionality is only used when the lowest level sub-map implements the LocalizedMap interface * @param base Map to get value from @@ -143,10 +143,10 @@ return UtilGenerics.<T>cast(obj); } - /** Given the name based information in this accessor, put the value in the passed in Map. + /** Given the name based information in this accessor, put the value in the passed in Map. * If the brackets for a list are empty the value will be appended to the list, * otherwise the value will be set in the position of the number in the brackets. - * If a "+" (plus sign) is included inside the square brackets before the index + * If a "+" (plus sign) is included inside the square brackets before the index * number the value will inserted/added at that point instead of set at the point. * @param base * @param value @@ -164,7 +164,7 @@ Debug.logInfo("UEL exception while setting value: " + e + ", original = " + this.original, module); } } - + /** Given the name based information in this accessor, remove the value from the passed in Map. * @param base the Map to remove from * @return the object removed @@ -185,7 +185,7 @@ } return object; } - + protected String getExpression(Map<String, ? extends Object> base) { String expression = null; if (this.fse != null) { @@ -202,7 +202,7 @@ } return this.original; } - + @SuppressWarnings("unchecked") public boolean equals(Object obj) { if (this == obj) { @@ -217,7 +217,7 @@ } catch (Exception e) {} return false; } - + public int hashCode() { return this.original == null ? super.hashCode() : this.original.hashCode(); } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleProperties.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleProperties.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleProperties.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleProperties.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -37,7 +37,7 @@ public class FlexibleProperties extends Properties implements Serializable { public static final String module = FlexibleProperties.class.getName(); - + private static final boolean truncateIfMissingDefault = false; private static final boolean doPropertyExpansionDefault = true; @@ -140,7 +140,7 @@ try { in = url.openStream(); } catch (Exception urlex) { - Debug.log(urlex, "[FlexibleProperties.load]: Couldn't find the URL: " + url, module); + Debug.log(urlex, "[FlexibleProperties.load]: Couldn't find the URL: " + url, module); } if (in == null) throw new IOException("Could not open resource URL " + url); Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -45,7 +45,7 @@ public FlexibleServletAccessor(String name) { init(name); } - + public FlexibleServletAccessor(String name, String defaultName) { if (name == null || name.length() == 0) { init(defaultName); @@ -53,7 +53,7 @@ init(name); } } - + protected void init(String name) { this.name = name; if (name == null || name.length() == 0) { @@ -77,12 +77,12 @@ attributeName = name; fma = null; } - + needsExpand = false; } } } - + public boolean isEmpty() { return this.empty; } @@ -110,7 +110,7 @@ /** Based on name put in ServletRequest or from List in ServletRequest; * If the brackets for a list are empty the value will be appended to the list, * otherwise the value will be set in the position of the number in the brackets. - * If a "+" (plus sign) is included inside the square brackets before the index + * If a "+" (plus sign) is included inside the square brackets before the index * number the value will inserted/added at that point instead of set at the point. * @param request * @param value @@ -120,11 +120,11 @@ AttributeAccessor<T> aa = new AttributeAccessor<T>(name, expandContext, this.attributeName, this.fma, this.needsExpand); aa.put(request, value); } - + /** Based on name put in HttpSession or from List in HttpSession; * If the brackets for a list are empty the value will be appended to the list, * otherwise the value will be set in the position of the number in the brackets. - * If a "+" (plus sign) is included inside the square brackets before the index + * If a "+" (plus sign) is included inside the square brackets before the index * number the value will inserted/added at that point instead of set at the point. * @param session * @param value @@ -134,7 +134,7 @@ AttributeAccessor<T> aa = new AttributeAccessor<T>(name, expandContext, this.attributeName, this.fma, this.needsExpand); aa.put(session, value); } - + /** Based on name remove from ServletRequest or from List in ServletRequest * @param request * @param expandContext @@ -144,7 +144,7 @@ AttributeAccessor<T> aa = new AttributeAccessor<T>(name, expandContext, this.attributeName, this.fma, this.needsExpand); return aa.remove(request); } - + /** Based on name remove from HttpSession or from List in HttpSession * @param session * @param expandContext @@ -154,18 +154,18 @@ AttributeAccessor<T> aa = new AttributeAccessor<T>(name, expandContext, this.attributeName, this.fma, this.needsExpand); return aa.remove(session); } - - /** The equals and hashCode methods are imnplemented just case this object is ever accidently used as a Map key * + + /** The equals and hashCode methods are imnplemented just case this object is ever accidently used as a Map key * * @return the hashcode - */ + */ public int hashCode() { return this.name.hashCode(); } - /** The equals and hashCode methods are imnplemented just case this object is ever accidently used as a Map key + /** The equals and hashCode methods are imnplemented just case this object is ever accidently used as a Map key * @param obj * @return whether this object is equal to the passed object - */ + */ public boolean equals(Object obj) { if (obj instanceof FlexibleServletAccessor) { FlexibleServletAccessor flexibleServletAccessor = (FlexibleServletAccessor) obj; @@ -182,13 +182,13 @@ } } - /** To be used for a string representation of the accessor, returns the original name. + /** To be used for a string representation of the accessor, returns the original name. * @return the name of this accessor - */ + */ public String toString() { return this.name; } - + protected static class AttributeAccessor<T> implements Serializable { protected Map<String, Object> expandContext; protected String attributeName; @@ -199,11 +199,11 @@ protected int listIndex; protected int openBrace; protected int closeBrace; - + public AttributeAccessor(String origName, Map<String, Object> expandContext, String defAttributeName, FlexibleMapAccessor<T> defFma, boolean needsExpand) { attributeName = defAttributeName; fma = defFma; - + if (needsExpand) { String name = FlexibleStringExpander.expandString(origName, expandContext); int dotIndex = name.indexOf('.'); @@ -239,7 +239,7 @@ attributeName = attributeName.substring(0, openBrace); isListReference = true; } - + } public T get(ServletRequest request) { @@ -286,7 +286,7 @@ } } } - + public void put(ServletRequest request, T value) { if (fma == null) { if (isListReference) { @@ -305,7 +305,7 @@ } } } - + public void put(HttpSession session, T value) { if (fma == null) { if (isListReference) { Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LRUMap.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LRUMap.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LRUMap.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LRUMap.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -85,8 +85,8 @@ } /** - * @see java.util.Collection#iterator() - */ + * @see java.util.Collection#iterator() + */ public Iterator<V> iterator() { return backedList.iterator(); } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LocalizedMap.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LocalizedMap.java?rev=757046&r1=757045&r2=757046&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LocalizedMap.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LocalizedMap.java Sat Mar 21 22:46:22 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |