svn commit: r881683 - in /ofbiz/trunk/framework/base/sr
Locked
 
|
Author: doogie
Date: Wed Nov 18 06:20:15 2009 New Revision: 881683 URL: http://svn.apache.org/viewvc?rev=881683&view=rev Log: More space changes. Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converter.java ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/ConverterLoader.java ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/LocalizedConverter.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Factory.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/JuelConnector.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/NodeELResolver.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java?rev=881683&r1=881682&r2=881683&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java Wed Nov 18 06:20:15 2009 @@ -93,7 +93,7 @@ return Boolean.TRUE; } } - + public static Collection<ComponentConfig> getAllComponents() { Collection<ComponentConfig> values = componentConfigs.values(); if (values != null) { Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converter.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converter.java?rev=881683&r1=881682&r2=881683&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converter.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converter.java Wed Nov 18 06:20:15 2009 @@ -19,7 +19,7 @@ package org.ofbiz.base.conversion; /** Converter interface. - * + * * @param <S> The source object type * @param <T> The target object type */ @@ -28,7 +28,7 @@ * <code>sourceClass</code> to <code>targetClass</code>. * <p>Implementations can accomodate class hierarchy ranges * by converting super classes or interfaces.</p> - * + * * @param sourceClass The source <code>Class</code> * @param targetClass The target <code>Class</code> * @return <code>true</code> if this object can convert @@ -37,7 +37,7 @@ public boolean canConvert(Class<?> sourceClass, Class<?> targetClass); /** Converts <code>obj</code> to <code>T</code>. - * + * * @param obj The source <code>Object</code> to convert * @return The converted <code>Object</code> * @throws ConversionException @@ -45,13 +45,13 @@ public T convert(S obj) throws ConversionException; /** Returns the source <code>Class</code> for this converter. - * + * * @return The source <code>Class</code> for this converter */ public Class<?> getSourceClass(); /** Returns the target <code>Class</code> for this converter. - * + * * @return The target <code>Class</code> for this converter */ public Class<?> getTargetClass(); Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/ConverterLoader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/ConverterLoader.java?rev=881683&r1=881682&r2=881683&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/ConverterLoader.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/ConverterLoader.java Wed Nov 18 06:20:15 2009 @@ -20,7 +20,7 @@ /** Converter loader interface. Components implement this * interface to load their object class converters. - * + * */ public interface ConverterLoader { /** Create and register converters with the Java object type @@ -29,7 +29,7 @@ * itself when an instance is created. Otherwise, call * {@link org.ofbiz.base.conversion.Converters#registerConverter(Converter)} * with the <code>Converter</code> instance. - * + * */ public void loadConverters(); } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java?rev=881683&r1=881682&r2=881683&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java Wed Nov 18 06:20:15 2009 @@ -59,16 +59,16 @@ * <code>sourceClass</code> and <code>targetClass</code>. If no matching * <code>Converter</code> is found, the method throws * <code>ClassNotFoundException</code>. - * + * * <p>This method is intended to be used when the source or * target <code>Object</code> types are unknown at compile time. * If the source and target <code>Object</code> types are known * at compile time, then one of the "ready made" converters should be used.</p> - * + * * @param sourceClass The object class to convert from * @param targetClass The object class to convert to * @return A matching <code>Converter</code> instance - * @throws ClassNotFoundException + * @throws ClassNotFoundException */ @SuppressWarnings("unchecked") public static <S, T> Converter<S, T> getConverter(Class<S> sourceClass, Class<T> targetClass) throws ClassNotFoundException { @@ -101,7 +101,7 @@ /** Load all classes that implement <code>Converter</code> and are * contained in <code>containerClass</code>. - * + * * @param containerClass */ public static void loadContainedConverters(Class<?> containerClass) { @@ -120,7 +120,7 @@ /** Registers a <code>Converter</code> instance to be used by the * {@link org.ofbiz.base.conversion.Converters#getConverter(Class, Class)} * method. - * + * * @param <S> The source object type * @param <T> The target object type * @param converter The <code>Converter</code> instance to register Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/LocalizedConverter.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/LocalizedConverter.java?rev=881683&r1=881682&r2=881683&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/LocalizedConverter.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/LocalizedConverter.java Wed Nov 18 06:20:15 2009 @@ -24,7 +24,7 @@ /** Localized converter interface. */ public interface LocalizedConverter<S, T> extends Converter<S, T> { /** Converts <code>obj</code> to <code>T</code>. - * + * * @param obj The source <code>Object</code> to convert * @param locale The locale used for conversion - must not be <code>null</code> * @param timeZone The time zone used for conversion - must not be <code>null</code> @@ -34,7 +34,7 @@ public T convert(S obj, Locale locale, TimeZone timeZone) throws ConversionException; /** Converts <code>obj</code> to <code>T</code>. - * + * * @param obj The source <code>Object</code> to convert * @param locale The locale used for conversion - must not be <code>null</code> * @param timeZone The time zone used for conversion - must not be <code>null</code> 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=881683&r1=881682&r2=881683&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 Wed Nov 18 06:20:15 2009 @@ -106,7 +106,7 @@ * the alias for <code>java.lang.Object</code> is <code>Object</code>. * If the alias already exists for another class, then no alias is created * (the previously aliased class takes precedence).</p> - * + * * @param theClass The <code>Class</code> to register * @throws IllegalArgumentException If <code>theClass</code> is an array */ @@ -119,7 +119,7 @@ if (obj == null) { globalClassNameClassMap.put(theClass.getName(), theClass); } - String alias = theClass.getName(); + String alias = theClass.getName(); int pos = alias.lastIndexOf("."); if (pos != -1) { alias = alias.substring(pos + 1); Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Factory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Factory.java?rev=881683&r1=881682&r2=881683&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Factory.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Factory.java Wed Nov 18 06:20:15 2009 @@ -25,7 +25,7 @@ * that is meant to be extended. Sub-interfaces declare types for * <code>A</code> (the <code>getInstance</code> argument), and * <code>R</code> (the type returned by <code>getInstance</code>). - * + * * @param obj Optional object to be used in <code>R</code>'s construction, * or to be used as a selector key * @return An instance of <code>R</code> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java?rev=881683&r1=881682&r2=881683&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java Wed Nov 18 06:20:15 2009 @@ -105,7 +105,7 @@ if (Debug.verboseOn()) Debug.logVerbose("Caching Groovy script: " + script, module); parsedScripts.put(script, scriptClass); } - + return InvokerHelper.createScript(scriptClass, getBinding(context)).run(); } catch (CompilationFailedException e) { String errMsg = "Error loading Groovy script [" + script + "]: " + e.toString(); @@ -115,7 +115,7 @@ throw new GeneralException(errMsg, e); } } - + @SuppressWarnings("unchecked") public static Object runScriptAtLocation(String location, Map<String, Object> context) throws GeneralException { try { Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java?rev=881683&r1=881682&r2=881683&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java Wed Nov 18 06:20:15 2009 @@ -82,7 +82,7 @@ return false; } - /** Returns a <code>String</code> formatted as + /** Returns a <code>String</code> formatted as * years:months:days:hours:minutes:seconds:millseconds. */ @Override @@ -100,7 +100,7 @@ } /** Returns <code>true</code> if this duration is negative. - * + * * @return <code>true</code> if this duration is negative */ public boolean isNegative() { @@ -108,14 +108,13 @@ } /** Returns <code>true</code> if this duration is zero. - * + * * @return <code>true</code> if this duration is zero */ public boolean isZero() { return this == ZeroTimeDuration || (this.millis == 0 && this.seconds == 0 && this.minutes == 0 && this.hours == 0 && this.days == 0 && this.months == 0 && this.years == 0); - } /** Returns the milliseconds in this time duration. */ 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=881683&r1=881682&r2=881683&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 Wed Nov 18 06:20:15 2009 @@ -68,7 +68,7 @@ return obj1.compareTo(obj2); } } - + public static <E> int compare(List<E> obj1, List<E> obj2) { if (obj1 == obj2) { return 0; @@ -77,11 +77,11 @@ if (obj1.size() == obj2.size() && obj1.containsAll(obj2) && obj2.containsAll(obj1)) { return 0; } - + } catch (Exception e) {} return 1; } - + /** * Get an iterator from a collection, returning null if collection is null * @param col The collection to be turned in to an iterator 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=881683&r1=881682&r2=881683&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 Wed Nov 18 06:20:15 2009 @@ -391,7 +391,6 @@ +"# Dynamically modified by OFBiz Framework (org.ofbiz.base.util : UtilProperties.setPropertyValue)\n" +"# The comments have been removed, you may still find them on the OFBiz repository... \n" +"#"); - } propFile.close(); @@ -402,7 +401,7 @@ } } - /** Sets the specified value of the specified property name to the specified resource/properties in memory, does not persist it + /** Sets the specified value of the specified property name to the specified resource/properties in memory, does not persist it * @param resource The name of the resource * @param name The name of the property in the resource * @param value The value of the property to set in memory */ 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=881683&r1=881682&r2=881683&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 Wed Nov 18 06:20:15 2009 @@ -894,7 +894,7 @@ return false; } } - + public static boolean isDateBeforeNow(Timestamp date) { Timestamp now = UtilDateTime.nowTimestamp(); if (date != null) { @@ -903,7 +903,7 @@ return false; } } - + public static boolean isDateAfterNow(Timestamp date) { Timestamp now = UtilDateTime.nowTimestamp(); if (date != null) { 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=881683&r1=881682&r2=881683&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 Wed Nov 18 06:20:15 2009 @@ -265,7 +265,7 @@ return; } // OutputFormat defaults are: indent on, indent = 4, include XML declaration, - // charset = UTF-8, line width = 72 + // charset = UTF-8, line width = 72 try { writeXmlDocument(node, os, "UTF-8", false, true, 4); } catch (TransformerException e) { @@ -586,14 +586,14 @@ return newElement; } - /** Creates a child element with the given namespace supportive name and appends it to the element child node list. */ + /** Creates a child element with the given namespace supportive name and appends it to the element child node list. */ public static Element addChildElementNSElement(Element element, String childElementName, Document document, String nameSpaceUrl) { Element newElement = document.createElementNS(nameSpaceUrl, childElementName); - element.appendChild(newElement); + element.appendChild(newElement); return element; } - + /** Creates a child element with the given namespace supportive name and appends it to the element child node list. * Also creates a Text node with the given value and appends it to the new elements child node list. */ @@ -601,7 +601,7 @@ String childElementValue, Document document, String nameSpaceUrl) { Element newElement = document.createElementNS(nameSpaceUrl, childElementName); newElement.appendChild(document.createTextNode(childElementValue)); - element.appendChild(newElement); + element.appendChild(newElement); return element; } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/JuelConnector.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/JuelConnector.java?rev=881683&r1=881682&r2=881683&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/JuelConnector.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/JuelConnector.java Wed Nov 18 06:20:15 2009 @@ -129,7 +129,7 @@ Symbol start_eval = deferred ? START_EVAL_DEFERRED : START_EVAL_DYNAMIC; if (this.getToken().getSymbol() == start_eval) { consumeToken(); - AstNode node = expr(true); + AstNode node = expr(true); try { consumeToken(END_EVAL); } catch (ParseException e) { Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/NodeELResolver.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/NodeELResolver.java?rev=881683&r1=881682&r2=881683&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/NodeELResolver.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/NodeELResolver.java Wed Nov 18 06:20:15 2009 @@ -42,10 +42,10 @@ /** * Defines property resolution behavior on Nodes. This resolver handles base objects that implement - * org.w3c.dom.Node or org.apache.xerces.dom.NodeImpl. It accepts a String as a property and compiles - * that String into an XPathExpression. The resulting value is the evaluation of the XPathExpression - * in the context of the base Node. This resolver is currently only available in read-only mode, which - * means that isReadOnly will always return true and {@link #setValue(ELContext, Object, Object, Object)} + * org.w3c.dom.Node or org.apache.xerces.dom.NodeImpl. It accepts a String as a property and compiles + * that String into an XPathExpression. The resulting value is the evaluation of the XPathExpression + * in the context of the base Node. This resolver is currently only available in read-only mode, which + * means that isReadOnly will always return true and {@link #setValue(ELContext, Object, Object, Object)} * will always throw PropertyNotWritableException. ELResolvers are combined together using {@link CompositeELResolver} * s, to define rich semantics for evaluating an expression. See the javadocs for {@link ELResolver} * for details. @@ -100,7 +100,7 @@ NodeList nodeList = (NodeList) expr.evaluate(node, XPathConstants.NODESET); if (nodeList.getLength() == 0) { return null; - } else if (nodeList.getLength() == 1) { + } else if (nodeList.getLength() == 1) { result = nodeList.item(0); } else { List<Node> newList = FastList.newInstance(); @@ -141,7 +141,7 @@ private final boolean isResolvable(Object base) { return base != null && (base instanceof Node || base instanceof NodeImpl); } - + private XPathExpression getXPathExpressionInstance(String xPathString) { XPathExpression xpe = exprCache.get(xPathString); if (xpe == null) { Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java?rev=881683&r1=881682&r2=881683&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java Wed Nov 18 06:20:15 2009 @@ -24,7 +24,7 @@ import java.net.URLConnection; import java.io.InputStream; import java.io.IOException; -import java.io.StringWriter; +import java.io.StringWriter; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; @@ -59,13 +59,12 @@ public static UtilCache<String, Templates> xslTemplatesCache = new UtilCache<String, Templates>("XsltTemplates", 0, 0); /** - * * @param template the content or url of the xsl template * @param data the content or url of the xml data file * @param outWriter The Writer to render to * @throws TransformerException */ - public static String renderTemplate(String template, String data) + public static String renderTemplate(String template, String data) throws TransformerException { String result = null; TransformerFactory tfactory = TransformerFactory.newInstance(); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |