OFBiz › OFBiz - Commits

svn commit: r805012 [8/11] - in /ofbiz/branches/executioncontext20090812: ./ applications/accounting/ applications/accounting/config/ applications/accounting/data/ applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accounting/scr...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

adrianc

svn commit: r805012 [8/11] - in /ofbiz/branches/executioncontext20090812: ./ applications/accounting/ applications/accounting/config/ applications/accounting/data/ applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accounting/scr...

Modified: ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java Mon Aug 17 15:42:56 2009
@@ -41,7 +41,7 @@

private static final String module = EntityAuthorization.class.getName();

- /**
+ /**
* UtilCache to cache a Collection of UserLoginSecurityGroup entities for each UserLogin, by userLoginId.
*/
private static UtilCache<String, List<GenericValue>> userLoginSecurityGroupByUserLoginId = new UtilCache<String, List<GenericValue>>("security.UserLoginSecurityGroupByUserLoginId");
@@ -60,72 +60,72 @@

protected GenericDelegator delegator;

- @Override
- public List<String> getAutoGrantPermissions(String userId, String permission, Map<String, ? extends Object> context) {
- if (Debug.verboseOn()) Debug.logVerbose("Running getAutoGrantPermissions()", module);
- boolean checking = true;
- String checkString = permission;
-
- while (checking) {
- if (Debug.verboseOn()) Debug.logVerbose("Looking for auto-grant permissions for : " + checkString, module);
- List<String> autoGrant = getPermissionAutoGrant(checkString);
- if (autoGrant != null && autoGrant.size() > 0) {
- return autoGrant;
- }
- if (checkString.indexOf(":") > -1) {
- checkString = checkString.substring(0, checkString.lastIndexOf(":"));
- } else {
- checking = false;
- }
- }
- return null;
- }
-
- @Override
- public boolean hasDynamicPermission(String userId, String permission, Map<String, ? extends Object> context) {
- if (Debug.verboseOn()) Debug.logVerbose("Running hasDynamicPermission()", module);
- String permissionId = permission;
- boolean checking = true;
-
- // find the dynamic access implementation
- String dynamicAccess = null;
- while (checking) {
- if (Debug.verboseOn()) Debug.logVerbose("Looking for dynamic access for permission -- " + permissionId, module);
- dynamicAccess = getPermissionDynamicAccess(permissionId);
- if (UtilValidate.isEmpty(dynamicAccess)) {
- if (permissionId.indexOf(":") > -1) {
- permissionId = permissionId.substring(0, permissionId.lastIndexOf(":"));
- } else {
- Debug.logVerbose("No sections left to check; no dynamic access implementation found", module);
- checking = false;
- }
- } else {
- if (Debug.verboseOn()) Debug.logVerbose("Dynamic access implementation found : " + dynamicAccess, module);
- checking = false;
- }
- }
-
- // if one exists invoke it
- if (UtilValidate.isNotEmpty(dynamicAccess)) {
- // load the dynamic access handler and invoke it
- if (Debug.verboseOn()) Debug.logVerbose("Loading DynamicAccessHandler for -- " + dynamicAccess, module);
- DynamicAccessHandler dah = DynamicAccessFactory.getDynamicAccessHandler(delegator, dynamicAccess);
- if (dah != null) {
- if (Debug.verboseOn()) Debug.logVerbose("Calling DynamicAccessHandler : " + dah.getClass().getName(), module);
- return dah.handleDynamicAccess(dynamicAccess, userId, permission, context);
- } else {
- if (Debug.verboseOn()) {
- Debug.logVerbose("No DynamicAccessHandler found for pattern matching -- " + dynamicAccess, module);
- }
- }
- }
- return false;
- }
-
- @Override
- public boolean hasStaticPermission(String userId, String permission, Map<String, ? extends Object> context) {
- if (Debug.verboseOn()) Debug.logVerbose("Running hasStaticPermission()", module);
- Iterator<GenericValue> iterator = getUserLoginSecurityGroupByUserLoginId(userId);
+ @Override
+ public List<String> getAutoGrantPermissions(String userId, String permission, Map<String, ? extends Object> context) {
+ if (Debug.verboseOn()) Debug.logVerbose("Running getAutoGrantPermissions()", module);
+ boolean checking = true;
+ String checkString = permission;
+
+ while (checking) {
+ if (Debug.verboseOn()) Debug.logVerbose("Looking for auto-grant permissions for : " + checkString, module);
+ List<String> autoGrant = getPermissionAutoGrant(checkString);
+ if (autoGrant != null && autoGrant.size() > 0) {
+ return autoGrant;
+ }
+ if (checkString.indexOf(":") > -1) {
+ checkString = checkString.substring(0, checkString.lastIndexOf(":"));
+ } else {
+ checking = false;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public boolean hasDynamicPermission(String userId, String permission, Map<String, ? extends Object> context) {
+ if (Debug.verboseOn()) Debug.logVerbose("Running hasDynamicPermission()", module);
+ String permissionId = permission;
+ boolean checking = true;
+
+ // find the dynamic access implementation
+ String dynamicAccess = null;
+ while (checking) {
+ if (Debug.verboseOn()) Debug.logVerbose("Looking for dynamic access for permission -- " + permissionId, module);
+ dynamicAccess = getPermissionDynamicAccess(permissionId);
+ if (UtilValidate.isEmpty(dynamicAccess)) {
+ if (permissionId.indexOf(":") > -1) {
+ permissionId = permissionId.substring(0, permissionId.lastIndexOf(":"));
+ } else {
+ Debug.logVerbose("No sections left to check; no dynamic access implementation found", module);
+ checking = false;
+ }
+ } else {
+ if (Debug.verboseOn()) Debug.logVerbose("Dynamic access implementation found : " + dynamicAccess, module);
+ checking = false;
+ }
+ }
+
+ // if one exists invoke it
+ if (UtilValidate.isNotEmpty(dynamicAccess)) {
+ // load the dynamic access handler and invoke it
+ if (Debug.verboseOn()) Debug.logVerbose("Loading DynamicAccessHandler for -- " + dynamicAccess, module);
+ DynamicAccessHandler dah = DynamicAccessFactory.getDynamicAccessHandler(delegator, dynamicAccess);
+ if (dah != null) {
+ if (Debug.verboseOn()) Debug.logVerbose("Calling DynamicAccessHandler : " + dah.getClass().getName(), module);
+ return dah.handleDynamicAccess(dynamicAccess, userId, permission, context);
+ } else {
+ if (Debug.verboseOn()) {
+ Debug.logVerbose("No DynamicAccessHandler found for pattern matching -- " + dynamicAccess, module);
+ }
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean hasStaticPermission(String userId, String permission, Map<String, ? extends Object> context) {
+ if (Debug.verboseOn()) Debug.logVerbose("Running hasStaticPermission()", module);
+ Iterator<GenericValue> iterator = getUserLoginSecurityGroupByUserLoginId(userId);
GenericValue userLoginSecurityGroup = null;

while (iterator.hasNext()) {
@@ -135,9 +135,9 @@
}
}
return false;
- }
-
- /**
+ }
+
+ /**
* Test to see if the specified user has permission
*
* @param session HttpSession used to obtain the userId
@@ -145,19 +145,19 @@
* @param context name/value pairs used for permission lookup
* @return true if the user has permission
*/
- public boolean hasPermission(HttpSession session, String permission, Map<String, ? extends Object> context) {
+ public boolean hasPermission(HttpSession session, String permission, Map<String, ? extends Object> context) {
GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
if (userLogin != null) {
return hasPermission(userLogin.getString("userLoginId"), permission, context);
}
return false;
}
-
- public void setDelegator(GenericDelegator delegator) {
- this.delegator = delegator;
- }
-
- private Iterator<GenericValue> getUserLoginSecurityGroupByUserLoginId(String userId) {
+
+ public void setDelegator(GenericDelegator delegator) {
+ this.delegator = delegator;
+ }
+
+ private Iterator<GenericValue> getUserLoginSecurityGroupByUserLoginId(String userId) {
List<GenericValue> collection = userLoginSecurityGroupByUserLoginId.get(userId);

if (collection == null) {
@@ -178,7 +178,7 @@
collection = EntityUtil.filterByDate(collection, true);
return collection.iterator();
}
-
+
private boolean securityGroupHasPermission(String groupId, String permission) {
GenericValue securityGroupPermissionValue = delegator.makeValue("SecurityGroupPermission",
UtilMisc.toMap("groupId", groupId, "permissionId", permission));
@@ -198,7 +198,7 @@
securityGroupPermissionCache.put(securityGroupPermissionValue, exists);
}
return exists.booleanValue();
- }
+ }

private List<String> getPermissionAutoGrant(String permission) {
List<String> autoGrants = permissionAutoGrantCache.get(permission);

Modified: ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java Mon Aug 17 15:42:56 2009
@@ -24,23 +24,23 @@

public interface DynamicAccess {

- /**
- * Processes the dynamic permission check
- *
- * @param userId the user's userId
- * @param permission the raw permission string
- * @param context name/value pairs needed for permission lookup
- * @return true if the user has permission
- */
- public boolean hasPermission(String userId, String permission, Map<String, ? extends Object> context);
+ /**
+ * Processes the dynamic permission check
+ *
+ * @param userId the user's userId
+ * @param permission the raw permission string
+ * @param context name/value pairs needed for permission lookup
+ * @return true if the user has permission
+ */
+ public boolean hasPermission(String userId, String permission, Map<String, ? extends Object> context);

- /**
- * Returns the name of the permission this object handles
- * @return permission name
- */
- public String getPermissionName();
-
- /**
+ /**
+ * Returns the name of the permission this object handles
+ * @return permission name
+ */
+ public String getPermissionName();
+
+ /**
* Method for injecting the delegator object
*
* @param delegator the GenericDelegator object to use for the Authorization implementation

Modified: ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java Mon Aug 17 15:42:56 2009
@@ -110,7 +110,7 @@
while (i.hasNext()) {
GenericServiceCallback gsc = i.next();
if (gsc.isEnabled()) {
- gsc.receiveEvent(context,t );
+ gsc.receiveEvent(context,t);
} else {
i.remove();
}

Modified: ofbiz/branches/executioncontext20090812/framework/testtools/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/testtools/build.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/testtools/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/testtools/build.xml Mon Aug 17 15:42:56 2009
@@ -34,7 +34,7 @@
<fileset dir="../base/lib" includes="*.jar"/>
<fileset dir="../base/lib/scripting" includes="*.jar"/>
<fileset dir="../base/lib/commons" includes="*.jar"/>
- <fileset dir="../base/build/lib" includes="*.jar"/>
+ <fileset dir="../base/build/lib" includes="*.jar"/>
<fileset dir="../entity/lib" includes="*.jar"/>
<fileset dir="../entity/build/lib" includes="*.jar"/>
<fileset dir="../security/build/lib" includes="*.jar"/>
@@ -43,11 +43,11 @@
<fileset dir="../minilang/build/lib" includes="*.jar"/>
<fileset dir="../webapp/lib" includes="*.jar"/>
</path>
-
- <target name="init">
- <property name="lib.dir" value="lib"/>
- <property name="selenium.lib.dir" value="${lib.dir}"/>
- </target>
+
+ <target name="init">
+ <property name="lib.dir" value="lib"/>
+ <property name="selenium.lib.dir" value="${lib.dir}"/>
+ </target>



@@ -58,11 +58,11 @@
</target>

- <target name="install-seleniumxml" depends="init" description="Download the selenium files">
+ <target name="install-seleniumxml" depends="init" description="Download the selenium files">

- <get src="http://downloads.sourceforge.net/seleniumxml/selenium-server-1.0-SNAPSHOT-20081126.jar?use_mirror="
- dest="${selenium.lib.dir}/selenium-server.jar" usetimestamp="true" />
- </target>
+ <get src="http://downloads.sourceforge.net/seleniumxml/selenium-server-1.0-SNAPSHOT-20081126.jar?use_mirror="
+ dest="${selenium.lib.dir}/selenium-server.jar" usetimestamp="true" />
+ </target>




Modified: ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Mon Aug 17 15:42:56 2009
@@ -135,9 +135,9 @@
}
// check for default request
if (requestMap == null) {
- if (controllerConfig.defaultRequest != null) { // required! to avoid a null pointer exception and generate a requesthandler exception if default request not found.
- requestMap = controllerConfig.requestMapMap.get(controllerConfig.defaultRequest);
- }
+ if (controllerConfig.defaultRequest != null) { // required! to avoid a null pointer exception and generate a requesthandler exception if default request not found.
+ requestMap = controllerConfig.requestMapMap.get(controllerConfig.defaultRequest);
+ }
}
// still not found so stop
if (requestMap == null) {
@@ -503,7 +503,7 @@

// if the request has the save-last-view attribute set, save it now before the view can be rendered or other chain done so that the _LAST* session attributes will represent the previous request
if (nextRequestResponse.saveLastView) {
- // Debug.log("======save last view: " + session.getAttribute("_LAST_VIEW_NAME_"));
+ // Debug.log("======save last view: " + session.getAttribute("_LAST_VIEW_NAME_"));
String lastViewName = (String) session.getAttribute("_LAST_VIEW_NAME_");
// Do not save the view if the last view is the same as the current view and saveCurrentView is false
if (!(!nextRequestResponse.saveCurrentView && "view".equals(nextRequestResponse.type) && nextRequestResponse.value.equals(lastViewName))) {
@@ -740,18 +740,18 @@
req.getSession().setAttribute("_LAST_VIEW_PARAMS_", paramMap);

if ("SAVED".equals(saveName)) {
- //Debug.log("======save current view: " + view);
- req.getSession().setAttribute("_SAVED_VIEW_NAME_", view);
- req.getSession().setAttribute("_SAVED_VIEW_PARAMS_", paramMap);
+ //Debug.log("======save current view: " + view);
+ req.getSession().setAttribute("_SAVED_VIEW_NAME_", view);
+ req.getSession().setAttribute("_SAVED_VIEW_PARAMS_", paramMap);
}

if ("HOME".equals(saveName)) {
- //Debug.log("======save home view: " + view);
- req.getSession().setAttribute("_HOME_VIEW_NAME_", view);
- req.getSession().setAttribute("_HOME_VIEW_PARAMS_", paramMap);
- // clear other saved views
- req.getSession().removeAttribute("_SAVED_VIEW_NAME_");
- req.getSession().removeAttribute("_SAVED_VIEW_PARAMS_");
+ //Debug.log("======save home view: " + view);
+ req.getSession().setAttribute("_HOME_VIEW_NAME_", view);
+ req.getSession().setAttribute("_HOME_VIEW_PARAMS_", paramMap);
+ // clear other saved views
+ req.getSession().removeAttribute("_SAVED_VIEW_NAME_");
+ req.getSession().removeAttribute("_SAVED_VIEW_PARAMS_");
}

ConfigXMLReader.ViewMap viewMap = (view == null ? null : getControllerConfig().viewMapMap.get(view));

Modified: ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java Mon Aug 17 15:42:56 2009
@@ -90,13 +90,13 @@
Debug.logVerbose("Loading BSF Script at location: " + cacheName, module);
}
URL scriptUrl = FlexibleLocation.resolveLocation(cacheName);
- if (scriptUrl == null) {
- throw new EventHandlerException("BSF script not found at location [" + cacheName + "]");
- }
+ if (scriptUrl == null) {
+ throw new EventHandlerException("BSF script not found at location [" + cacheName + "]");
+ }
scriptStream = scriptUrl.openStream();
- scriptString = IOUtils.getStringFromReader(new InputStreamReader(scriptStream));
+ scriptString = IOUtils.getStringFromReader(new InputStreamReader(scriptStream));
scriptStream.close();
- eventCache.put(cacheName, scriptString);
+ eventCache.put(cacheName, scriptString);
}
}
}

Modified: ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/DojoJSONServiceEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/DojoJSONServiceEventHandler.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/DojoJSONServiceEventHandler.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/DojoJSONServiceEventHandler.java Mon Aug 17 15:42:56 2009
@@ -115,7 +115,7 @@
throw new EventHandlerException("JSON Object was empty; fatal error!");
}
String htmlJsonStr = "<html><head></head><body><textarea style=\"width: 350px; height: 100px;\">" + jsonStr + "</textarea></body></html>";
- Debug.logInfo( "htmlJsonStr:" + htmlJsonStr, module);
+ Debug.logInfo("htmlJsonStr:" + htmlJsonStr, module);
// set the X-JSON content type
response.setContentType("text/html");
// jsonStr.length is not reliable for unicode characters

Modified: ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java Mon Aug 17 15:42:56 2009
@@ -76,17 +76,17 @@

if (o instanceof NumberModel) {
NumberModel s = (NumberModel) o;
- return Double.valueOf( s.getAsNumber().doubleValue() );
+ return Double.valueOf(s.getAsNumber().doubleValue());
}
if (o instanceof SimpleNumber) {
SimpleNumber s = (SimpleNumber) o;
- return Double.valueOf( s.getAsNumber().doubleValue() );
+ return Double.valueOf(s.getAsNumber().doubleValue());
}
if (o instanceof SimpleScalar) {
SimpleScalar s = (SimpleScalar) o;
- return Double.valueOf( s.getAsString() );
+ return Double.valueOf(s.getAsString());
}
- return Double.valueOf( o.toString() );
+ return Double.valueOf(o.toString());
}
return Double.valueOf(0.00);
}

Modified: ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java Mon Aug 17 15:42:56 2009
@@ -103,7 +103,7 @@
}
if (o instanceof SimpleScalar) {
SimpleScalar s = (SimpleScalar) o;
- return Integer.valueOf( s.getAsString() );
+ return Integer.valueOf(s.getAsString());
}
return Integer.valueOf(o.toString());
}

Modified: ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java Mon Aug 17 15:42:56 2009
@@ -70,7 +70,7 @@
return out;

} catch (TransformerException e) {
- Debug.logError("FOP transform failed:" + e, module );
+ Debug.logError("FOP transform failed:" + e, module);
throw new GeneralException("Unable to transform FO to PDF", e);
}

Modified: ofbiz/branches/executioncontext20090812/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webtools/config/WebtoolsUiLabels.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/webtools/config/WebtoolsUiLabels.xml Mon Aug 17 15:42:56 2009
@@ -3157,7 +3157,6 @@
<value xml:lang="it">Dettaglio</value>
<value xml:lang="ro">Detaliu</value>
<value xml:lang="th">à¹à¸à¹à¸à¸³à¸¡à¸²à¸à¹à¸à¸´à¸à¹à¸</value>
- <value xml:lang="zh">Verbose</value>
<value xml:lang="zh">åé¿</value>
</property>
<property key="WebtoolsVerboseLogLevelTooltip">

Modified: ofbiz/branches/executioncontext20090812/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/branches/executioncontext20090812/framework/webtools/webapp/webtools/WEB-INF/controller.xml Mon Aug 17 15:42:56 2009
@@ -21,6 +21,7 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<include location="component://common/webcommon/WEB-INF/tempexpr-controller.xml"/>
<description>WebTools Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Mon Aug 17 15:42:56 2009
@@ -162,7 +162,7 @@
ModelForm modelForm = modelFormField.getModelForm();
String idName = modelFormField.getIdName();
if (UtilValidate.isNotEmpty(idName) && ("list".equals(modelForm.getType()) || "multi".equals(modelForm.getType()))) {
- idName += "_" + modelForm.getRowCount();
+ idName += "_" + modelForm.getRowCount();
}
String description = displayField.getDescription(context);
if (UtilValidate.isNotEmpty(description)) {
@@ -332,9 +332,9 @@
String className = "";
String alert = "false";
if (UtilValidate.isNotEmpty(modelFormField.getWidgetStyle())) {
- className = modelFormField.getWidgetStyle();
+ className = modelFormField.getWidgetStyle();
if (modelFormField.shouldBeRed(context)) {
- alert = "true";
+ alert = "true";
}
}

@@ -342,7 +342,7 @@
String textSize = Integer.toString(textField.getSize());
String maxlength = "";
if (textField.getMaxlength() != null) {
- maxlength = Integer.toString(textField.getMaxlength());
+ maxlength = Integer.toString(textField.getMaxlength());
}
String event = modelFormField.getEvent();
String action = modelFormField.getAction(context);
@@ -392,7 +392,7 @@

ModelFormField.SubHyperlink subHyperlink = textField.getSubHyperlink();
if (subHyperlink != null && subHyperlink.shouldUse(context)) {
- makeHyperlinkString(writer,subHyperlink,context);
+ makeHyperlinkString(writer,subHyperlink,context);
}
this.addAsterisks(writer, context, modelFormField);
this.appendTooltip(writer, context, modelFormField);
@@ -1848,7 +1848,7 @@

String name = modelFormField.getParameterName(context);
String value = modelFormField.getEntry(context, lookupField.getDefaultValue(context));
- if ( value == null) {
+ if (value == null) {
value = "";
}
String size = Integer.toString(lookupField.getSize());
@@ -1875,12 +1875,12 @@
List<String> targetParameterList = lookupField.getTargetParameterList();
targetParameterIter.append("[");
for (String targetParameter: targetParameterList) {
- if (targetParameterIter.length()>1) {
- targetParameterIter.append(",");
- }
- targetParameterIter.append("'");
- targetParameterIter.append(targetParameter);
- targetParameterIter.append("'");
+ if (targetParameterIter.length()>1) {
+ targetParameterIter.append(",");
+ }
+ targetParameterIter.append("'");
+ targetParameterIter.append(targetParameter);
+ targetParameterIter.append("'");
}
targetParameterIter.append("]");
this.appendContentUrl(imgSrc, "/images/fieldlookup.gif");
@@ -1939,7 +1939,7 @@
}

public void renderNextPrev(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
- boolean ajaxEnabled = false;
+ boolean ajaxEnabled = false;
List<ModelForm.UpdateArea> updateAreas = modelForm.getOnPaginateUpdateAreas();
String targetService = modelForm.getPaginateTarget(context);
if (this.javaScriptEnabled) {
@@ -2046,15 +2046,15 @@

if (viewIndex > 0) {
if (ajaxEnabled) {
- ajaxFirstUrl = createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + 0 + anchor, context);
+ ajaxFirstUrl = createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + 0 + anchor, context);
} else {
- linkText = prepLinkText + 0 + anchor;
+ linkText = prepLinkText + 0 + anchor;
firstUrl = rh.makeLink(this.request, this.response, urlPath + linkText);
}
}
if (viewIndex > 0) {
if (ajaxEnabled) {
- ajaxPreviousUrl = createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + (viewIndex - 1) + anchor, context);
+ ajaxPreviousUrl = createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + (viewIndex - 1) + anchor, context);
} else {
linkText = prepLinkText + (viewIndex - 1) + anchor;
previousUrl = rh.makeLink(this.request, this.response, urlPath + linkText);
@@ -2063,7 +2063,7 @@
// Page select dropdown
if (listSize > 0 && this.javaScriptEnabled) {
if (ajaxEnabled) {
- ajaxSelectUrl = createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + "' + this.value + '", context);
+ ajaxSelectUrl = createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + "' + this.value + '", context);
} else {
linkText = prepLinkText;
if (linkText.startsWith("/")) {
@@ -2076,7 +2076,7 @@
// Next button
if (highIndex < listSize) {
if (ajaxEnabled) {
- ajaxNextUrl = createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + (viewIndex + 1) + anchor, context);
+ ajaxNextUrl = createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + (viewIndex + 1) + anchor, context);
} else {
linkText = prepLinkText + (viewIndex + 1) + anchor;
nextUrl = rh.makeLink(this.request, this.response, urlPath + linkText);
@@ -2086,7 +2086,7 @@
// Last button
if (highIndex < listSize) {
if (ajaxEnabled) {
- ajaxLastUrl = createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + (listSize / viewSize) + anchor, context);
+ ajaxLastUrl = createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + (listSize / viewSize) + anchor, context);
} else {
linkText = prepLinkText + (listSize / viewSize) + anchor;
lastUrl = rh.makeLink(this.request, this.response, urlPath + linkText);
@@ -2209,7 +2209,7 @@
}

public void renderPasswordField(Appendable writer, Map<String, Object> context, PasswordField passwordField) throws IOException {
- ModelFormField modelFormField = passwordField.getModelFormField();
+ ModelFormField modelFormField = passwordField.getModelFormField();

String className = "";
String alert = "false";
@@ -2657,11 +2657,11 @@
public void addAsterisks(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException {
String requiredField = "false";
String requiredStyle = "";
- if (modelFormField.getRequiredField()) {
- requiredField = "true";
- requiredStyle = modelFormField.getRequiredFieldStyle();
+ if (modelFormField.getRequiredField()) {
+ requiredField = "true";
+ requiredStyle = modelFormField.getRequiredFieldStyle();
}
- StringWriter sr = new StringWriter();
+ StringWriter sr = new StringWriter();
sr.append("<@renderAsterisks ");
sr.append("requiredField=\"");
sr.append(requiredField);
@@ -2722,7 +2722,7 @@
}

if (UtilValidate.isNotEmpty(request.getAttribute("image"))) {
- imgSrc = request.getAttribute("image").toString();
+ imgSrc = request.getAttribute("image").toString();
}

StringWriter sr = new StringWriter();
@@ -2751,9 +2751,9 @@
public void makeHiddenFormLinkAnchor(Appendable writer, String linkStyle, String description, 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);
- String event = "";
- String action = "";
- String imgSrc = "";
+ String event = "";
+ String action = "";
+ String imgSrc = "";

if (UtilValidate.isNotEmpty(modelFormField.getEvent()) && UtilValidate.isNotEmpty(modelFormField.getAction(context))) {
event = modelFormField.getEvent();
@@ -2761,7 +2761,7 @@
}

if (UtilValidate.isNotEmpty(request.getAttribute("image"))) {
- imgSrc = request.getAttribute("image").toString();
+ imgSrc = request.getAttribute("image").toString();
}

StringWriter sr = new StringWriter();
@@ -2784,21 +2784,21 @@
}

public void makeHiddenFormLinkForm(Appendable writer, String target, String targetType, String targetWindow, List<WidgetWorker.Parameter> parameterList, ModelFormField modelFormField, HttpServletRequest request, HttpServletResponse response, Map<String, Object> context) throws IOException {
- StringBuilder actionUrl = new StringBuilder();
- WidgetWorker.buildHyperlinkUrl(actionUrl, target, targetType, null, null, false, false, true, request, response, context);
+ StringBuilder actionUrl = new StringBuilder();
+ WidgetWorker.buildHyperlinkUrl(actionUrl, target, targetType, null, null, false, false, true, request, response, context);
String name = WidgetWorker.makeLinkHiddenFormName(context, modelFormField);
- StringBuilder parameters = new StringBuilder();
- parameters.append("[");
+ StringBuilder parameters = new StringBuilder();
+ parameters.append("[");
for (WidgetWorker.Parameter parameter: parameterList) {
- if (parameters.length() > 1) {
- parameters.append(",");
+ if (parameters.length() > 1) {
+ parameters.append(",");
}
- parameters.append("{'name':'");
- parameters.append(parameter.getName());
- parameters.append("'");
- parameters.append(",'value':'");
- parameters.append(parameter.getValue(context));
- parameters.append("'}");
+ parameters.append("{'name':'");
+ parameters.append(parameter.getName());
+ parameters.append("'");
+ parameters.append(",'value':'");
+ parameters.append(parameter.getValue(context));
+ parameters.append("'}");
}
parameters.append("]");

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Mon Aug 17 15:42:56 2009
@@ -316,7 +316,7 @@
this.type = formElement.getAttribute("type");
}
if (this.target == null || formElement.hasAttribute("target")) {
- setTarget( formElement.getAttribute("target") );
+ setTarget(formElement.getAttribute("target"));
}
if (this.targetWindowExdr == null || formElement.hasAttribute("target-window")) {
setTargetWindow(formElement.getAttribute("target-window"));
@@ -935,7 +935,7 @@
}
currentFieldGroupName = currentFieldGroup.getId();

- if (lastFieldGroup != null ) {
+ if (lastFieldGroup != null) {
lastFieldGroupName = lastFieldGroup.getId();
if (!lastFieldGroupName.equals(currentFieldGroupName)) {
lastFieldGroup.renderEndString(writer, context, formStringRenderer);
@@ -2299,7 +2299,7 @@
return this.targetWindowExdr.expandString(context);
}

- public void setTargetWindow( String val ) {
+ public void setTargetWindow(String val) {
this.targetWindowExdr = FlexibleStringExpander.getInstance(val);
}

@@ -2737,7 +2737,7 @@
return this.id;
}

- public void setId( String id) {
+ public void setId(String id) {
this.id = id;
}

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Mon Aug 17 15:42:56 2009
@@ -879,7 +879,7 @@
* @return
*/
public boolean shouldBeRed(Map<String, Object> context) {
- // red-when ( never | before-now | after-now | by-name ) "by-name"
+ // red-when (never | before-now | after-now | by-name) "by-name"

String redCondition = this.redWhen;

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Mon Aug 17 15:42:56 2009
@@ -1286,7 +1286,7 @@
writer.append("\" ");

String formType = modelForm.getType();
- if (formType.equals("upload") ) {
+ if (formType.equals("upload")) {
writer.append(" enctype=\"multipart/form-data\"");
}

@@ -1813,7 +1813,7 @@
writer.append("_ic\" value=\"Y\"").append((ignCase ? " checked=\"checked\"" : "")).append("/>");
writer.append(ignoreCase);
} else {
- writer.append( "<input type=\"hidden\" name=\"");
+ writer.append("<input type=\"hidden\" name=\"");
writer.append(modelFormField.getParameterName(context));
writer.append("_ic\" value=\"").append((ignCase ? "Y" : "")).append("\"/>");
}
@@ -2354,7 +2354,7 @@
if (viewIndex > 0) {
writer.append("\"><a href=\"");
if (ajaxEnabled) {
- writer.append("javascript:ajaxUpdateAreas('").append(createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + 0 + anchor, context)).append( "')");
+ writer.append("javascript:ajaxUpdateAreas('").append(createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + 0 + anchor, context)).append("')");
} else {
linkText = prepLinkText + 0 + anchor;
appendOfbizUrl(writer, urlPath + linkText);
@@ -2792,7 +2792,7 @@
writer.append(" class=\"");
writer.append(leftStyle);
writer.append("\"");
- writer.append(">" );
+ writer.append(">");
}
writer.append(leftText);
if (UtilValidate.isNotEmpty(leftStyle)) {
@@ -2809,7 +2809,7 @@
writer.append(" class=\"");
writer.append(style);
writer.append("\"");
- writer.append(">" );
+ writer.append(">");
}
writer.append(text);
if (UtilValidate.isNotEmpty(style)) {
@@ -2826,7 +2826,7 @@
writer.append(" class=\"");
writer.append(rightStyle);
writer.append("\"");
- writer.append(">" );
+ writer.append(">");
}
writer.append(rightText);
if (UtilValidate.isNotEmpty(rightStyle)) {

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java Mon Aug 17 15:42:56 2009
@@ -185,12 +185,12 @@

public void setRequest(HttpServletRequest request) {
this.request = request;
- ((HtmlMenuRenderer)renderer).setRequest( request );
+ ((HtmlMenuRenderer)renderer).setRequest(request);
}

public void setResponse(HttpServletResponse response) {
this.response = response;
- ((HtmlMenuRenderer)renderer).setResponse( response );
+ ((HtmlMenuRenderer)renderer).setResponse(response);
}

public HttpServletRequest getRequest() {
@@ -201,7 +201,7 @@
return ((HtmlMenuRenderer)renderer).response;
}

- public static HtmlMenuWrapper getMenuWrapper(HttpServletRequest request, HttpServletResponse response, HttpSession session, String menuDefFile, String menuName, String menuWrapperClassName ) {
+ public static HtmlMenuWrapper getMenuWrapper(HttpServletRequest request, HttpServletResponse response, HttpSession session, String menuDefFile, String menuName, String menuWrapperClassName) {

HtmlMenuWrapper menuWrapper = null;

@@ -232,7 +232,7 @@
menuWrapper.setRequest(request);
menuWrapper.setResponse(response);
Map parameterMap = UtilHttp.getParameterMap(request);
- menuWrapper.setParameters( parameterMap);
+ menuWrapper.setParameters(parameterMap);

GenericValue userLogin = (GenericValue)session.getAttribute("userLogin");
menuWrapper.putInContext("userLogin", userLogin);

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java Mon Aug 17 15:42:56 2009
@@ -360,7 +360,7 @@
appendWhitespace(writer);
if (listSize > 0) {
writer.append("<li>");
- writer.append(Integer.toString(lowIndex + 1)).append(" - ").append(Integer.toString(lowIndex + actualPageSize )).append(" ").append(ofLabel).append(" ").append(Integer.toString(listSize));
+ writer.append(Integer.toString(lowIndex + 1)).append(" - ").append(Integer.toString(lowIndex + actualPageSize)).append(" ").append(ofLabel).append(" ").append(Integer.toString(listSize));
writer.append("</li>");
appendWhitespace(writer);
}
@@ -437,7 +437,7 @@
// open tag
String style = label.getStyle(context);
String id = label.getId(context);
- if (UtilValidate.isNotEmpty(style) || UtilValidate.isNotEmpty(id) ) {
+ if (UtilValidate.isNotEmpty(style) || UtilValidate.isNotEmpty(id)) {
writer.append("<span");

if (UtilValidate.isNotEmpty(id)) {

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java Mon Aug 17 15:42:56 2009
@@ -210,7 +210,7 @@
if (this.defaultPrivilegeEnumId == null || menuElement.hasAttribute("defaultPrivilegeEnumId"))
this.defaultPrivilegeEnumId = menuElement.getAttribute("default-privilege-enum-id");
if (this.defaultAssociatedContentId == null || menuElement.hasAttribute("defaultAssociatedContentId"))
- this.setDefaultAssociatedContentId( menuElement.getAttribute("default-associated-content-id"));
+ this.setDefaultAssociatedContentId(menuElement.getAttribute("default-associated-content-id"));
if (this.orientation == null || menuElement.hasAttribute("orientation"))
this.orientation = menuElement.getAttribute("orientation");
if (this.menuWidth == null || menuElement.hasAttribute("menu-width"))

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Mon Aug 17 15:42:56 2009
@@ -134,7 +134,7 @@
positionStr + "], using the default of the menu renderer", module);
}

- this.setAssociatedContentId( fieldElement.getAttribute("associated-content-id"));
+ this.setAssociatedContentId(fieldElement.getAttribute("associated-content-id"));
this.cellWidth = fieldElement.getAttribute("cell-width");

dataMap.put("name", this.name);
@@ -540,7 +540,7 @@
}

public String getCellWidth() {
- if (UtilValidate.isNotEmpty(this.cellWidth )) {
+ if (UtilValidate.isNotEmpty(this.cellWidth)) {
return this.cellWidth ;
} else {
return this.modelMenu.getDefaultCellWidth ();

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java Mon Aug 17 15:42:56 2009
@@ -111,12 +111,12 @@
return;
}
List theList = null;
- if (obj instanceof Map ) {
+ if (obj instanceof Map) {
Set entrySet = ((Map)obj).entrySet();
Object [] a = entrySet.toArray();
theList = Arrays.asList(a);
isEntrySet = true;
- } else if (obj instanceof List ) {
+ } else if (obj instanceof List) {
theList = (List)obj;
} else {
Debug.logError("Object not list or map type", module);

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Mon Aug 17 15:42:56 2009
@@ -281,7 +281,7 @@
}

public void renderImage(Appendable writer, Map<String, Object> context, ModelScreenWidget.Image image) throws IOException {
- if ( image == null)
+ if (image == null)
return ;
String src = image.getSrc(context);
String id = image.getId(context);

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Mon Aug 17 15:42:56 2009
@@ -1092,7 +1092,7 @@
}

if (UtilValidate.isNotEmpty(mimeTypeId)
- && ((mimeTypeId.indexOf("application") >= 0) || (mimeTypeId.indexOf("image")) >= 0) ) {
+ && ((mimeTypeId.indexOf("application") >= 0) || (mimeTypeId.indexOf("image")) >= 0)) {
screenStringRenderer.renderContentFrame(writer, context, this);
} else {
screenStringRenderer.renderContentBegin(writer, context, this);

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java Mon Aug 17 15:42:56 2009
@@ -233,7 +233,7 @@
initService(serviceElement);
}

- public void initService( Element serviceElement ) {
+ public void initService(Element serviceElement) {

this.serviceNameExdr = FlexibleStringExpander.getInstance(serviceElement.getAttribute("service-name"));
this.resultMapNameAcsr = FlexibleMapAccessor.getInstance(serviceElement.getAttribute("result-map"));
@@ -363,7 +363,7 @@

this.listName = UtilFormatOut.checkEmpty(entityAndElement.getAttribute("list"), entityAndElement.getAttribute("list-name"));
if (UtilValidate.isEmpty(this.listName)) this.listName = "_LIST_ITERATOR_";
- entityAndElement.setAttribute( "list-name", this.listName);
+ entityAndElement.setAttribute("list-name", this.listName);

finder = new ByAndFinder(entityAndElement);
}
@@ -403,7 +403,7 @@

this.listName = UtilFormatOut.checkEmpty(entityConditionElement.getAttribute("list"), entityConditionElement.getAttribute("list-name"));
if (UtilValidate.isEmpty(this.listName)) this.listName = "_LIST_ITERATOR_";
- entityConditionElement.setAttribute( "list-name", this.listName);
+ entityConditionElement.setAttribute("list-name", this.listName);

finder = new ByConditionFinder(entityConditionElement);
}

Modified: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/tree/TreeStringRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/tree/TreeStringRenderer.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/tree/TreeStringRenderer.java (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/tree/TreeStringRenderer.java Mon Aug 17 15:42:56 2009
@@ -34,5 +34,5 @@
public void renderLink(Appendable writer, Map<String, Object> context, ModelTree.ModelNode.Link link) throws IOException;
public void renderImage(Appendable writer, Map<String, Object> context, ModelTree.ModelNode.Image image) throws IOException;
public void renderLastElement(Appendable writer, Map<String, Object> context, ModelTree.ModelNode node) throws IOException;
- public ScreenStringRenderer getScreenStringRenderer( Map<String, Object> context);
+ public ScreenStringRenderer getScreenStringRenderer(Map<String, Object> context);
}

Modified: ofbiz/branches/executioncontext20090812/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/executioncontext20090812/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Aug 17 15:42:56 2009
@@ -146,7 +146,7 @@
<script type='text/javascript' language='JavaScript'><!--
disa = ' disabled';
if(other_choice(document.${formName}.${fieldName}))
- disa = '';
+ disa = '';
document.write("<input type='text' name='${otherFieldName}' value='${otherValue}' size='${otherFieldSize}'"+disa+" onfocus='check_choice(document.${formName}.${fieldName})' />");
if(disa && document.styleSheets)
document.${formName}.${fieldName}.style.visibility = 'hidden';
@@ -313,7 +313,7 @@

<#macro renderTextFindField name value defaultOption opEquals opBeginsWith opContains opIsEmpty opNotEqual className alert size maxlength autocomplete titleStyle hideIgnoreCase ignCase ignoreCase>
<#if opEquals?has_content>
-<select <#if name?has_content>name="${name}_op"</#if> class="selectBox"><#rt/>
+<select <#if name?has_content>name="${name}_op"</#if> class="selectBox"><#rt/>
<option value="equals"<#if defaultOption=="equals"> selected</#if>>${opEquals}</option><#rt/>
<option value="like"<#if defaultOption=="like"> selected</#if>>${opBeginsWith}</option><#rt/>
<option value="contains"<#if defaultOption=="contains"> selected</#if>>${opContains}</option><#rt/>
@@ -321,7 +321,7 @@
<option value="notEqual"<#if defaultOption=="notEqual"> selected</#if>>${opNotEqual}</option><#rt/>
</select>
<#else>
-<input type="hidden" name=<#if name?has_content> "${name}_op"</#if> value="${defaultOption}"/><#rt/>
+<input type="hidden" name=<#if name?has_content> "${name}_op"</#if> value="${defaultOption}"/><#rt/>
</#if>
<input type="text" <@renderClass className alert /> name="${name}"<#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
<#if titleStyle?has_content><span class="${titleStyle}" ><#rt/></#if>

Modified: ofbiz/branches/executioncontext20090812/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java (original)
+++ ofbiz/branches/executioncontext20090812/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java Mon Aug 17 15:42:56 2009
@@ -210,32 +210,32 @@
// create security group(s)
Timestamp now = UtilDateTime.nowTimestamp();
for (String securityGroup : user.getUserGroupMapper().getSecurityGroups()) {
- // check and make sure the security group exists
- GenericValue secGroup = null;
- try {
- secGroup = delegator.findOne("SecurityGroup", UtilMisc.toMap("groupId", securityGroup), true);
- } catch (GenericEntityException e) {
- Debug.logError(e, e.getMessage(), module);
- }
-
- // add it to the user if it exists
- if (secGroup != null) {
- Map<String, Serializable> createSecGrpMap = FastMap.newInstance();
- createSecGrpMap.put("userLoginId", user.getName());
- createSecGrpMap.put("groupId", securityGroup);
- createSecGrpMap.put("fromDate", now);
- createSecGrpMap.put("userLogin", system);
-
- Map<String, Object> createSecGrpResult;
- try {
- createSecGrpResult = dispatcher.runSync("addUserLoginToSecurityGroup", createSecGrpMap);
- } catch (GenericServiceException e) {
- throw new AuthenticatorException(e.getMessage(), e);
- }
- if (ServiceUtil.isError(createSecGrpResult)) {
- throw new AuthenticatorException(ServiceUtil.getErrorMessage(createSecGrpResult));
- }
- }
+ // check and make sure the security group exists
+ GenericValue secGroup = null;
+ try {
+ secGroup = delegator.findOne("SecurityGroup", UtilMisc.toMap("groupId", securityGroup), true);
+ } catch (GenericEntityException e) {
+ Debug.logError(e, e.getMessage(), module);
+ }
+
+ // add it to the user if it exists
+ if (secGroup != null) {
+ Map<String, Serializable> createSecGrpMap = FastMap.newInstance();
+ createSecGrpMap.put("userLoginId", user.getName());
+ createSecGrpMap.put("groupId", securityGroup);
+ createSecGrpMap.put("fromDate", now);
+ createSecGrpMap.put("userLogin", system);
+
+ Map<String, Object> createSecGrpResult;
+ try {
+ createSecGrpResult = dispatcher.runSync("addUserLoginToSecurityGroup", createSecGrpMap);
+ } catch (GenericServiceException e) {
+ throw new AuthenticatorException(e.getMessage(), e);
+ }
+ if (ServiceUtil.isError(createSecGrpResult)) {
+ throw new AuthenticatorException(ServiceUtil.getErrorMessage(createSecGrpResult));
+ }
+ }
}
}