You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2009/08/17 17:43:04 UTC
svn commit: r805012 [3/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/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementServices.java Mon Aug 17 15:42:56 2009
@@ -93,7 +93,7 @@
GenericValue view = null;
try {
- view = ContentWorker.getSubContentCache( delegator, contentId, mapKey, subContentId, userLogin, assocTypes, fromDate, Boolean.FALSE, null);
+ view = ContentWorker.getSubContentCache(delegator, contentId, mapKey, subContentId, userLogin, assocTypes, fromDate, Boolean.FALSE, null);
content = ContentWorker.getContentFromView(view);
} catch (GenericEntityException e) {
return ServiceUtil.returnError(e.toString());
@@ -117,7 +117,7 @@
GenericValue view = null;
try {
- view = ContentWorker.getContentCache( delegator, contentId);
+ view = ContentWorker.getContentCache(delegator, contentId);
} catch (GenericEntityException e) {
return ServiceUtil.returnError(e.toString());
}
@@ -189,7 +189,7 @@
List tmpPurposes = StringUtil.split(contentPurposeString, "|");
contentPurposeList.addAll(tmpPurposes);
}
- if (contentPurposeList != null ) {
+ if (contentPurposeList != null) {
context.put("contentPurposeList", contentPurposeList);
context.put("contentPurposeString", null);
}
@@ -260,7 +260,7 @@
boolean dataResourceExists = true;
if (Debug.infoOn()) Debug.logInfo("in persist... dataResourceTypeId(0):" + dataResourceTypeId, null);
- if (UtilValidate.isNotEmpty(dataResourceTypeId) ) {
+ if (UtilValidate.isNotEmpty(dataResourceTypeId)) {
Map dataResourceResult = FastMap.newInstance();
try {
dataResourceResult = persistDataResourceAndDataMethod(dctx, context);
@@ -290,7 +290,7 @@
context.put("skipPermissionCheck", null); // Force check here
boolean contentExists = true;
if (Debug.infoOn()) Debug.logInfo("in persist... contentTypeId:" + contentTypeId + " dataResourceTypeId:" + dataResourceTypeId + " contentId:" + contentId + " dataResourceId:" + dataResourceId, null);
- if (UtilValidate.isNotEmpty(contentTypeId) ) {
+ if (UtilValidate.isNotEmpty(contentTypeId)) {
if (UtilValidate.isEmpty(contentId)) {
contentExists = false;
} else {
@@ -350,7 +350,7 @@
String contentPurposeTypeId = (String)iter.next();
GenericValue contentPurpose = delegator.makeValue("ContentPurpose",
UtilMisc.toMap("contentId", contentId,
- "contentPurposeTypeId", contentPurposeTypeId) );
+ "contentPurposeTypeId", contentPurposeTypeId));
contentPurpose.create();
}
}
@@ -370,7 +370,7 @@
Map r = ContentServices.updateContentMethod(dctx, map);
boolean isError = ModelService.RESPOND_ERROR.equals(r.get(ModelService.RESPONSE_MESSAGE));
if (isError)
- return ServiceUtil.returnError( (String)r.get(ModelService.ERROR_MESSAGE));
+ return ServiceUtil.returnError((String)r.get(ModelService.ERROR_MESSAGE));
}
}
@@ -474,7 +474,7 @@
try {
siteRoles = delegator.findByAndCache("RoleType", UtilMisc.toMap("parentTypeId", "BLOG"));
} catch (GenericEntityException e) {
- return ServiceUtil.returnError( e.toString());
+ return ServiceUtil.returnError(e.toString());
}
Iterator siteRoleIter = siteRoles.iterator();
@@ -498,7 +498,7 @@
if (siteRoleVal != null && siteRoleVal.equalsIgnoreCase("Y")) {
// for now, will assume that any error is due to duplicates - ignore
//return ServiceUtil.returnError(e.toString());
- if (fromDate == null ) {
+ if (fromDate == null) {
try {
Map newContext = FastMap.newInstance();
newContext.put("contentId", serviceContext.get("contentId"));
@@ -515,14 +515,14 @@
//addRoleToUser(delegator, dispatcher, serviceContext);
} catch (GenericServiceException e) {
Debug.logError(e, e.toString(), module);
- return ServiceUtil.returnError( e.toString());
+ return ServiceUtil.returnError(e.toString());
} catch (Exception e2) {
Debug.logError(e2, e2.toString(), module);
- return ServiceUtil.returnError( e2.toString());
+ return ServiceUtil.returnError(e2.toString());
}
}
} else {
- if (fromDate != null ) {
+ if (fromDate != null) {
// for now, will assume that any error is due to non-existence - ignore
//return ServiceUtil.returnError(e.toString());
try {
@@ -541,10 +541,10 @@
return ServiceUtil.returnError(errMsg);
} catch (GenericServiceException e) {
Debug.logError(e, e.toString(), module);
- return ServiceUtil.returnError( e.toString());
+ return ServiceUtil.returnError(e.toString());
} catch (Exception e2) {
Debug.logError(e2, e2.toString(), module);
- return ServiceUtil.returnError( e2.toString());
+ return ServiceUtil.returnError(e2.toString());
}
}
}
@@ -649,7 +649,7 @@
dataResource = (GenericValue)thisResult.get("dataResource");
Map fileContext = FastMap.newInstance();
fileContext.put("userLogin", userLogin);
- if ( dataResourceTypeId.indexOf("_FILE") >=0) {
+ if (dataResourceTypeId.indexOf("_FILE") >=0) {
boolean hasData = false;
if (textData != null) {
fileContext.put("textData", textData);
@@ -797,7 +797,7 @@
try {
siteRoles = delegator.findByAndCache("RoleType", UtilMisc.toMap("parentTypeId", "BLOG"));
} catch (GenericEntityException e) {
- return ServiceUtil.returnError( e.toString());
+ return ServiceUtil.returnError(e.toString());
}
Iterator siteRoleIter = siteRoles.iterator();
while (siteRoleIter.hasNext()) {
@@ -812,7 +812,7 @@
if (siteRoleVal != null && siteRoleVal.equalsIgnoreCase("Y")) {
// for now, will assume that any error is due to duplicates - ignore
//return ServiceUtil.returnError(e.toString());
- if (fromDate == null ) {
+ if (fromDate == null) {
try {
serviceContext.put("fromDate", UtilDateTime.nowTimestamp());
if (Debug.infoOn()) Debug.logInfo("updateSiteRoles, serviceContext(1):" + serviceContext, module);
@@ -825,7 +825,7 @@
}
}
} else {
- if (fromDate != null ) {
+ if (fromDate != null) {
// for now, will assume that any error is due to non-existence - ignore
//return ServiceUtil.returnError(e.toString());
try {
@@ -910,7 +910,7 @@
if (UtilValidate.isNotEmpty(contentAssocTypeId)) typeList.add(contentAssocTypeId);
if (UtilValidate.isEmpty(typeList)) typeList = UtilMisc.toList("PUBLISH_LINK", "SUB_CONTENT");
EntityCondition conditionType = EntityCondition.makeCondition("contentAssocTypeId", EntityOperator.IN, typeList);
- EntityCondition conditionMain = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("contentIdTo", EntityOperator.EQUALS, contentIdTo), conditionType), EntityOperator.AND);
+ EntityCondition conditionMain = EntityCondition.makeCondition(UtilMisc.toList(EntityCondition.makeCondition("contentIdTo", EntityOperator.EQUALS, contentIdTo), conditionType), EntityOperator.AND);
try {
List listAll = delegator.findList("ContentAssoc", conditionMain, null, UtilMisc.toList("sequenceNum", "fromDate", "createdDate"), null, false);
List listFiltered = EntityUtil.filterByDate(listAll);
@@ -1081,7 +1081,7 @@
}
EntityCondition conditionType = EntityCondition.makeCondition("contentAssocTypeId", EntityOperator.IN, typeList);
- EntityCondition conditionMain = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("contentId", EntityOperator.EQUALS, thisContentId), conditionType), EntityOperator.AND);
+ EntityCondition conditionMain = EntityCondition.makeCondition(UtilMisc.toList(EntityCondition.makeCondition("contentId", EntityOperator.EQUALS, thisContentId), conditionType), EntityOperator.AND);
List listAll = delegator.findByConditionCache("ContentAssoc", conditionMain, null, null);
List listFiltered = EntityUtil.filterByDate(listAll);
Iterator iter = listFiltered.iterator();
@@ -1590,7 +1590,7 @@
GenericValue orderHeader = null;
try {
List orderRoleList = delegator.findByAnd("OrderRole", UtilMisc.toMap("orderId", orderId, "roleTypeId", "END_USER_CUSTOMER"));
- if (orderRoleList.size() > 0 ) {
+ if (orderRoleList.size() > 0) {
GenericValue orderRole = (GenericValue)orderRoleList.get(0);
String partyId = (String) orderRole.get("partyId");
context.put("partyId", partyId);
@@ -1667,7 +1667,7 @@
Map result = null;
String contentId = content.getString("contentId");
- List contentAssocTypeIdList = (List)context.get("contentAssocTypeIdList" );
+ List contentAssocTypeIdList = (List)context.get("contentAssocTypeIdList");
Set visitedSet = (Set)context.get("visitedSet");
if (visitedSet == null) {
visitedSet = FastSet.newInstance();
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Mon Aug 17 15:42:56 2009
@@ -64,12 +64,12 @@
public static Map cachedWebSitePublishPoints = FastMap.newInstance();
public static Map cachedStaticValues = FastMap.newInstance();
- public static void mruAdd(HttpServletRequest request, GenericEntity pk, String suffix ) {
+ public static void mruAdd(HttpServletRequest request, GenericEntity pk, String suffix) {
HttpSession session = request.getSession();
mruAdd(session, pk);
}
- public static void mruAdd(HttpServletRequest request, GenericEntity pk ) {
+ public static void mruAdd(HttpServletRequest request, GenericEntity pk) {
HttpSession session = request.getSession();
mruAdd(session, pk);
}
@@ -85,7 +85,7 @@
}
String entityName = pk.getEntityName();
- mruAddByEntityName( entityName, pk, lookupCaches);
+ mruAddByEntityName(entityName, pk, lookupCaches);
}
/**
@@ -129,7 +129,7 @@
* @param pk either a populated GenericValue or GenericPK.
* @param suffix a string that can be used to distinguish the signature (probably not used).
*/
- public static String buildPKSig( GenericEntity pk, String suffix ) {
+ public static String buildPKSig(GenericEntity pk, String suffix) {
String sig = "";
Collection keyColl = pk.getPrimaryKey().getAllKeys();
@@ -229,7 +229,7 @@
GenericPK cachedPK = null;
if (UtilValidate.isNotEmpty(entityName))
cachedPK = (GenericPK)currentEntityMap.get(entityName);
- getCurrentValueWithCachedPK( request, delegator, cachedPK, entityName);
+ getCurrentValueWithCachedPK(request, delegator, cachedPK, entityName);
GenericPK currentPK = (GenericPK)request.getAttribute("currentPK");
currentEntityMap.put(entityName, currentPK);
}
@@ -258,7 +258,7 @@
// whether or not a field is populated.
boolean useCached = false;
boolean usePassed = true;
- if (cachedPK != null ) {
+ if (cachedPK != null) {
useCached = true;
keyColl = cachedPK.getPrimaryKey().getAllKeys();
keyIt = keyColl.iterator();
@@ -383,9 +383,9 @@
return allPublishPoints;
}
- public static Map getPublishPointMap(GenericDelegator delegator, String pubPtId ) throws GeneralException {
+ public static Map getPublishPointMap(GenericDelegator delegator, String pubPtId) throws GeneralException {
- List publishPointList = getAllPublishPoints( delegator, pubPtId );
+ List publishPointList = getAllPublishPoints(delegator, pubPtId);
Map publishPointMap = FastMap.newInstance();
Iterator it = publishPointList.iterator();
while (it.hasNext()) {
@@ -397,9 +397,9 @@
}
- public static void getAllPublishPointMap(GenericDelegator delegator, String pubPtId, Map publishPointMap ) throws GeneralException {
+ public static void getAllPublishPointMap(GenericDelegator delegator, String pubPtId, Map publishPointMap) throws GeneralException {
- List publishPointList = getAllPublishPoints( delegator, pubPtId );
+ List publishPointList = getAllPublishPoints(delegator, pubPtId);
Iterator it = publishPointList.iterator();
while (it.hasNext()) {
GenericValue webSitePublishPoint = (GenericValue)it.next();
@@ -409,7 +409,7 @@
}
}
- public static Map getPublishPointMap(GenericDelegator delegator, List publishPointList ) {
+ public static Map getPublishPointMap(GenericDelegator delegator, List publishPointList) {
Map publishPointMap = FastMap.newInstance();
Iterator it = publishPointList.iterator();
@@ -558,9 +558,9 @@
// Set up one map with all the top-level publish points (to which only one sub point can be attached to)
// and another map (publishPointMapAll) that points to one of the top-level points.
- List allPublishPointList = getAllPublishPoints( delegator, rootPubId );
+ List allPublishPointList = getAllPublishPoints(delegator, rootPubId);
//if (Debug.infoOn()) Debug.logInfo("in getPublishLinks, allPublishPointList:" + allPublishPointList, module);
- List publishPointList = getPermittedPublishPoints( delegator, allPublishPointList, userLogin, security , permittedAction, permittedOperations, passedRoles );
+ List publishPointList = getPermittedPublishPoints(delegator, allPublishPointList, userLogin, security , permittedAction, permittedOperations, passedRoles);
Map publishPointMap = FastMap.newInstance();
Map publishPointMapAll = FastMap.newInstance();
Iterator it = publishPointList.iterator();
@@ -576,7 +576,7 @@
Object [] subArr = {contentId, subPointList, description, nullObj};
publishPointMap.put(contentId, subArr);
publishPointMapAll.put(contentId, contentId);
- List subPublishPointList = getAllPublishPoints( delegator, contentId );
+ List subPublishPointList = getAllPublishPoints(delegator, contentId);
Iterator it2 = subPublishPointList.iterator();
while (it2.hasNext()) {
//String [] arr2 = (String [])it2.next();
@@ -742,9 +742,9 @@
throw new RuntimeException("No entity found for id=" + contentId);
EntityCondition conditionMain = null;
- if (typeList.size() > 0 ) {
+ if (typeList.size() > 0) {
EntityCondition conditionType = EntityCondition.makeCondition("contentAssocTypeId", EntityOperator.IN, typeList);
- conditionMain = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("contentIdTo", EntityOperator.EQUALS, contentId), conditionType), EntityOperator.AND);
+ conditionMain = EntityCondition.makeCondition(UtilMisc.toList(EntityCondition.makeCondition("contentIdTo", EntityOperator.EQUALS, contentId), conditionType), EntityOperator.AND);
} else {
conditionMain = EntityCondition.makeCondition("contentIdTo", EntityOperator.EQUALS, contentId);
}
@@ -773,7 +773,7 @@
throw new RuntimeException("No entity found for id=" + contentId);
EntityCondition conditionType = EntityCondition.makeCondition("contentAssocTypeId", EntityOperator.IN, typeList);
- EntityCondition conditionMain = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("contentId", EntityOperator.EQUALS, contentId), conditionType), EntityOperator.AND);
+ EntityCondition conditionMain = EntityCondition.makeCondition(UtilMisc.toList(EntityCondition.makeCondition("contentId", EntityOperator.EQUALS, contentId), conditionType), EntityOperator.AND);
List listAll = delegator.findList("ContentAssoc", conditionMain, null, null, null, true);
List listFiltered = EntityUtil.filterByDate(listAll);
Iterator iter = listFiltered.iterator();
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ConvertTree.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ConvertTree.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ConvertTree.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ConvertTree.java Mon Aug 17 15:42:56 2009
@@ -74,7 +74,7 @@
BufferedReader input = null;
try {
if (!UtilValidate.isEmpty(file)) {
- input = new BufferedReader( new FileReader(file));
+ input = new BufferedReader(new FileReader(file));
String line = null;
int size=0;
if (file != null) {
@@ -115,7 +115,7 @@
contentAssoc.put("userLogin", userLogin);
dispatcher.runSync("createContentAssoc", contentAssoc);
int recordCount = 0;
- while (( line = input.readLine()) != null) {//start line
+ while ((line = input.readLine()) != null) {//start line
boolean hasFolder=true;
String
rootContent=null,
@@ -173,7 +173,7 @@
contentAssocSize=contentAssocs.size();
}
- if ( contentAssocSize == 0 && contentNameMatch==false) {//New Root Content
+ if (contentAssocSize == 0 && contentNameMatch==false) {//New Root Content
Entity = null;
contentId = delegator.getNextSeqId("Content");
Entity = delegator.makeValue("Content");
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java Mon Aug 17 15:42:56 2009
@@ -193,12 +193,12 @@
results.put("permissionStatus", "granted");
permissionStatus = "granted";
if (displayPassCond) {
- errBuf.append("\n hasEntityPermission(" + entityAction + "): PASSED" );
+ errBuf.append("\n hasEntityPermission(" + entityAction + "): PASSED");
}
} else {
if (displayFailCond) {
- errBuf.append("\n hasEntityPermission(" + entityAction + "): FAILED" );
+ errBuf.append("\n hasEntityPermission(" + entityAction + "): FAILED");
}
if (content != null)
@@ -219,7 +219,7 @@
ServiceUtil.returnError(e.getMessage());
}
permissionStatus = (String)results.get("permissionStatus");
- errBuf.append("\n permissionStatus:" );
+ errBuf.append("\n permissionStatus:");
errBuf.append(permissionStatus);
}
@@ -228,24 +228,24 @@
// Don't show this if passed on 'hasEntityPermission'
if (displayFailCond || displayPassCond) {
if (!passed) {
- errBuf.append("\n targetOperations:" );
+ errBuf.append("\n targetOperations:");
errBuf.append(targetOperations);
String errMsg = permCondGetter.dumpAsText();
- errBuf.append("\n" );
+ errBuf.append("\n");
errBuf.append(errMsg);
- errBuf.append("\n partyId:" );
+ errBuf.append("\n partyId:");
errBuf.append(partyId);
- errBuf.append("\n entityIds:" );
+ errBuf.append("\n entityIds:");
errBuf.append(entityIds);
if (auxGetter != null) {
- errBuf.append("\n auxList:" );
+ errBuf.append("\n auxList:");
errBuf.append(auxGetter.getList());
}
if (roleGetter != null) {
- errBuf.append("\n roleList:" );
+ errBuf.append("\n roleList:");
errBuf.append(roleGetter.getList());
}
}
@@ -275,8 +275,8 @@
GenericValue contentTo = null;
GenericValue contentFrom = null;
try {
- contentTo = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", contentIdTo) );
- contentFrom = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", contentIdFrom) );
+ contentTo = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", contentIdTo));
+ contentFrom = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", contentIdFrom));
} catch (GenericEntityException e) {
return ServiceUtil.returnError("Error in retrieving content To or From. " + e.getMessage());
}
@@ -310,7 +310,7 @@
Debug.logError(e, "Problem checking permissions", "ContentServices");
}
permissionStatus = (String)permResults.get("permissionStatus");
- if (permissionStatus == null || !permissionStatus.equals("granted") ) {
+ if (permissionStatus == null || !permissionStatus.equals("granted")) {
if (bDisplayFailCond != null && bDisplayFailCond.booleanValue()) {
String errMsg = (String)permResults.get(ModelService.ERROR_MESSAGE);
results.put(ModelService.ERROR_MESSAGE, errMsg);
@@ -326,7 +326,7 @@
Debug.logError(e, "Problem checking permissions", "ContentServices");
}
permissionStatus = (String)permResults.get("permissionStatus");
- if (permissionStatus != null && permissionStatus.equals("granted") ) {
+ if (permissionStatus != null && permissionStatus.equals("granted")) {
results.put("permissionStatus", "granted");
} else {
if (bDisplayFailCond != null && bDisplayFailCond.booleanValue()) {
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentServices.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentServices.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentServices.java Mon Aug 17 15:42:56 2009
@@ -139,8 +139,8 @@
try {
Map thisResults = dispatcher.runSync("traverseContent", traversMap);
String errorMsg = ServiceUtil.getErrorMessage(thisResults);
- if (UtilValidate.isNotEmpty(errorMsg) ) {
- Debug.logError( "Problem in traverseContent. " + errorMsg, module);
+ if (UtilValidate.isNotEmpty(errorMsg)) {
+ Debug.logError("Problem in traverseContent. " + errorMsg, module);
return ServiceUtil.returnError(errorMsg);
}
Map nodeMap = (Map)thisResults.get("nodeMap");
@@ -996,8 +996,8 @@
if (!isPublished) {
//Map thisResults = dispatcher.runSync("deactivateAssocs", mapIn);
//String errorMsg = ServiceUtil.getErrorMessage(thisResults);
- //if (UtilValidate.isNotEmpty(errorMsg) ) {
- //Debug.logError( "Problem running deactivateAssocs. " + errorMsg, "ContentServices");
+ //if (UtilValidate.isNotEmpty(errorMsg)) {
+ //Debug.logError("Problem running deactivateAssocs. " + errorMsg, "ContentServices");
//return ServiceUtil.returnError(errorMsg);
//}
content.put("privilegeEnumId", privilegeEnumId);
@@ -1113,7 +1113,7 @@
Map.Entry entry = (Map.Entry)iter.next();
String key = (String)entry.getKey();
Object value = entry.getValue();
- if (value instanceof String ) {
+ if (value instanceof String) {
if (UtilValidate.isNotEmpty((String)value)) {
mapFiltered.put(key, value);
}
@@ -1122,7 +1122,7 @@
}
}
String outputString = UtilHttp.urlEncodeArgs(mapFiltered);
- result.put("outputString", outputString );
+ result.put("outputString", outputString);
}
return result;
}
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentWorker.java Mon Aug 17 15:42:56 2009
@@ -477,7 +477,7 @@
GenericValue assocValue = (GenericValue) it.next();
contentAssocTypeId = (String) assocValue.get("contentAssocTypeId");
assocContext.put("contentAssocTypeId", contentAssocTypeId);
- //assocContext.put("contentTypeId", assocValue.get("contentTypeId") );
+ //assocContext.put("contentTypeId", assocValue.get("contentTypeId"));
assocContext.put("parentContent", content);
String assocRelation = null;
// This needs to be the opposite
@@ -956,7 +956,7 @@
GenericValue contentTo = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", contentIdOther));
String contentTypeId = contentTo.getString("contentTypeId");
if (contentTypeId != null && contentTypeId.equals(passedContentTypeId))
- contentAncestorList.add(contentIdOther );
+ contentAncestorList.add(contentIdOther);
}
}
}
@@ -1172,13 +1172,13 @@
if (UtilValidate.isNotEmpty(subContentId)) {
ctx.put("subContentId", subContentId);
ctx.put("contentId", null);
- if (viewContentId != null && viewContentId.equals(subContentId) ) {
+ if (viewContentId != null && viewContentId.equals(subContentId)) {
return currentContent;
}
} else {
ctx.put("contentId", contentId);
ctx.put("subContentId", null);
- if (viewContentId != null && viewContentId.equals(contentId) ) {
+ if (viewContentId != null && viewContentId.equals(contentId)) {
return currentContent;
}
}
@@ -1311,7 +1311,7 @@
List targetOperationList = (List)context.get("targetOperationList");
String targetOperationString = (String)context.get("targetOperationString");
if (Debug.infoOn()) Debug.logInfo("in prepTargetOperationList, targetOperationString(0):" + targetOperationString, "");
- if (UtilValidate.isNotEmpty(targetOperationString) ) {
+ if (UtilValidate.isNotEmpty(targetOperationString)) {
List opsFromString = StringUtil.split(targetOperationString, "|");
if (UtilValidate.isEmpty(targetOperationList)) {
targetOperationList = FastList.newInstance();
@@ -1339,7 +1339,7 @@
List contentPurposeList = (List)context.get("contentPurposeList");
String contentPurposeString = (String)context.get("contentPurposeString");
if (Debug.infoOn()) Debug.logInfo("in prepContentPurposeList, contentPurposeString(0):" + contentPurposeString, "");
- if (UtilValidate.isNotEmpty(contentPurposeString) ) {
+ if (UtilValidate.isNotEmpty(contentPurposeString)) {
List purposesFromString = StringUtil.split(contentPurposeString, "|");
if (UtilValidate.isEmpty(contentPurposeList)) {
contentPurposeList = FastList.newInstance();
@@ -1408,7 +1408,7 @@
List filteredList = getContentAssocViewList(delegator, contentIdTo, contentId, contentAssocTypeId, statusId, privilegeEnumId);
GenericValue val = null;
- if (filteredList.size() > 0 ) {
+ if (filteredList.size() > 0) {
val = (GenericValue)filteredList.get(0);
}
return val;
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java Mon Aug 17 15:42:56 2009
@@ -261,7 +261,7 @@
//public static final String [] opFields = { "contentPurposeTypeId", "contentOperationId", "roleTypeId", "statusId", "privilegeEnumId"};
- public String renderResultRowHtml(Map rMap, Map currentContentResultMap ) {
+ public String renderResultRowHtml(Map rMap, Map currentContentResultMap) {
StringBuilder sb = new StringBuilder();
// Do target row
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java Mon Aug 17 15:42:56 2009
@@ -119,11 +119,11 @@
TransactionUtil.begin();
List contentPurposeList = ContentWorker.prepContentPurposeList(passedParams);
- passedParams.put("contentPurposeList", contentPurposeList );
+ passedParams.put("contentPurposeList", contentPurposeList);
String entityOperation = (String)passedParams.get("entityOperation");
String passedContentId = (String)passedParams.get("ftlContentId");
List targetOperationList = ContentWorker.prepTargetOperationList(passedParams, entityOperation);
- passedParams.put("targetOperationList", targetOperationList );
+ passedParams.put("targetOperationList", targetOperationList);
// Create or update FTL template
Map ftlContext = FastMap.newInstance();
ftlContext.put("userLogin", userLogin);
@@ -155,13 +155,13 @@
return "error";
}
String ftlContentId = (String)ftlResults.get("contentId");
- if (UtilValidate.isNotEmpty(contentIdTo) ) {
+ if (UtilValidate.isNotEmpty(contentIdTo)) {
Map map = FastMap.newInstance();
map.put("fromDate", UtilDateTime.nowTimestamp());
map.put("contentId", ftlContentId);
map.put("contentIdTo", contentIdTo);
map.put("userLogin", userLogin);
- if (UtilValidate.isEmpty(contentAssocTypeId) && UtilValidate.isEmpty(passedContentId) && UtilValidate.isNotEmpty(contentIdTo) ) {
+ if (UtilValidate.isEmpty(contentAssocTypeId) && UtilValidate.isEmpty(passedContentId) && UtilValidate.isNotEmpty(contentIdTo)) {
// switch the association order because we are really not linking to the forum
// but showing that this content is released to that forum.
map.put("contentIdTo", ftlContentId);
@@ -170,7 +170,7 @@
} else if (contentAssocTypeId.equals("PUBLISH_LINK")) {
map.put("contentAssocTypeId", "PUBLISH_LINK");
String publishOperation = (String)passedParams.get("publishOperation");
- if (UtilValidate.isEmpty(publishOperation) ) {
+ if (UtilValidate.isEmpty(publishOperation)) {
publishOperation = "CONTENT_PUBLISH";
}
map.put("targetOperationList", StringUtil.split(publishOperation, "|"));
@@ -197,7 +197,7 @@
if (Debug.infoOn()) Debug.logInfo("[UploadContentAndImage]ftlContentId:" + ftlContentId, module);
//if (Debug.infoOn()) Debug.logInfo("[UploadContentAndImage]ftlDataResourceId:" + ftlDataResourceId, module);
// Create or update summary text subContent
- if ( passedParams.containsKey("summaryData") ) {
+ if (passedParams.containsKey("summaryData")) {
Map sumContext = FastMap.newInstance();
sumContext.put("userLogin", userLogin);
sumContext.put("contentId", passedParams.get("sumContentId"));
@@ -227,7 +227,7 @@
}
// Create or update electronic text subContent
- if ( passedParams.containsKey("textData") ) {
+ if (passedParams.containsKey("textData")) {
Map txtContext = FastMap.newInstance();
txtContext.put("userLogin", userLogin);
txtContext.put("contentId", passedParams.get("txtContentId"));
@@ -324,7 +324,7 @@
request.setAttribute("passedParams", passedParams);
//if (Debug.infoOn()) Debug.logInfo("[UploadContentAndImage]newTrail: " + newTrail, module);
TransactionUtil.commit();
- } catch ( Exception e) {
+ } catch (Exception e) {
Debug.logError(e, "[UploadContentAndImage] " , module);
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
try {
@@ -410,7 +410,7 @@
}
}
TransactionUtil.commit();
- } catch ( Exception e) {
+ } catch (Exception e) {
Debug.logError(e, "[UploadContentAndImage] " , module);
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
try {
@@ -448,7 +448,7 @@
ftlContext.put("userLogin", userLogin);
Object objSequenceNum = passedParams.get("caSequenceNum");
- if (objSequenceNum != null ) {
+ if (objSequenceNum != null) {
if (objSequenceNum instanceof String) {
Long sequenceNum = null;
try {
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataEvents.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataEvents.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataEvents.java Mon Aug 17 15:42:56 2009
@@ -353,13 +353,13 @@
//ContentManagementWorker.mruAdd(session, pk);
String returnStr = "success";
- if (mode.equals("CREATE") ) {
+ if (mode.equals("CREATE")) {
// Set up return message to guide selection of follow on view
- request.setAttribute("dataResourceId", result.get("dataResourceId") );
+ request.setAttribute("dataResourceId", result.get("dataResourceId"));
String dataResourceTypeId = (String)serviceInMap.get("dataResourceTypeId");
if (dataResourceTypeId != null) {
if (dataResourceTypeId.equals("ELECTRONIC_TEXT")
- || dataResourceTypeId.equals("IMAGE_OBJECT") ) {
+ || dataResourceTypeId.equals("IMAGE_OBJECT")) {
returnStr = dataResourceTypeId;
}
}
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataServices.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataServices.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataServices.java Mon Aug 17 15:42:56 2009
@@ -101,7 +101,7 @@
String dataTemplateTypeId = (String) context.get("dataTemplateTypeId");
if (UtilValidate.isEmpty(dataTemplateTypeId)) {
dataTemplateTypeId = "NONE";
- context.put("dataTemplateTypeId", dataTemplateTypeId );
+ context.put("dataTemplateTypeId", dataTemplateTypeId);
}
// If textData exists, then create DataResource and return dataResourceId
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java Mon Aug 17 15:42:56 2009
@@ -165,7 +165,7 @@
} catch (GenericEntityException e3) {
request.setAttribute("_ERROR_MESSAGE_", e3.getMessage());
return "error";
- } catch ( GenericServiceException e) {
+ } catch (GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -269,7 +269,7 @@
GenericValue dataResourceContentView = (GenericValue)lst.get(0);
contentId = (String)dataResourceContentView.get("coContentId");
}
- } catch ( GenericEntityException e) {
+ } catch (GenericEntityException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -300,7 +300,7 @@
//Debug.logVerbose("in replaceSubContent, context2:" + context2, module);
Map result2 = dispatcher.runSync("deactivateAssocs", context2);
- } catch ( GenericServiceException e) {
+ } catch (GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -523,7 +523,7 @@
//Debug.logVerbose("in replaceSubContent, context2:" + context2, module);
Map result2 = dispatcher.runSync("deactivateAssocs", context2);
- } catch ( GenericServiceException e) {
+ } catch (GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -595,7 +595,7 @@
//Debug.logVerbose("in replaceSubContent, context2:" + context2, module);
Map result2 = dispatcher.runSync("deactivateAssocs", context2);
*/
- } catch ( GenericServiceException e) {
+ } catch (GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -608,7 +608,7 @@
String entityName = (String)paramMap.get("entityName");
Locale locale = UtilHttp.getLocale(request);
- if (UtilValidate.isEmpty(entityName) ) {
+ if (UtilValidate.isEmpty(entityName)) {
String errMsg = UtilProperties.getMessage(LayoutEvents.err_resource, "layoutEvents.entityname_empty", locale);
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java Mon Aug 17 15:42:56 2009
@@ -92,7 +92,7 @@
}
}
- if (imageFi == null ) {
+ if (imageFi == null) {
Map messageMap = UtilMisc.toMap("imageFi", imageFi);
String errMsg = UtilProperties.getMessage(LayoutWorker.err_resource, "layoutEvents.image_null", messageMap, locale);
request.setAttribute("_ERROR_MESSAGE_", errMsg);
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayInputStream.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayInputStream.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayInputStream.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayInputStream.java Mon Aug 17 15:42:56 2009
@@ -60,9 +60,9 @@
try {
close();
- } catch ( IOException e) {
+ } catch (IOException e) {
String errMsg = e.getMessage();
- throw new com.sun.star.io.IOException( errMsg, this );
+ throw new com.sun.star.io.IOException(errMsg, this);
}
}
@@ -73,9 +73,9 @@
byte [] buf2 = new byte[pos2];
try {
bytesRead = super.read(buf2);
- } catch ( IOException e) {
+ } catch (IOException e) {
String errMsg = e.getMessage();
- throw new com.sun.star.io.IOException( errMsg, this );
+ throw new com.sun.star.io.IOException(errMsg, this);
}
if (bytesRead > 0) {
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayOutputStream.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayOutputStream.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayOutputStream.java Mon Aug 17 15:42:56 2009
@@ -49,7 +49,7 @@
{
try {
write(buf);
- } catch ( java.io.IOException e ) {
+ } catch (java.io.IOException e) {
throw(new com.sun.star.io.IOException(e.getMessage()));
}
}
@@ -59,7 +59,7 @@
try {
super.flush();
close();
- } catch ( java.io.IOException e ) {
+ } catch (java.io.IOException e) {
throw(new com.sun.star.io.IOException(e.getMessage()));
}
}
@@ -68,7 +68,7 @@
{
try {
super.flush();
- } catch ( java.io.IOException e ) {
+ } catch (java.io.IOException e) {
}
}
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeWorker.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeWorker.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeWorker.java Mon Aug 17 15:42:56 2009
@@ -345,7 +345,7 @@
return extension;
}
- public static String convertToUrl(String filePath, XComponentContext xComponentContext ) throws MalformedURLException {
+ public static String convertToUrl(String filePath, XComponentContext xComponentContext) throws MalformedURLException {
String returnUrl = null;
File f = new File(filePath);
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/search/SearchWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/search/SearchWorker.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/search/SearchWorker.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/search/SearchWorker.java Mon Aug 17 15:42:56 2009
@@ -222,7 +222,7 @@
public static void indexDataResource(GenericDelegator delegator, Map context, String id) throws Exception {
String path = null;
- indexDataResource(delegator, context, id, path );
+ indexDataResource(delegator, context, id, path);
}
public static void indexDataResource(GenericDelegator delegator, Map context, String id, String path) throws Exception {
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java Mon Aug 17 15:42:56 2009
@@ -282,7 +282,7 @@
String value = fs.getField(fieldName);
List questions = delegator.findByAnd("SurveyQuestionAndAppl", UtilMisc.toMap("surveyId", surveyId, "externalFieldRef", fieldName));
- if (questions.size() == 0 ) {
+ if (questions.size() == 0) {
Debug.logInfo("No question found for surveyId:" + surveyId + " and externalFieldRef:" + fieldName, module);
continue;
}
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java Mon Aug 17 15:42:56 2009
@@ -99,7 +99,7 @@
if (Debug.infoOn()) Debug.logInfo("in InjectNodeTrailCsv(0), trail:"+trail,module);
// This will build a nodeTrail if none exists
// Maybe only contentId or subContentId are passed in
- //GenericValue currentValue = getCurrentContent( delegator, trail, userLogin, templateCtx, nullThruDatesOnly, contentAssocPredicateId);
+ //GenericValue currentValue = getCurrentContent(delegator, trail, userLogin, templateCtx, nullThruDatesOnly, contentAssocPredicateId);
String redo = (String)templateCtx.get("redo");
if (trail == null || trail.size() == 0 || (redo != null && redo.equalsIgnoreCase("true"))) {
@@ -146,7 +146,7 @@
String firstTrailContentId = (String)nd.get("contentId");
if (UtilValidate.isNotEmpty(firstTrailContentId)
&& UtilValidate.isNotEmpty(lastPassedContentId)
- && firstTrailContentId.equals(lastPassedContentId) ) {
+ && firstTrailContentId.equals(lastPassedContentId)) {
csvTrail += "," + ContentWorker.nodeTrailToCsv(trail.subList(1, trail.size()));
} else {
csvTrail += "," + ContentWorker.nodeTrailToCsv(trail);
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java Mon Aug 17 15:42:56 2009
@@ -101,7 +101,7 @@
String txt = null;
String mapKey = (String)templateRoot.get("mapKey");
- if ( UtilValidate.isEmpty(mapKey)) {
+ if (UtilValidate.isEmpty(mapKey)) {
txt = ContentWorker.renderContentAsText(dispatcher, delegator, thisContentId, templateRoot, locale, mimeTypeId, true);
} else {
txt = ContentWorker.renderSubContentAsText(dispatcher, delegator, thisContentId, mapKey, templateRoot, locale, mimeTypeId, true);
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java Mon Aug 17 15:42:56 2009
@@ -214,25 +214,25 @@
//if (Debug.infoOn()) Debug.logInfo("in Render(0), view ." + view , module);
if (view != null) {
ModelEntity modelEntity = view.getModelEntity();
- if (UtilValidate.isEmpty(contentId) && modelEntity.getField("caContentId") != null )
+ if (UtilValidate.isEmpty(contentId) && modelEntity.getField("caContentId") != null)
contentId = view.getString("caContentId");
- if (UtilValidate.isEmpty(contentId) && modelEntity.getField("contentId") != null )
+ if (UtilValidate.isEmpty(contentId) && modelEntity.getField("contentId") != null)
contentId = view.getString("contentId");
- if (UtilValidate.isEmpty(contentIdTo) && modelEntity.getField("caContentIdTo") != null )
+ if (UtilValidate.isEmpty(contentIdTo) && modelEntity.getField("caContentIdTo") != null)
contentIdTo = view.getString("caContentIdTo");
- if (UtilValidate.isEmpty(contentIdTo) && modelEntity.getField("contentIdTo") != null )
+ if (UtilValidate.isEmpty(contentIdTo) && modelEntity.getField("contentIdTo") != null)
contentIdTo = view.getString("contentIdTo");
- if (UtilValidate.isEmpty(contentAssocTypeId) && modelEntity.getField("caContentAssocTypeId") != null )
+ if (UtilValidate.isEmpty(contentAssocTypeId) && modelEntity.getField("caContentAssocTypeId") != null)
contentAssocTypeId = view.getString("caContentAssocTypeId");
- if (UtilValidate.isEmpty(contentAssocTypeId) && modelEntity.getField("contentAssocTypeId") != null )
+ if (UtilValidate.isEmpty(contentAssocTypeId) && modelEntity.getField("contentAssocTypeId") != null)
contentAssocTypeId = view.getString("contentAssocTypeId");
- if (UtilValidate.isEmpty(mapKey) && modelEntity.getField("caMapKey") != null )
+ if (UtilValidate.isEmpty(mapKey) && modelEntity.getField("caMapKey") != null)
mapKey = view.getString("caMapKey");
- if (UtilValidate.isEmpty(mapKey) && modelEntity.getField("mapKey") != null )
+ if (UtilValidate.isEmpty(mapKey) && modelEntity.getField("mapKey") != null)
mapKey = view.getString("mapKey");
- if (UtilValidate.isEmpty(fromDate) && modelEntity.getField("caFromDate") != null )
+ if (UtilValidate.isEmpty(fromDate) && modelEntity.getField("caFromDate") != null)
fromDate = view.getString("caFromDate");
- if (UtilValidate.isEmpty(fromDate) && modelEntity.getField("fromDate") != null )
+ if (UtilValidate.isEmpty(fromDate) && modelEntity.getField("fromDate") != null)
fromDate = view.getString("fromDate");
}
if (Debug.infoOn()) Debug.logInfo("in Render(0), contentIdTo ." + contentIdTo , module);
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java Mon Aug 17 15:42:56 2009
@@ -68,17 +68,17 @@
final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env);
final Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env);
- //if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(0):" + templateRoot.get( "contentId"), module);
+ //if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module);
FreeMarkerWorker.getSiteParameters(request, templateRoot);
final Map savedValuesUp = FastMap.newInstance();
FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp);
FreeMarkerWorker.overrideWithArgs(templateRoot, args);
- //if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(2):" + templateRoot.get( "contentId"), module);
+ //if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module);
final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
- List trail = (List)templateRoot.get( "globalNodeTrail");
+ List trail = (List)templateRoot.get("globalNodeTrail");
//if (Debug.infoOn()) Debug.logInfo("in Render(0), globalNodeTrail ." + trail , module);
- String contentAssocPredicateId = (String)templateRoot.get( "contentAssocPredicateId");
- String strNullThruDatesOnly = (String)templateRoot.get( "nullThruDatesOnly");
+ String contentAssocPredicateId = (String)templateRoot.get("contentAssocPredicateId");
+ String strNullThruDatesOnly = (String)templateRoot.get("nullThruDatesOnly");
Boolean nullThruDatesOnly = (strNullThruDatesOnly != null && strNullThruDatesOnly.equalsIgnoreCase("true")) ? Boolean.TRUE :Boolean.FALSE;
String thisSubContentId = (String)templateRoot.get("subContentId");
//if (Debug.infoOn()) Debug.logInfo("in Render(0), thisSubContentId ." + thisSubContentId , module);
@@ -103,7 +103,7 @@
subContentIdSub = (String) view.get("contentId");
}
// This order is taken so that the dataResourceType can be overridden in the transform arguments.
- String subDataResourceTypeId = (String)templateRoot.get( "subDataResourceTypeId");
+ String subDataResourceTypeId = (String)templateRoot.get("subDataResourceTypeId");
if (UtilValidate.isEmpty(subDataResourceTypeId)) {
try {
subDataResourceTypeId = (String) view.get("drDataResourceTypeId");
@@ -115,11 +115,11 @@
// being passed.
}
String mimeTypeId = ContentWorker.getMimeTypeId(delegator, view, templateRoot);
- templateRoot.put( "drDataResourceId", dataResourceId);
- templateRoot.put( "mimeTypeId", mimeTypeId);
- templateRoot.put( "dataResourceId", dataResourceId);
- templateRoot.put( "subContentId", subContentIdSub);
- templateRoot.put( "subDataResourceTypeId", subDataResourceTypeId);
+ templateRoot.put("drDataResourceId", dataResourceId);
+ templateRoot.put("mimeTypeId", mimeTypeId);
+ templateRoot.put("dataResourceId", dataResourceId);
+ templateRoot.put("subContentId", subContentIdSub);
+ templateRoot.put("subDataResourceTypeId", subDataResourceTypeId);
//final Map savedValues = FastMap.newInstance();
//FreeMarkerWorker.saveContextValues(templateCtx, saveKeyNames, savedValues);
@@ -164,8 +164,8 @@
if (map != null)
thisView = (GenericValue)map.get("value");
}
- //if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, subContentId:" + templateRoot.get( "subContentId"), module);
- //if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId:" + templateRoot.get( "contentId"), module);
+ //if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, subContentId:" + templateRoot.get("subContentId"), module);
+ //if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId:" + templateRoot.get("contentId"), module);
String mimeTypeId = (String) templateRoot.get("mimeTypeId");
Locale locale = (Locale) templateRoot.get("locale");
@@ -202,7 +202,7 @@
}
public void closeEditWrap(Writer out, String editRequestName) throws IOException {
- //if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(1):" + templateRoot.get( "contentId"), module);
+ //if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(1):" + templateRoot.get("contentId"), module);
//if (Debug.infoOn()) Debug.logInfo("in Render(0), templateRoot ." + templateRoot , module);
StringBuilder sb = new StringBuilder();
String fullRequest = editRequestName;
@@ -220,25 +220,25 @@
if (Debug.infoOn()) Debug.logInfo("in Render(0), view ." + view , module);
if (view != null) {
ModelEntity modelEntity = view.getModelEntity();
- if (UtilValidate.isEmpty(contentId) && modelEntity.getField("caContentId") != null )
+ if (UtilValidate.isEmpty(contentId) && modelEntity.getField("caContentId") != null)
contentId = view.getString("caContentId");
- if (UtilValidate.isEmpty(contentId) && modelEntity.getField("contentId") != null )
+ if (UtilValidate.isEmpty(contentId) && modelEntity.getField("contentId") != null)
contentId = view.getString("contentId");
- if (UtilValidate.isEmpty(contentIdTo) && modelEntity.getField("caContentIdTo") != null )
+ if (UtilValidate.isEmpty(contentIdTo) && modelEntity.getField("caContentIdTo") != null)
contentIdTo = view.getString("caContentIdTo");
- if (UtilValidate.isEmpty(contentIdTo) && modelEntity.getField("contentIdTo") != null )
+ if (UtilValidate.isEmpty(contentIdTo) && modelEntity.getField("contentIdTo") != null)
contentIdTo = view.getString("contentIdTo");
- if (UtilValidate.isEmpty(contentAssocTypeId) && modelEntity.getField("caContentAssocTypeId") != null )
+ if (UtilValidate.isEmpty(contentAssocTypeId) && modelEntity.getField("caContentAssocTypeId") != null)
contentAssocTypeId = view.getString("caContentAssocTypeId");
- if (UtilValidate.isEmpty(contentAssocTypeId) && modelEntity.getField("contentAssocTypeId") != null )
+ if (UtilValidate.isEmpty(contentAssocTypeId) && modelEntity.getField("contentAssocTypeId") != null)
contentAssocTypeId = view.getString("contentAssocTypeId");
- if (UtilValidate.isEmpty(mapKey) && modelEntity.getField("caMapKey") != null )
+ if (UtilValidate.isEmpty(mapKey) && modelEntity.getField("caMapKey") != null)
mapKey = view.getString("caMapKey");
- if (UtilValidate.isEmpty(mapKey) && modelEntity.getField("mapKey") != null )
+ if (UtilValidate.isEmpty(mapKey) && modelEntity.getField("mapKey") != null)
mapKey = view.getString("mapKey");
- if (UtilValidate.isEmpty(fromDate) && modelEntity.getField("caFromDate") != null )
+ if (UtilValidate.isEmpty(fromDate) && modelEntity.getField("caFromDate") != null)
fromDate = view.getString("caFromDate");
- if (UtilValidate.isEmpty(fromDate) && modelEntity.getField("fromDate") != null )
+ if (UtilValidate.isEmpty(fromDate) && modelEntity.getField("fromDate") != null)
fromDate = view.getString("fromDate");
}
} else {
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java Mon Aug 17 15:42:56 2009
@@ -78,7 +78,7 @@
FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp);
final Map savedValues = FastMap.newInstance();
FreeMarkerWorker.overrideWithArgs(templateRoot, args);
- String startContentAssocTypeId = (String)templateRoot.get( "contentAssocTypeId");
+ String startContentAssocTypeId = (String)templateRoot.get("contentAssocTypeId");
//if (Debug.infoOn()) Debug.logInfo("in TraverseSubContentCache, startContentAssocTypeId:" + startContentAssocTypeId, module);
final GenericDelegator delegator = (GenericDelegator) FreeMarkerWorker.getWrappedObject("delegator", env);
final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
@@ -107,14 +107,14 @@
final Map traverseContext = FastMap.newInstance();
traverseContext.put("delegator", delegator);
Map whenMap = FastMap.newInstance();
- whenMap.put("followWhen", (String)templateRoot.get( "followWhen"));
- whenMap.put("pickWhen", (String)templateRoot.get( "pickWhen"));
- whenMap.put("returnBeforePickWhen", (String)templateRoot.get( "returnBeforePickWhen"));
- whenMap.put("returnAfterPickWhen", (String)templateRoot.get( "returnAfterPickWhen"));
+ whenMap.put("followWhen", (String)templateRoot.get("followWhen"));
+ whenMap.put("pickWhen", (String)templateRoot.get("pickWhen"));
+ whenMap.put("returnBeforePickWhen", (String)templateRoot.get("returnBeforePickWhen"));
+ whenMap.put("returnAfterPickWhen", (String)templateRoot.get("returnAfterPickWhen"));
traverseContext.put("whenMap", whenMap);
env.setVariable("whenMap", FreeMarkerWorker.autoWrap(whenMap, env));
- String fromDateStr = (String)templateRoot.get( "fromDateStr");
- String thruDateStr = (String)templateRoot.get( "thruDateStr");
+ String fromDateStr = (String)templateRoot.get("fromDateStr");
+ String thruDateStr = (String)templateRoot.get("thruDateStr");
Timestamp fromDate = null;
if (fromDateStr != null && fromDateStr.length() > 0) {
fromDate = UtilDateTime.toTimestamp(fromDateStr);
@@ -129,7 +129,7 @@
//throw new RuntimeException("contentAssocTypeId is empty.");
//}
traverseContext.put("contentAssocTypeId", startContentAssocTypeId);
- String direction = (String)templateRoot.get( "direction");
+ String direction = (String)templateRoot.get("direction");
if (UtilValidate.isEmpty(direction)) {
direction = "From";
}
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java Mon Aug 17 15:42:56 2009
@@ -126,13 +126,13 @@
final Map traverseContext = FastMap.newInstance();
traverseContext.put("delegator", delegator);
Map whenMap = FastMap.newInstance();
- whenMap.put("followWhen", (String)templateCtx.get( "followWhen"));
- whenMap.put("pickWhen", (String)templateCtx.get( "pickWhen"));
- whenMap.put("returnBeforePickWhen", (String)templateCtx.get( "returnBeforePickWhen"));
- whenMap.put("returnAfterPickWhen", (String)templateCtx.get( "returnAfterPickWhen"));
+ whenMap.put("followWhen", (String)templateCtx.get("followWhen"));
+ whenMap.put("pickWhen", (String)templateCtx.get("pickWhen"));
+ whenMap.put("returnBeforePickWhen", (String)templateCtx.get("returnBeforePickWhen"));
+ whenMap.put("returnAfterPickWhen", (String)templateCtx.get("returnAfterPickWhen"));
traverseContext.put("whenMap", whenMap);
- String fromDateStr = (String)templateCtx.get( "fromDateStr");
- String thruDateStr = (String)templateCtx.get( "thruDateStr");
+ String fromDateStr = (String)templateCtx.get("fromDateStr");
+ String thruDateStr = (String)templateCtx.get("thruDateStr");
Timestamp fromDate = null;
if (fromDateStr != null && fromDateStr.length() > 0) {
fromDate = UtilDateTime.toTimestamp(fromDateStr);
@@ -143,11 +143,11 @@
thruDate = UtilDateTime.toTimestamp(thruDateStr);
}
traverseContext.put("thruDate", thruDate);
- String startContentAssocTypeId = (String)templateCtx.get( "contentAssocTypeId");
+ String startContentAssocTypeId = (String)templateCtx.get("contentAssocTypeId");
if (startContentAssocTypeId != null)
startContentAssocTypeId = "SUB_CONTENT";
traverseContext.put("contentAssocTypeId", startContentAssocTypeId);
- String direction = (String)templateCtx.get( "direction");
+ String direction = (String)templateCtx.get("direction");
if (UtilValidate.isEmpty(direction))
direction = "From";
traverseContext.put("direction", direction);
@@ -288,7 +288,7 @@
if (UtilValidate.isEmpty(contentAssocTypeId))
contentAssocTypeId = "";
assocContext.put("contentAssocTypeId", contentAssocTypeId);
- //assocContext.put("contentTypeId", assocValue.get("contentTypeId") );
+ //assocContext.put("contentTypeId", assocValue.get("contentTypeId"));
String assocRelation = null;
String thisDirection = (String)templateCtx.get("direction");
String thisContentId = (String)templateCtx.get("thisContentId");
Modified: ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/flash-flv.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/flash-flv.ftl?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/flash-flv.ftl (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/flash-flv.ftl Mon Aug 17 15:42:56 2009
@@ -17,15 +17,15 @@
under the License.
-->
<object type="application/x-shockwave-flash" data="/images/FlowPlayerLP.swf" width="320" height="263" id="FlowPlayer">
- <param name="movie" value="/images/FlowPlayerLP.swf" />
- <param name="quality" value="high" />
+ <param name="movie" value="/images/FlowPlayerLP.swf" />
+ <param name="quality" value="high" />
- <param name="flashvars" value="config={
- autoPlay: true,
- bufferLength: '100',
- loop: false,
- initialScale: 'fit',
- videoFile: '/content/control/stream?contentId=${contentId}',
- showPlayListButtons: true
- }" />
+ <param name="flashvars" value="config={
+ autoPlay: true,
+ bufferLength: '100',
+ loop: false,
+ initialScale: 'fit',
+ videoFile: '/content/control/stream?contentId=${contentId}',
+ showPlayListButtons: true
+ }" />
</object>
\ No newline at end of file
Modified: ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/flash-swf.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/flash-swf.ftl?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/flash-swf.ftl (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/flash-swf.ftl Mon Aug 17 15:42:56 2009
@@ -18,5 +18,5 @@
-->
<object width="550" height="400">
<param name="movie" value="/content/control/stream?contentId=${contentId}">
- <embed src="/content/control/stream?contentId=${contentId}" width="550" height="400"></embed>
+ <embed src="/content/control/stream?contentId=${contentId}" width="550" height="400"></embed>
</object>
Modified: ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/quicktime.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/quicktime.ftl?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/quicktime.ftl (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/quicktime.ftl Mon Aug 17 15:42:56 2009
@@ -26,6 +26,6 @@
<param name="KIOSKMODE" value="false" />
<embed src="/content/control/stream?contentId=${contentId}" width="320" height="263" scale="tofit"
autostart="true" autoplay="true" kioskmode="false" target="quicktimeplayer"
- pluginspage="http://www.apple.com/quicktime/download/">
+ pluginspage="http://www.apple.com/quicktime/download/">
</embed>
</object>
Modified: ofbiz/branches/executioncontext20090812/applications/content/template/survey/genericsurvey.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/template/survey/genericsurvey.ftl?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/template/survey/genericsurvey.ftl (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/template/survey/genericsurvey.ftl Mon Aug 17 15:42:56 2009
@@ -255,9 +255,9 @@
<#-- special formatting for select boxes -->
<#assign align = "left"/>
<#if surveyQuestionAndAppl?exists && surveyQuestionAndAppl.surveyQuestionTypeId?has_content>
- <#if (surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN" || surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT" || surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION")>
- <#assign align = "right"/>
- </#if>
+ <#if (surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN" || surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT" || surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION")>
+ <#assign align = "right"/>
+ </#if>
</#if>
<#-- get an answer from the answerMap -->
Modified: ofbiz/branches/executioncontext20090812/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/webapp/content/WEB-INF/controller.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/webapp/content/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"/>
<description>Content Manager Module Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>
@@ -39,10 +40,6 @@
</postprocessor>
-->
- <!-- Request Mappings -->
- <request-map uri="view"><security https="false" auth="false"/><response name="success" type="request" value="main"/></request-map>
- <request-map uri="views"><security https="true" auth="false"/><response name="success" type="request" value="main"/></request-map>
-
<request-map uri="chain">
<event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/>
<response name="success" type="request" value="/view"/>
Modified: ofbiz/branches/executioncontext20090812/applications/content/webapp/content/cms/CMSSites.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/webapp/content/cms/CMSSites.ftl?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/webapp/content/cms/CMSSites.ftl (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/webapp/content/cms/CMSSites.ftl Mon Aug 17 15:42:56 2009
@@ -18,9 +18,9 @@
-->
<SCRIPT language="javascript">
function call_fieldlookup4(rootForumId, parentForumId ) {
- var obj_lookupwindow = window.open("addSubSite?rootForumId=" + rootForumId + "&parentForumId=" + parentForumId, 'FieldLookup', 'width=500,height=250,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
- obj_lookupwindow.opener = window;
- obj_lookupwindow.focus();
+ var obj_lookupwindow = window.open("addSubSite?rootForumId=" + rootForumId + "&parentForumId=" + parentForumId, 'FieldLookup', 'width=500,height=250,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
+ obj_lookupwindow.opener = window;
+ obj_lookupwindow.focus();
}
</script>
@@ -265,9 +265,9 @@
<SCRIPT language="javascript">
function call_fieldlookup3(view_name) {
window.target = document.siteRoleForm.partyId_o_${rowCount - 1};
- var obj_lookupwindow = window.open(view_name,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
- obj_lookupwindow.opener = window;
- obj_lookupwindow.focus();
+ var obj_lookupwindow = window.open(view_name,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
+ obj_lookupwindow.opener = window;
+ obj_lookupwindow.focus();
}
</script>
Modified: ofbiz/branches/executioncontext20090812/applications/content/webapp/content/content/nav.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/webapp/content/content/nav.ftl?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/webapp/content/content/nav.ftl (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/webapp/content/content/nav.ftl Mon Aug 17 15:42:56 2009
@@ -58,8 +58,8 @@
<style>
.dojoContextMenu {
- background-color: #ccc;
- font-size: 10px;
+ background-color: #ccc;
+ font-size: 10px;
}
</style>
Modified: ofbiz/branches/executioncontext20090812/applications/content/webapp/content/contentsetup/UserPermissions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/webapp/content/contentsetup/UserPermissions.ftl?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/webapp/content/contentsetup/UserPermissions.ftl (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/webapp/content/contentsetup/UserPermissions.ftl Mon Aug 17 15:42:56 2009
@@ -18,9 +18,9 @@
-->
<script language="javascript1.2">
function call_fieldlookup3(view_name) {
- var obj_lookupwindow = window.open(view_name + "?webSitePublishPoint=" + webSitePublishPoint,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
- obj_lookupwindow.opener = window;
- obj_lookupwindow.focus();
+ var obj_lookupwindow = window.open(view_name + "?webSitePublishPoint=" + webSitePublishPoint,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
+ obj_lookupwindow.opener = window;
+ obj_lookupwindow.focus();
}
function submitRows(rowCount) {
var rowCountElement = document.createElement("input");
Modified: ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentForms.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentForms.xml Mon Aug 17 15:42:56 2009
@@ -30,12 +30,16 @@
<field name="description"><text-find default-option="contains" ignore-case="true"/></field>
<field name="contentTypeId" position="1">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/>
+ <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId">
+ <entity-order-by field-name="description"/>
+ </entity-options>
</drop-down>
</field>
<field name="mimeTypeId" position="2">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
+ <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId">
+ <entity-order-by field-name="description"/>
+ </entity-options>
</drop-down>
</field>
<field name="dataResourceId" position="1">
@@ -48,13 +52,16 @@
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS"/>
+ <entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="createdByUserLogin" position="2"><lookup target-form-name="LookupPerson"/></field>
<field name="localeString">
<drop-down allow-empty="true">
- <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode"/>
+ <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode">
+ <entity-order-by field-name="countryName"/>
+ </entity-options>
</drop-down>
</field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
Modified: ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentMenus.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentMenus.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentMenus.xml Mon Aug 17 15:42:56 2009
@@ -243,4 +243,12 @@
<link target="navigateContent"/>
</menu-item>
</menu>
+ <menu name="lookupMenu" menu-container-style="button-bar tab-bar" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="close" title="${uiLabelMap.CommonClose}">
+ <link target="javascript:window.close();" url-mode="plain"/>
+ </menu-item>
+ <menu-item name="index" title="${uiLabelMap.CommonExtIndex}">
+ <link target="showHelp?helpTopic=navigateHelp"/>
+ </menu-item>
+ </menu>
</menus>