svn commit: r899812 [6/8] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r899812 [6/8] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/TestUtils.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/TestUtils.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/TestUtils.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/TestUtils.java Fri Jan 15 21:00:23 2010 @@ -33,26 +33,26 @@ 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r', 's','t','u','v','w','x','y','z', '0','1','2','3','4','5','6','7','8','9'}; - + static public String createUniqueString() { long time = System.currentTimeMillis(); - + return String.valueOf(time); } static public String createRandomString(int size) { - + return createRandomString(null, size); } - + static public String createRandomString(String prefix, String size) { return createRandomString(prefix, Integer.valueOf(size).intValue()); } - + static public String createRandomString(String prefix, int size) { StringBuffer buff = new StringBuffer(size); int startIndx = 0; - + if(prefix != null) { buff.append(prefix); startIndx = prefix.length(); @@ -68,7 +68,7 @@ public static String readUrlText(String urlString) throws IOException { URL url = new URL(urlString); InputStream stream = url.openStream(); - + StringBuilder buf = new StringBuilder(); BufferedReader in = null; try { @@ -91,7 +91,7 @@ } } } - + return buf.toString(); } } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java Fri Jan 15 21:00:23 2010 @@ -131,7 +131,7 @@ if (disableCachedClassloader == null || !"Y".equalsIgnoreCase(disableCachedClassloader)) { Thread.currentThread().setContextClassLoader(localCachedClassLoader); } - + // set the webSiteId in the session httpRequest.getSession().setAttribute("webSiteId", config.getServletContext().getAttribute("webSiteId")); @@ -264,7 +264,7 @@ // we're done checking; continue on chain.doFilter(request, response); - + // reset thread local security AbstractAuthorization.clearThreadLocal(); } @@ -341,25 +341,25 @@ } protected Authorization getAuthz() { - Authorization authz = (Authorization) config.getServletContext().getAttribute("authorization"); + Authorization authz = (Authorization) config.getServletContext().getAttribute("authorization"); if (authz == null) { Delegator delegator = (Delegator) config.getServletContext().getAttribute("delegator"); if (delegator != null) { try { - authz = AuthorizationFactory.getInstance(delegator); + authz = AuthorizationFactory.getInstance(delegator); } catch (SecurityConfigurationException e) { Debug.logError(e, "[ServiceDispatcher.init] : No instance of authorization implementation found.", module); } } - config.getServletContext().setAttribute("authz", authz); + config.getServletContext().setAttribute("authz", authz); if (authz == null) { Debug.logError("[ContextFilter.init] ERROR: authorization create failed.", module); - } + } } return authz; } - + @Deprecated protected Security getSecurity() { Security security = (Security) config.getServletContext().getAttribute("security"); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Fri Jan 15 21:00:23 2010 @@ -179,12 +179,12 @@ Authorization authz = (Authorization) session.getAttribute("authz"); if (authz == null) { authz = (Authorization) getServletContext().getAttribute("authz"); - } + } if (authz == null) { Debug.logError("[ControlServlet] ERROR: authorization not found in ServletContext", module); } request.setAttribute("authz", authz); // maybe we should also add the value to 'security' - + Security security = (Security) session.getAttribute("security"); if (security == null) { security = (Security) getServletContext().getAttribute("security"); @@ -195,7 +195,7 @@ request.setAttribute("security", security); request.setAttribute("_REQUEST_HANDLER_", requestHandler); - + ServletContextHashModel ftlServletContext = new ServletContextHashModel(this, BeansWrapper.getDefaultInstance()); request.setAttribute("ftlServletContext", ftlServletContext); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Fri Jan 15 21:00:23 2010 @@ -861,7 +861,7 @@ if (security != null) { if (info != null) { for (String permission: info.getBasePermission()) { - if (!"NONE".equals(permission) && !security.hasEntityPermission(permission, "_VIEW", userLogin) && + if (!"NONE".equals(permission) && !security.hasEntityPermission(permission, "_VIEW", userLogin) && !authz.hasPermission(userLogin.getString("userLoginId"), permission, null)) { return false; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java Fri Jan 15 21:00:23 2010 @@ -90,7 +90,7 @@ Long curMaxHits = (Long) hitsByViewAccessed.get(viewNameUserLoginId); if (UtilValidate.isEmpty(curMaxHits)) { hitsByViewAccessed.put(viewNameUserLoginId, one); - Long maxHitsDuration = (Long) protectedView.get("maxHitsDuration") * 1000; + Long maxHitsDuration = (Long) protectedView.get("maxHitsDuration") * 1000; durationByViewAccessed.put(viewNameUserLoginId, now + maxHitsDuration); } else { Long maxDuration = (Long) durationByViewAccessed.get(viewNameUserLoginId); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Fri Jan 15 21:00:23 2010 @@ -216,8 +216,8 @@ callRedirect(newUrl, response, request); } } - // if this is a new session and forceHttpSession is true and the request is secure but does not - // need to be then we need the session cookie to be created via an http response (rather than https) + // if this is a new session and forceHttpSession is true and the request is secure but does not + // need to be then we need the session cookie to be created via an http response (rather than https) // so we'll redirect to an unsecure request } else if (forceHttpSession && request.isSecure() && session.isNew() && !requestMap.securityHttps) { StringBuilder urlBuf = new StringBuilder(); @@ -823,7 +823,7 @@ if (viewNoCache) { UtilHttp.setResponseBrowserProxyNoCache(resp); if (Debug.verboseOn()) Debug.logVerbose("Sending no-cache headers for view [" + nextPage + "]", module); - } + } try { if (Debug.verboseOn()) Debug.logVerbose("Rendering view [" + nextPage + "] of type [" + viewMap.type + "]", module); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java Fri Jan 15 21:00:23 2010 @@ -104,7 +104,7 @@ */ public static String changeDelegator(HttpServletRequest request, HttpServletResponse response) { String delegatorName = request.getParameter("delegator"); - Authorization authz = (Authorization) request.getAttribute("authz"); + Authorization authz = (Authorization) request.getAttribute("authz"); Locale locale = UtilHttp.getLocale(request); if (!authz.hasPermission(request.getSession(), "ENTITY_MAINT", null)) { @@ -158,10 +158,10 @@ */ public static String changeDispatcher(HttpServletRequest request, HttpServletResponse response) { String dispatcherName = request.getParameter("dispatcher"); - Authorization authz = (Authorization) request.getAttribute("authz"); + Authorization authz = (Authorization) request.getAttribute("authz"); Locale locale = UtilHttp.getLocale(request); - if (!authz.hasPermission(request.getSession(), "ENTITY_MAINT", null)) { + if (!authz.hasPermission(request.getSession(), "ENTITY_MAINT", null)) { String errMsg = UtilProperties.getMessage(CoreEvents.err_resource, "coreEvents.not_authorized_use_fct", locale); request.setAttribute("_ERROR_MESSAGE_", "<li>" + errMsg); return "error"; @@ -201,7 +201,7 @@ */ public static String scheduleService(HttpServletRequest request, HttpServletResponse response) { GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); - Authorization authz = (Authorization) request.getAttribute("authz"); + Authorization authz = (Authorization) request.getAttribute("authz"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); //Delegator delegator = (Delegator) request.getAttribute("delegator"); Locale locale = UtilHttp.getLocale(request); @@ -305,7 +305,7 @@ if (locale != null) { serviceContext.put("locale", locale); } - + if (!modelService.export && !authz.hasPermission(request.getSession(), "SERVICE_INVOKE_ANY", null)) { String errMsg = UtilProperties.getMessage(CoreEvents.err_resource, "coreEvents.not_authorized_to_call", locale); request.setAttribute("_ERROR_MESSAGE_", "<li>" + errMsg); @@ -527,7 +527,7 @@ } // now do a security check - Authorization authz = (Authorization) request.getAttribute("authz"); + Authorization authz = (Authorization) request.getAttribute("authz"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); //lookup the service definition to see if this service is externally available, if not require the SERVICE_INVOKE_ANY permission Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java Fri Jan 15 21:00:23 2010 @@ -143,16 +143,16 @@ // not a wsdl request; invoke the service response.setContentType("text/xml"); - + // request envelope SOAPEnvelope reqEnv = null; - + // get the service name and parameters try { XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(request.getInputStream()); StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(xmlReader); reqEnv = (SOAPEnvelope) builder.getDocumentElement(); - + // log the request message if (Debug.verboseOn()) { try { @@ -164,9 +164,9 @@ sendError(response, "Problem processing the service"); throw new EventHandlerException("Cannot get the envelope", e); } - + Debug.logVerbose("[Processing]: SOAP Event", module); - + try { // each is a different service call SOAPBody reqBody = reqEnv.getBody(); @@ -191,7 +191,7 @@ XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xmlResults)); StAXOMBuilder resultsBuilder = new StAXOMBuilder(reader); OMElement resultSer = resultsBuilder.getDocumentElement(); - + // create the response soap SOAPFactory factory = OMAbstractFactory.getSOAP11Factory(); SOAPEnvelope resEnv = factory.createSOAPEnvelope(); @@ -200,14 +200,14 @@ resService.addChild(resultSer.getFirstElement()); resBody.addChild(resService); resEnv.addChild(resBody); - + // The declareDefaultNamespace method doesn't work see (https://issues.apache.org/jira/browse/AXIS2-3156) - // so the following doesn't work: + // so the following doesn't work: // resService.declareDefaultNamespace(ModelService.TNS); // instead, create the xmlns attribute directly: OMAttribute defaultNS = factory.createOMAttribute("xmlns", null, ModelService.TNS); resService.addAttribute(defaultNS); - + // log the response message if (Debug.verboseOn()) { try { @@ -230,21 +230,21 @@ sendError(response, e.getMessage()); throw new EventHandlerException(e.getMessage(), e); } - + return null; } private void sendError(HttpServletResponse res, String errorMessage) throws EventHandlerException { try { // setup the response - res.setContentType("text/xml"); + res.setContentType("text/xml"); Map<String, Object> results = FastMap.newInstance(); results.put("errorMessage", errorMessage); String xmlResults= XmlSerializer.serialize(results); XMLStreamReader xmlReader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xmlResults)); StAXOMBuilder resultsBuilder = new StAXOMBuilder(xmlReader); OMElement resultSer = resultsBuilder.getDocumentElement(); - + // create the response soap SOAPFactory factory = OMAbstractFactory.getSOAP11Factory(); SOAPEnvelope resEnv = factory.createSOAPEnvelope(); @@ -253,7 +253,7 @@ errMsg.addChild(resultSer.getFirstElement()); resBody.addChild(errMsg); resEnv.addChild(resBody); - + // log the response message if (Debug.verboseOn()) { try { @@ -261,7 +261,7 @@ } catch (Throwable t) { } } - + resEnv.serialize(res.getOutputStream()); res.getOutputStream().flush(); } catch (Exception e) { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java Fri Jan 15 21:00:23 2010 @@ -355,7 +355,7 @@ if (resultKey != null && !ModelService.RESPONSE_MESSAGE.equals(resultKey) && !ModelService.ERROR_MESSAGE.equals(resultKey) && !ModelService.ERROR_MESSAGE_LIST.equals(resultKey) && !ModelService.ERROR_MESSAGE_MAP.equals(resultKey) && !ModelService.SUCCESS_MESSAGE.equals(resultKey) && !ModelService.SUCCESS_MESSAGE_LIST.equals(resultKey)) { - //set the result to request w/ and w/o a suffix to handle both cases: to have the result in each iteration and to prevent its overriding + //set the result to request w/ and w/o a suffix to handle both cases: to have the result in each iteration and to prevent its overriding request.setAttribute(resultKey + curSuffix, resultValue); request.setAttribute(resultKey, resultValue); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java Fri Jan 15 21:00:23 2010 @@ -103,7 +103,7 @@ for (Map.Entry<String, List<ServerHitBin>> entry :binMap.entrySet()) { if (entry.getValue() != null) { for (ServerHitBin bin: entry.getValue()) { - bin.advanceBin(toTime); + bin.advanceBin(toTime); } } } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/PropFindHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/PropFindHelper.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/PropFindHelper.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/PropFindHelper.java Fri Jan 15 21:00:23 2010 @@ -33,11 +33,11 @@ public class PropFindHelper extends ResponseHelper { protected final Document requestDocument; - + public PropFindHelper(Document requestDocument) { this.requestDocument = requestDocument; } - + public Element createPropElement(List<Element> propList) { Element element = this.responseDocument.createElementNS(DAV_NAMESPACE_URI, "D:prop"); if (UtilValidate.isNotEmpty(propList)) { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/RequestHandlerFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/RequestHandlerFactory.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/RequestHandlerFactory.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/RequestHandlerFactory.java Fri Jan 15 21:00:23 2010 @@ -21,7 +21,7 @@ public interface RequestHandlerFactory { /** Returns a <code>RequestHandler<code> instance appropriate * for the WebDAV HTTP method. - * + * * @param method The WebDAV HTTP method. Implementations MUST * provide handlers for the following methods: PROPFIND, PROPPATCH, * MKCOL, GET, HEAD, POST, DELETE, PUT, COPY, MOVE, LOCK, UNLOCK. Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/ResponseHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/ResponseHelper.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/ResponseHelper.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/ResponseHelper.java Fri Jan 15 21:00:23 2010 @@ -49,20 +49,20 @@ response.setStatus(statusCode, statusString); } } - + protected final Document responseDocument; - + public ResponseHelper() { this.responseDocument = UtilXml.makeEmptyXmlDocument(); } - + public Element createElementSetValue(String elementName, String value) { Element element = this.responseDocument.createElementNS(DAV_NAMESPACE_URI, elementName); element.appendChild(element.getOwnerDocument().createTextNode(value)); element.setNodeValue(value); return element; } - + public Element createHrefElement(String hrefUrl) { return createElementSetValue("D:href", hrefUrl); } @@ -78,7 +78,7 @@ } return element; } - + public Element createResponseElement() { return this.responseDocument.createElementNS(DAV_NAMESPACE_URI, "D:response"); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java Fri Jan 15 21:00:23 2010 @@ -72,9 +72,9 @@ * checks for the request parameters <code>USERNAME</code> and <code>PASSWORD</code>. If * those aren't found, then the request is checked for the HTTP Authorization header. * Currently, only Basic authorization is supported.</p> - * + * * @param request The WebDAV request - * @return A <code>Map</code> containing <code>login.username</code> and + * @return A <code>Map</code> containing <code>login.username</code> and * <code>login.password</code> elements. */ public static Map<String, Object> getCredentialsFromRequest(HttpServletRequest request) { @@ -104,6 +104,6 @@ Map<String, Object> result = FastMap.newInstance(); result.put("login.username", username); result.put("login.password", password); - return result; + return result; } } Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java Fri Jan 15 21:00:23 2010 @@ -100,7 +100,7 @@ for (String rootFolder : this.rootFolders) { fileList.addAll(FileUtil.findXmlFiles(rootFolder + "webapp", null, null, null)); fileList.addAll(FileUtil.findXmlFiles(rootFolder + "widget", null, null, null)); - } + } for (File file : fileList) { String inFile = FileUtil.readString("UTF-8", file); if (inFile.contains("</forms>")) { @@ -113,7 +113,7 @@ findLabelKeyInElement(inFile, file.getPath(), "set"); continue; } - + } // get labels from Ofbiz components files getLabelsFromOfbizComponents(); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java Fri Jan 15 21:00:23 2010 @@ -191,7 +191,7 @@ writer.append("</a>"); } } - + public static void makeHiddenFormLinkAnchor(Appendable writer, String linkStyle, String description, String confirmation, ModelFormField modelFormField, HttpServletRequest request, HttpServletResponse response, Map<String, Object> context) throws IOException { if (UtilValidate.isNotEmpty(description) || UtilValidate.isNotEmpty(request.getAttribute("image"))) { writer.append("<a"); @@ -213,7 +213,7 @@ writer.append(modelFormField.getAction(context)); writer.append('"'); } - + if (UtilValidate.isNotEmpty(confirmation)){ writer.append(" onclick=\"return confirm('"); writer.append(confirmation); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java Fri Jan 15 21:00:23 2010 @@ -417,7 +417,7 @@ public void renderHyperlinkTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, String titleText) throws IOException { } - + public void renderContainerFindField(Appendable writer, Map<String, Object> context, ContainerField containerField) throws IOException { } } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java Fri Jan 15 21:00:23 2010 @@ -54,7 +54,7 @@ } public void renderScreenEnd(Appendable writer, Map<String, Object> context) throws IOException { - + } public void renderSectionBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Fri Jan 15 21:00:23 2010 @@ -366,7 +366,7 @@ String ajaxUrl = createAjaxParamsFromUpdateAreas(updateAreas, null, context); boolean disabled = textField.disabled; - + StringWriter sr = new StringWriter(); sr.append("<@renderTextField "); sr.append("name=\""); @@ -393,7 +393,7 @@ } sr.append("\" disabled="); sr.append(Boolean.toString(disabled)); - + sr.append(" clientAutocomplete=\""); sr.append(clientAutocomplete); sr.append("\" ajaxUrl=\""); @@ -717,7 +717,7 @@ List<String> currentValueList = null; if (UtilValidate.isNotEmpty(currentValue) && dropDownField.isAllowMultiple()) { - // If currentValue is Array, it will start with [ + // If currentValue is Array, it will start with [ if (currentValue.startsWith("[")) { currentValueList = StringUtil.toList(currentValue); } @@ -749,7 +749,7 @@ options.append(""); } } - + options.append("'}"); if (ajaxEnabled) { count++; @@ -1106,7 +1106,7 @@ String action = modelFormField.getAction(context); String event = modelFormField.getEvent(); String id = modelFormField.getIdName(); - + StringWriter sr = new StringWriter(); sr.append("<@renderHiddenField "); sr.append(" name=\""); @@ -1147,15 +1147,15 @@ renderHyperlinkTitle(sb, context, modelFormField, titleText); } } - + //check for required field style on single forms if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) { String requiredStyle = modelFormField.getRequiredFieldStyle(); if (UtilValidate.isNotEmpty(requiredStyle)) { style = requiredStyle; } - } - + } + StringWriter sr = new StringWriter(); sr.append("<@renderFieldTitle "); sr.append(" style=\""); @@ -1283,7 +1283,7 @@ } List<ModelFormField> childFieldList = modelForm.getFieldList(); List<String> columnStyleList = FastList.newInstance(); - List<String> fieldNameList = FastList.newInstance(); + List<String> fieldNameList = FastList.newInstance(); for (ModelFormField childField : childFieldList) { int childFieldType = childField.getFieldInfo().getFieldType(); if (childFieldType == ModelFormField.FieldInfo.HIDDEN || childFieldType == ModelFormField.FieldInfo.IGNORED) { @@ -1882,7 +1882,7 @@ String id = modelFormField.getIdName(); List<ModelForm.UpdateArea> updateAreas = modelFormField.getOnChangeUpdateAreas(); - + //add default ajax auto completer to all lookup fields if (UtilValidate.isEmpty(updateAreas) && UtilValidate.isNotEmpty(lookupFieldFormName)) { String autoCompleterTarget = null; @@ -1895,17 +1895,17 @@ updateAreas = FastList.newInstance(); updateAreas.add(new ModelForm.UpdateArea("change", id, autoCompleterTarget)); } - + boolean ajaxEnabled = updateAreas != null && this.javaScriptEnabled; String autocomplete = ""; if (!lookupField.getClientAutocompleteField() || ajaxEnabled) { autocomplete = "off"; } - + String event = modelFormField.getEvent(); - String action = modelFormField.getAction(context); + String action = modelFormField.getAction(context); boolean disabled = lookupField.disabled; - + // add lookup pop-up button String descriptionFieldName = lookupField.getDescriptionFieldName(); String formName = modelFormField.getModelForm().getCurrentFormName(context); @@ -1957,7 +1957,7 @@ } sr.append("\" disabled="); sr.append(Boolean.toString(disabled)); - + sr.append(" autocomplete=\""); sr.append(autocomplete); sr.append("\" descriptionFieldName=\""); @@ -1976,7 +1976,7 @@ sr.append(Boolean.toString(ajaxEnabled)); sr.append(" />"); executeMacro(sr.toString()); - + this.addAsterisks(writer, context, modelFormField); this.makeHyperlinkString(writer, lookupField.getSubHyperlink(), context); @@ -2020,7 +2020,7 @@ int viewIndex = modelForm.getViewIndex(context); int viewSize = modelForm.getViewSize(context); int listSize = modelForm.getListSize(context); - + int lowIndex = modelForm.getLowIndex(context); int highIndex = modelForm.getHighIndex(context); int actualPageSize = modelForm.getActualPageSize(context); @@ -2165,7 +2165,7 @@ selectSizeUrl = rh.makeLink(this.request, this.response, urlPath + linkText); } } - + StringWriter sr = new StringWriter(); sr.append("<@renderNextPrev "); sr.append(" paginateStyle=\""); @@ -2558,8 +2558,8 @@ } StringWriter sr = new StringWriter(); makeHyperlinkString(sr, modelFormField.getHeaderLinkStyle(), targetType, targetBuffer.toString(), null, titleText, "", modelFormField, this.request, this.response, context, ""); - - String title = sr.toString().replace("\"", "\'"); + + String title = sr.toString().replace("\"", "\'"); sr = new StringWriter(); sr.append("<@renderHyperlinkTitle "); sr.append(" name=\""); @@ -2826,12 +2826,12 @@ sr.append("\" description=\""); sr.append(description); sr.append("\" confirmation =\""); - sr.append(confirmation ); + sr.append(confirmation ); sr.append("\" />"); executeMacro(sr.toString()); } } - + public void makeHiddenFormLinkAnchor(Appendable writer, String linkStyle, String description, String confirmation , ModelFormField modelFormField, HttpServletRequest request, HttpServletResponse response, Map<String, Object> context) throws IOException { if (UtilValidate.isNotEmpty(description) || UtilValidate.isNotEmpty(request.getAttribute("image"))) { String hiddenFormName = WidgetWorker.makeLinkHiddenFormName(context, modelFormField); @@ -2863,7 +2863,7 @@ sr.append("\" description=\""); sr.append(description); sr.append("\" confirmation =\""); - sr.append(confirmation ); + sr.append(confirmation ); sr.append("\" />"); executeMacro(sr.toString()); } @@ -2901,7 +2901,7 @@ sr.append("\" />"); executeMacro(sr.toString()); } - + public void renderContainerFindField(Appendable writer, Map<String, Object> context, ContainerField containerField) throws IOException { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Fri Jan 15 21:00:23 2010 @@ -149,7 +149,7 @@ /** This Map is keyed with the field name and has a ModelFormField for the value. */ protected Map<String, ModelFormField> fieldMap = FastMap.newInstance(); - + /** Keeps track of conditional fields to help ensure that only one is rendered */ protected Set<String> useWhenFields = FastSet.newInstance(); @@ -174,7 +174,7 @@ /** Pagination settings and defaults. */ public static int DEFAULT_PAGE_SIZE = 10; - public static int MAX_PAGE_SIZE = 10000; + public static int MAX_PAGE_SIZE = 10000; protected int defaultViewSize = DEFAULT_PAGE_SIZE; public static String DEFAULT_PAG_INDEX_FIELD = "viewIndex"; public static String DEFAULT_PAG_SIZE_FIELD = "viewSize"; @@ -300,7 +300,7 @@ this.onSubmitUpdateAreas = parent.onSubmitUpdateAreas; this.onPaginateUpdateAreas = parent.onPaginateUpdateAreas; this.altRowStyles = parent.altRowStyles; - + this.useWhenFields = parent.useWhenFields; //these are done below in a special way... @@ -796,12 +796,12 @@ if ("list".equals(this.type) || "multi".equals(this.type)) { this.incrementPaginatorNumber(context); } - + //if pagination is disabled, update the defualt view size if (!getPaginate(context)) { setDefaultViewSize(this.MAX_PAGE_SIZE); } - + // Populate the viewSize and viewIndex so they are available for use during form actions context.put("viewIndex", this.getViewIndex(context)); context.put("viewSize", this.getViewSize(context)); @@ -1442,7 +1442,7 @@ if (UtilValidate.isNotEmpty(context.get("renderFormSeqNumber"))) { localContext.put("formUniqueId", "_"+context.get("renderFormSeqNumber")); } - + this.resetBshInterpreter(localContext); if (Debug.verboseOn()) Debug.logVerbose("In form got another row, context is: " + localContext, module); @@ -1939,16 +1939,16 @@ return this.getName(); } } - + public String getCurrentContainerId(Map<String, Object> context) { Integer itemIndex = (Integer) context.get("itemIndex"); if (itemIndex != null && "list".equals(this.getType())) { return this.getContainerId() + this.getItemIndexSeparator() + itemIndex.intValue(); - } - + } + return this.getContainerId(); } - + public String getContainerStyle() { return this.containerStyle; } @@ -2192,7 +2192,7 @@ } return field; } - + public String getMultiPaginateIndexField(Map<String, Object> context) { String field = this.paginateIndexField.expandString(context); if (UtilValidate.isEmpty(field)) { @@ -2221,7 +2221,7 @@ } } } - + // try paginate index field without paginator number if (value == null) { field = this.getPaginateIndexField(context); @@ -2247,7 +2247,7 @@ } return field; } - + public String getMultiPaginateSizeField(Map<String, Object> context) { String field = this.paginateSizeField.expandString(context); if (UtilValidate.isEmpty(field)) { @@ -2276,7 +2276,7 @@ } } } - + // try the page size field without paginator number if (value == null) { field = this.getPaginateSizeField(context); @@ -2377,7 +2377,7 @@ return Boolean.valueOf(this.paginate.expandString(context)).booleanValue(); } else { return true; - } + } } public boolean getSkipStart() { @@ -2407,11 +2407,11 @@ public boolean getClientAutocompleteFields() { return this.clientAutocompleteFields; } - + public void setPaginate(boolean val) { this.paginate = FlexibleStringExpander.getInstance(Boolean.valueOf(val).toString()); } - + public void setOverridenListSize(boolean overridenListSize) { this.overridenListSize = overridenListSize; } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Fri Jan 15 21:00:23 2010 @@ -2090,8 +2090,8 @@ String isoCode = null; if (this.currency != null && !this.currency.isEmpty()) { isoCode = this.currency.expandString(context); - } - + } + try { BigDecimal parsedRetVal = (BigDecimal) ObjectType.simpleTypeConvert(retVal, "BigDecimal", null, null, locale, true); retVal = UtilFormatOut.formatCurrency(parsedRetVal, isoCode, locale, 10); // we set the max to 10 digits as an hack to not round numbers in the ui @@ -2280,7 +2280,7 @@ public boolean getAlsoHidden() { return this.alsoHidden; } - + public boolean getRequestConfirmation() { return this.requestConfirmation; } @@ -2296,12 +2296,12 @@ return getConfirmationMsg(context); } return ""; - } - + } + public String getConfirmationMsg(Map<String, Object> context) { return this.confirmationMsgExdr.expandString(context); - } - + } + public String getLinkType() { return this.linkType; } @@ -2362,11 +2362,11 @@ public void setTarget(String string) { this.target = FlexibleStringExpander.getInstance(string); } - + public void setRequestConfirmation(boolean val) { this.requestConfirmation = val; } - + public void setConfirmationMsg(String val) { this.confirmationMsgExdr = FlexibleStringExpander.getInstance(val); } @@ -2402,7 +2402,7 @@ this.modelFormField = modelFormField; } - + public String getLinkStyle() { return this.linkStyle; } @@ -2451,15 +2451,15 @@ return ""; } } - + public boolean getRequestConfirmation() { return this.requestConfirmation; } - + public String getConfirmationMsg(Map<String, Object> context) { return this.confirmationMsgExdr.expandString(context); } - + public String getConfirmation(Map<String, Object> context) { String message = getConfirmationMsg(context); if (UtilValidate.isNotEmpty(message)) { @@ -2471,8 +2471,8 @@ return getConfirmationMsg(context); } return ""; - } - + } + public ModelFormField getModelFormField() { return this.modelFormField; } @@ -2540,12 +2540,12 @@ */ public void setUseWhen(String string) { this.useWhen = FlexibleStringExpander.getInstance(string); - } - + } + public void setRequestConfirmation(boolean val) { this.requestConfirmation = val; } - + public void setConfirmationMsg(String val) { this.confirmationMsgExdr = FlexibleStringExpander.getInstance(val); } @@ -3202,7 +3202,7 @@ this.backgroundSubmitRefreshTargetExdr = FlexibleStringExpander.getInstance(element.getAttribute("background-submit-refresh-target")); setRequestConfirmation("true".equals(element.getAttribute("request-confirmation"))); setConfirmationMsg(element.getAttribute("confirmation-message")); - } + } @Override public void renderFieldString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException { @@ -3215,16 +3215,16 @@ public String getImageLocation() { return imageLocation; - } + } public boolean getRequestConfirmation() { return this.requestConfirmation; } - + public String getConfirmationMsg(Map<String, Object> context) { return this.confirmationMsgExdr.expandString(context); } - + public String getConfirmation(Map<String, Object> context) { String message = getConfirmationMsg(context); if (UtilValidate.isNotEmpty(message)) { @@ -3236,8 +3236,8 @@ return getConfirmationMsg(context); } return ""; - } - + } + /** * @param string */ @@ -3254,12 +3254,12 @@ public String getBackgroundSubmitRefreshTarget(Map<String, Object> context) { return this.backgroundSubmitRefreshTargetExdr.expandString(context); - } - + } + public void setRequestConfirmation(boolean val) { this.requestConfirmation = val; } - + public void setConfirmationMsg(String val) { this.confirmationMsgExdr = FlexibleStringExpander.getInstance(val); } @@ -3369,7 +3369,7 @@ if(element.hasAttribute("default-option")) { this.defaultOption = element.getAttribute("default-option"); } else { - this.defaultOption = UtilProperties.getPropertyValue("widget", "widget.form.defaultTextFindOption", "like"); + this.defaultOption = UtilProperties.getPropertyValue("widget", "widget.form.defaultTextFindOption", "like"); } this.hideOptions = "true".equals(element.getAttribute("hide-options")) || "options".equals(element.getAttribute("hide-options")) ? true : false; @@ -3663,7 +3663,7 @@ } } - + public static class ContainerField extends FieldInfo { protected String id; Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java Fri Jan 15 21:00:23 2010 @@ -190,7 +190,7 @@ txt = simpleEncoder.encode(txt); } writer.append(txt); - + } if (!menuItem.getMenuItemList().isEmpty()) { appendWhitespace(writer); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java Fri Jan 15 21:00:23 2010 @@ -91,7 +91,7 @@ for (Element menuElement: UtilXml.childElementList(rootElement, "menu")){ ModelMenu modelMenu = new ModelMenu(menuElement, delegator, dispatcher); modelMenu.setMenuLocation(menuLocation); - modelMenuMap.put(modelMenu.getName(), modelMenu); + modelMenuMap.put(modelMenu.getName(), modelMenu); } } return modelMenuMap; Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Fri Jan 15 21:00:23 2010 @@ -732,7 +732,7 @@ public List<WidgetWorker.Parameter> getParameterList() { return this.parameterList; } - + public String getConfirmation(Map<String, Object> context) { String message = getConfirmationMsg(context); if (UtilValidate.isNotEmpty(message)) { @@ -745,11 +745,11 @@ } return ""; } - + public boolean getRequestConfirmation() { return this.requestConfirmation; } - + public String getConfirmationMsg(Map<String, Object> context) { return this.confirmationMsgExdr.expandString(context); } @@ -815,11 +815,11 @@ public void setImage(Image img) { this.image = img; } - + public void setRequestConfirmation(boolean val) { this.requestConfirmation = val; } - + public void setConfirmationMsg(String val) { this.confirmationMsgExdr = FlexibleStringExpander.getInstance(val); } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java Fri Jan 15 21:00:23 2010 @@ -62,7 +62,7 @@ protected FlexibleStringExpander paginate; public static int DEFAULT_PAGE_SIZE = 5; - public static int MAX_PAGE_SIZE = 10000; + public static int MAX_PAGE_SIZE = 10000; protected int viewIndex = 0; protected int viewSize = DEFAULT_PAGE_SIZE; protected int lowIndex = -1; @@ -87,7 +87,7 @@ if (this.paginate == null || iterateSectionElement.hasAttribute("paginate")) { this.paginate = FlexibleStringExpander.getInstance(iterateSectionElement.getAttribute("paginate")); } - + if (iterateSectionElement.hasAttribute("view-size")) { setViewSize(iterateSectionElement.getAttribute("view-size")); } @@ -143,7 +143,7 @@ } if (isEntrySet) { Map.Entry<String, ?> entry = UtilGenerics.cast(item); - contextMs.put(entryName, entry.getValue()); + contextMs.put(entryName, entry.getValue()); contextMs.put(keyName, entry.getKey()); } else { contextMs.put(entryName, item); @@ -191,13 +191,13 @@ public String getPaginateTarget(Map<String, Object> context) { return this.paginateTarget.expandString(context); } - + public boolean getPaginate(Map<String, Object> context) { if (this.paginate != null && !this.paginate.isEmpty() && UtilValidate.isNotEmpty(this.paginate.expandString(context))) { return Boolean.valueOf(this.paginate.expandString(context)).booleanValue(); } else { return true; - } + } } public void setPaginate(boolean val) { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Fri Jan 15 21:00:23 2010 @@ -73,7 +73,7 @@ macroLibrary = FreeMarkerWorker.getTemplate(macroLibraryPath); Map<String, Object> input = UtilMisc.toMap("key", null); environment = FreeMarkerWorker.renderTemplate(macroLibrary, input, writer); - rendererName = name; + rendererName = name; } private String getNextElementId() { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Fri Jan 15 21:00:23 2010 @@ -347,7 +347,7 @@ } // By default, for a collapsible screenlet, the collapsed/expanded status must be saved this.saveCollapsed = !("false".equals(screenletElement.getAttribute("save-collapsed"))); - + this.padded = !"false".equals(screenletElement.getAttribute("padded")); if (this.collapsible && UtilValidate.isEmpty(this.name) && idExdr.isEmpty()) { throw new IllegalArgumentException("Collapsible screenlets must have a name or id [" + this.modelScreen.getName() + "]"); @@ -418,15 +418,15 @@ public boolean collapsible() { return this.collapsible; } - + //initially-collapsed status, which may be overriden by user preference public boolean getInitiallyCollapsed(Map<String, Object> context) { String screenletId = this.getId(context) + "_collapsed"; Map<String, ? extends Object> userPreferences = UtilGenerics.checkMap(context.get("userPreferences")); if (userPreferences != null && userPreferences.containsKey(screenletId)) { - return Boolean.valueOf((String)userPreferences.get(screenletId)).booleanValue() ; + return Boolean.valueOf((String)userPreferences.get(screenletId)).booleanValue() ; } - + return this.initiallyCollapsed; } @@ -925,7 +925,7 @@ Debug.logError(e, errMsg, module); throw new RuntimeException(errMsg); } - + TreeStringRenderer treeStringRenderer = (TreeStringRenderer) context.get("treeStringRenderer"); if (treeStringRenderer == null) { throw new IllegalArgumentException("Could not find a treeStringRenderer in the context"); @@ -1096,13 +1096,13 @@ if (UtilValidate.isNotEmpty(mimeTypeId) && ((mimeTypeId.indexOf("application") >= 0) || (mimeTypeId.indexOf("image")) >= 0)) { - -/* + +/* // this code is not yet working, will update it the next few weeks...(Hans) if (mimeTypeId.equals("application/pdf")) { TransformerFactory tfactory = TransformerFactory.newInstance(); try { - + // // this part is not working. If somebody can help to make it work? // currently using only real temp files for debugging purposes. @@ -1135,11 +1135,11 @@ // fw.write(sw.toString()); // fw.close(); - - FopFactory fopFactory = FopFactory.newInstance(); + + FopFactory fopFactory = FopFactory.newInstance(); FOUserAgent foUserAgent = fopFactory.newFOUserAgent(); // configure foUserAgent as desired - + // Setup output stream. Note: Using BufferedOutputStream // for performance reasons (helpful with FileOutputStreams). // OutputStream out = new FileOutputStream("/tmp/file.pdf"); @@ -1151,16 +1151,16 @@ // Setup JAXP using identity transformer TransformerFactory factory = TransformerFactory.newInstance(); Transformer transformer = factory.newTransformer(); // identity transformer - + // Setup input stream Source src = new StreamSource(new ByteArrayInputStream(sw.toString().getBytes())); // Resulting SAX events (the generated FO) must be piped through to FOP Result result = new SAXResult(fop.getDefaultHandler()); - + // Start XSLT transformation and FOP processing transformer.transform(src, result); - + out.flush(); out.close(); // to a file for debugging Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java Fri Jan 15 21:00:23 2010 @@ -136,7 +136,7 @@ } return ""; } - + public void setRenderFormUniqueSeq (int renderFormSeqNumber) { this.renderFormSeqNumber = renderFormSeqNumber; } @@ -243,7 +243,7 @@ TaglibFactory JspTaglibs = new TaglibFactory(servletContext); context.put("JspTaglibs", JspTaglibs); context.put("requestParameters", UtilHttp.getParameterMap(request)); - + ServletContextHashModel ftlServletContext = (ServletContextHashModel) request.getAttribute("ftlServletContext"); context.put("Application", ftlServletContext); context.put("Request", context.get("requestAttributes")); @@ -313,7 +313,7 @@ } public void populateContextForService(DispatchContext dctx, Map<String, Object> serviceContext) { - this.populateBasicContext(serviceContext, dctx.getDelegator(), dctx.getDispatcher(), dctx.getAuthorization(), + this.populateBasicContext(serviceContext, dctx.getDelegator(), dctx.getDispatcher(), dctx.getAuthorization(), dctx.getSecurity(), (Locale) serviceContext.get("locale"), (GenericValue) serviceContext.get("userLogin")); } } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java Fri Jan 15 21:00:23 2010 @@ -295,7 +295,7 @@ public void renderHyperlinkTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, String titleText) { } - + public void renderContainerFindField(Appendable writer, Map<String, Object> context, ContainerField containerField) throws IOException { } } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Fri Jan 15 21:00:23 2010 @@ -179,12 +179,12 @@ else expColReq = s1; } - - //append also the request parameters + + //append also the request parameters Map<String, Object> paramMap = UtilGenerics.checkMap(context.get("requestParameters")); if (UtilValidate.isNotEmpty(paramMap)) { Map<String, Object> requestParameters = new HashMap<String, Object>(paramMap); - requestParameters.remove(this.getTrailName(context)); + requestParameters.remove(this.getTrailName(context)); if (UtilValidate.isNotEmpty(requestParameters)) { String queryString = UtilHttp.urlEncodeArgs(requestParameters, false); if (expColReq.indexOf("?") < 0) { @@ -192,10 +192,10 @@ } else { expColReq += "&"; } - expColReq += queryString; - } + expColReq += queryString; + } } - + return expColReq; } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java Fri Jan 15 21:00:23 2010 @@ -336,7 +336,7 @@ public void renderHyperlinkTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, String titleText) throws IOException { } - + public void renderContainerFindField(Appendable writer, Map<String, Object> context, ContainerField containerField) throws IOException { } } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ApplicationAuthenticationContext.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ApplicationAuthenticationContext.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ApplicationAuthenticationContext.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ApplicationAuthenticationContext.java Fri Jan 15 21:00:23 2010 @@ -47,7 +47,7 @@ /** * Gets the credential value for this ApplicationAuthenticationContext. - * + * * @return credential */ public com.atlassian.crowd.integration.authentication.PasswordCredential getCredential() { @@ -57,7 +57,7 @@ /** * Sets the credential value for this ApplicationAuthenticationContext. - * + * * @param credential */ public void setCredential(com.atlassian.crowd.integration.authentication.PasswordCredential credential) { @@ -67,7 +67,7 @@ /** * Gets the name value for this ApplicationAuthenticationContext. - * + * * @return name */ public java.lang.String getName() { @@ -77,7 +77,7 @@ /** * Sets the name value for this ApplicationAuthenticationContext. - * + * * @param name */ public void setName(java.lang.String name) { @@ -87,7 +87,7 @@ /** * Gets the validationFactors value for this ApplicationAuthenticationContext. - * + * * @return validationFactors */ public com.atlassian.crowd.integration.authentication.ValidationFactor[] getValidationFactors() { @@ -97,7 +97,7 @@ /** * Sets the validationFactors value for this ApplicationAuthenticationContext. - * + * * @param validationFactors */ public void setValidationFactors(com.atlassian.crowd.integration.authentication.ValidationFactor[] validationFactors) { @@ -115,14 +115,14 @@ } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.credential==null && other.getCredential()==null) || + _equals = true && + ((this.credential==null && other.getCredential()==null) || (this.credential!=null && this.credential.equals(other.getCredential()))) && - ((this.name==null && other.getName()==null) || + ((this.name==null && other.getName()==null) || (this.name!=null && this.name.equals(other.getName()))) && - ((this.validationFactors==null && other.getValidationFactors()==null) || + ((this.validationFactors==null && other.getValidationFactors()==null) || (this.validationFactors!=null && java.util.Arrays.equals(this.validationFactors, other.getValidationFactors()))); __equalsCalc = null; @@ -198,10 +198,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -210,10 +210,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/AuthenticatedToken.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/AuthenticatedToken.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/AuthenticatedToken.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/AuthenticatedToken.java Fri Jan 15 21:00:23 2010 @@ -43,7 +43,7 @@ /** * Gets the name value for this AuthenticatedToken. - * + * * @return name */ public java.lang.String getName() { @@ -53,7 +53,7 @@ /** * Sets the name value for this AuthenticatedToken. - * + * * @param name */ public void setName(java.lang.String name) { @@ -63,7 +63,7 @@ /** * Gets the token value for this AuthenticatedToken. - * + * * @return token */ public java.lang.String getToken() { @@ -73,7 +73,7 @@ /** * Sets the token value for this AuthenticatedToken. - * + * * @param token */ public void setToken(java.lang.String token) { @@ -91,11 +91,11 @@ } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.name==null && other.getName()==null) || + _equals = true && + ((this.name==null && other.getName()==null) || (this.name!=null && this.name.equals(other.getName()))) && - ((this.token==null && other.getToken()==null) || + ((this.token==null && other.getToken()==null) || (this.token!=null && this.token.equals(other.getToken()))); __equalsCalc = null; @@ -152,10 +152,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -164,10 +164,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PasswordCredential.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PasswordCredential.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PasswordCredential.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PasswordCredential.java Fri Jan 15 21:00:23 2010 @@ -43,7 +43,7 @@ /** * Gets the credential value for this PasswordCredential. - * + * * @return credential */ public java.lang.String getCredential() { @@ -53,7 +53,7 @@ /** * Sets the credential value for this PasswordCredential. - * + * * @param credential */ public void setCredential(java.lang.String credential) { @@ -63,7 +63,7 @@ /** * Gets the encryptedCredential value for this PasswordCredential. - * + * * @return encryptedCredential */ public java.lang.Boolean getEncryptedCredential() { @@ -73,7 +73,7 @@ /** * Sets the encryptedCredential value for this PasswordCredential. - * + * * @param encryptedCredential */ public void setEncryptedCredential(java.lang.Boolean encryptedCredential) { @@ -91,11 +91,11 @@ } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.credential==null && other.getCredential()==null) || + _equals = true && + ((this.credential==null && other.getCredential()==null) || (this.credential!=null && this.credential.equals(other.getCredential()))) && - ((this.encryptedCredential==null && other.getEncryptedCredential()==null) || + ((this.encryptedCredential==null && other.getEncryptedCredential()==null) || (this.encryptedCredential!=null && this.encryptedCredential.equals(other.getEncryptedCredential()))); __equalsCalc = null; @@ -152,10 +152,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -164,10 +164,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PrincipalAuthenticationContext.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PrincipalAuthenticationContext.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PrincipalAuthenticationContext.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PrincipalAuthenticationContext.java Fri Jan 15 21:00:23 2010 @@ -51,7 +51,7 @@ /** * Gets the application value for this PrincipalAuthenticationContext. - * + * * @return application */ public java.lang.String getApplication() { @@ -61,7 +61,7 @@ /** * Sets the application value for this PrincipalAuthenticationContext. - * + * * @param application */ public void setApplication(java.lang.String application) { @@ -71,7 +71,7 @@ /** * Gets the credential value for this PrincipalAuthenticationContext. - * + * * @return credential */ public com.atlassian.crowd.integration.authentication.PasswordCredential getCredential() { @@ -81,7 +81,7 @@ /** * Sets the credential value for this PrincipalAuthenticationContext. - * + * * @param credential */ public void setCredential(com.atlassian.crowd.integration.authentication.PasswordCredential credential) { @@ -91,7 +91,7 @@ /** * Gets the name value for this PrincipalAuthenticationContext. - * + * * @return name */ public java.lang.String getName() { @@ -101,7 +101,7 @@ /** * Sets the name value for this PrincipalAuthenticationContext. - * + * * @param name */ public void setName(java.lang.String name) { @@ -111,7 +111,7 @@ /** * Gets the validationFactors value for this PrincipalAuthenticationContext. - * + * * @return validationFactors */ public com.atlassian.crowd.integration.authentication.ValidationFactor[] getValidationFactors() { @@ -121,7 +121,7 @@ /** * Sets the validationFactors value for this PrincipalAuthenticationContext. - * + * * @param validationFactors */ public void setValidationFactors(com.atlassian.crowd.integration.authentication.ValidationFactor[] validationFactors) { @@ -139,17 +139,17 @@ } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.application==null && other.getApplication()==null) || + _equals = true && + ((this.application==null && other.getApplication()==null) || (this.application!=null && this.application.equals(other.getApplication()))) && - ((this.credential==null && other.getCredential()==null) || + ((this.credential==null && other.getCredential()==null) || (this.credential!=null && this.credential.equals(other.getCredential()))) && - ((this.name==null && other.getName()==null) || + ((this.name==null && other.getName()==null) || (this.name!=null && this.name.equals(other.getName()))) && - ((this.validationFactors==null && other.getValidationFactors()==null) || + ((this.validationFactors==null && other.getValidationFactors()==null) || (this.validationFactors!=null && java.util.Arrays.equals(this.validationFactors, other.getValidationFactors()))); __equalsCalc = null; @@ -235,10 +235,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -247,10 +247,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ValidationFactor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ValidationFactor.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ValidationFactor.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ValidationFactor.java Fri Jan 15 21:00:23 2010 @@ -43,7 +43,7 @@ /** * Gets the name value for this ValidationFactor. - * + * * @return name */ public java.lang.String getName() { @@ -53,7 +53,7 @@ /** * Sets the name value for this ValidationFactor. - * + * * @param name */ public void setName(java.lang.String name) { @@ -63,7 +63,7 @@ /** * Gets the value value for this ValidationFactor. - * + * * @return value */ public java.lang.String getValue() { @@ -73,7 +73,7 @@ /** * Sets the value value for this ValidationFactor. - * + * * @param value */ public void setValue(java.lang.String value) { @@ -91,11 +91,11 @@ } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.name==null && other.getName()==null) || + _equals = true && + ((this.name==null && other.getName()==null) || (this.name!=null && this.name.equals(other.getName()))) && - ((this.value==null && other.getValue()==null) || + ((this.value==null && other.getValue()==null) || (this.value!=null && this.value.equals(other.getValue()))); __equalsCalc = null; @@ -152,10 +152,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -164,10 +164,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationAccessDeniedException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationAccessDeniedException.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationAccessDeniedException.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationAccessDeniedException.java Fri Jan 15 21:00:23 2010 @@ -75,10 +75,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -87,10 +87,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationPermissionException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationPermissionException.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationPermissionException.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationPermissionException.java Fri Jan 15 21:00:23 2010 @@ -75,10 +75,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -87,10 +87,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InactiveAccountException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InactiveAccountException.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InactiveAccountException.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InactiveAccountException.java Fri Jan 15 21:00:23 2010 @@ -75,10 +75,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -87,10 +87,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthenticationException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthenticationException.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthenticationException.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthenticationException.java Fri Jan 15 21:00:23 2010 @@ -75,10 +75,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -87,10 +87,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |