svn commit: r791212 [5/8] - in /ofbiz/trunk: ./ applications/accounting/src/or
Locked
svn commit: r791212 [5/8] - in /ofbiz/trunk: ./ applications/accounting/src/or
 
|
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java Sun Jul 5 10:01:19 2009 @@ -68,6 +68,7 @@ useCacheStr = element.getAttribute("use-cache"); } + @Override public boolean exec(MethodContext methodContext) { String entityName = methodContext.expandString(this.entityName); String delegatorName = methodContext.expandString(this.delegatorName); @@ -110,10 +111,12 @@ return this.entityName; } + @Override public String rawString() { // TODO: something more than the empty tag return "<find-by-primary-key/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java Sun Jul 5 10:01:19 2009 @@ -64,6 +64,7 @@ useCacheStr = element.getAttribute("use-cache"); } + @Override public boolean exec(MethodContext methodContext) { String relationName = methodContext.expandString(this.relationName); String useCacheStr = methodContext.expandString(this.useCacheStr); @@ -101,10 +102,12 @@ public String getRelationName() { return this.relationName; } + @Override public String rawString() { // TODO: something more than the empty tag return "<get-related/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java Sun Jul 5 10:01:19 2009 @@ -56,6 +56,7 @@ useCacheStr = element.getAttribute("use-cache"); } + @Override public boolean exec(MethodContext methodContext) { String relationName = methodContext.expandString(this.relationName); String useCacheStr = methodContext.expandString(this.useCacheStr); @@ -91,10 +92,12 @@ public String getRelationName() { return this.relationName; } + @Override public String rawString() { // TODO: something more than the empty tag return "<get-related-one/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java Sun Jul 5 10:01:19 2009 @@ -57,6 +57,7 @@ incrementByStr = element.getAttribute("increment-by"); } + @Override public boolean exec(MethodContext methodContext) { String seqFieldName = methodContext.expandString(this.seqFieldName); String numericPaddingStr = methodContext.expandString(this.numericPaddingStr); @@ -84,10 +85,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<make-next-seq-id/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java Sun Jul 5 10:01:19 2009 @@ -50,6 +50,7 @@ mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name")); } + @Override public boolean exec(MethodContext methodContext) { String entityName = methodContext.expandString(this.entityName); Map<String, ? extends Object> ctxMap = (mapAcsr.isEmpty() ? null : mapAcsr.get(methodContext)); @@ -61,10 +62,12 @@ return this.entityName; } + @Override public String rawString() { // TODO: something more than the empty tag return "<make-value/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java Sun Jul 5 10:01:19 2009 @@ -53,15 +53,18 @@ envAcsr = new ContextAccessor<java.sql.Date>(element.getAttribute("field"), element.getAttribute("env-name")); } + @Override public boolean exec(MethodContext methodContext) { envAcsr.put(methodContext, new java.sql.Date(System.currentTimeMillis())); return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<now-date-to-env/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java Sun Jul 5 10:01:19 2009 @@ -53,15 +53,18 @@ envAcsr = new ContextAccessor<java.sql.Timestamp>(element.getAttribute("field"), element.getAttribute("env-name")); } + @Override public boolean exec(MethodContext methodContext) { envAcsr.put(methodContext, new java.sql.Timestamp(System.currentTimeMillis())); return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<now-timestamp-to-env/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java Sun Jul 5 10:01:19 2009 @@ -56,6 +56,7 @@ orderByListAcsr = new ContextAccessor<List<String>>(element.getAttribute("order-by-list-name")); } + @Override public boolean exec(MethodContext methodContext) { List<String> orderByList = null; @@ -66,10 +67,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<order-value-list/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java Sun Jul 5 10:01:19 2009 @@ -52,6 +52,7 @@ doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(methodContext.expandString(doCacheClearStr)); @@ -74,10 +75,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<refresh-value/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java Sun Jul 5 10:01:19 2009 @@ -55,6 +55,7 @@ doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(doCacheClearStr); String entityName = methodContext.expandString(this.entityName); @@ -77,10 +78,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<remove-by-and/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java Sun Jul 5 10:01:19 2009 @@ -54,6 +54,7 @@ doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(doCacheClearStr); @@ -90,10 +91,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<remove-list/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java Sun Jul 5 10:01:19 2009 @@ -54,6 +54,7 @@ doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(doCacheClearStr); String relationName = methodContext.expandString(this.relationName); @@ -91,10 +92,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<remove-related/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java Sun Jul 5 10:01:19 2009 @@ -52,6 +52,7 @@ doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(methodContext.expandString(doCacheClearStr)); @@ -74,10 +75,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<remove-value/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java Sun Jul 5 10:01:19 2009 @@ -73,6 +73,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { String seqName = methodContext.expandString(this.seqName); if (getLongOnly) { @@ -83,10 +84,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<sequenced-id-to-env/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java Sun Jul 5 10:01:19 2009 @@ -49,6 +49,7 @@ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), element.getAttribute("value-name")); } + @Override public boolean exec(MethodContext methodContext) { GenericValue userLogin = valueAcsr.get(methodContext); if (userLogin == null) { @@ -60,10 +61,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<set-current-user-login/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java Sun Jul 5 10:01:19 2009 @@ -55,6 +55,7 @@ setIfNullStr = element.getAttribute("set-if-null"); } + @Override public boolean exec(MethodContext methodContext) { // if anything but false it will be true boolean setIfNull = !"false".equals(methodContext.expandString(setIfNullStr)); @@ -82,10 +83,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<set-nonpk-fields/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java Sun Jul 5 10:01:19 2009 @@ -55,6 +55,7 @@ setIfNullStr = element.getAttribute("set-if-null"); } + @Override public boolean exec(MethodContext methodContext) { // if anything but false it will be true boolean setIfNull = !"false".equals(methodContext.expandString(setIfNullStr)); @@ -83,10 +84,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<set-pk-fields/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java Sun Jul 5 10:01:19 2009 @@ -54,6 +54,7 @@ doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(methodContext.expandString(doCacheClearStr)); @@ -81,10 +82,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<store-list/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java Sun Jul 5 10:01:19 2009 @@ -52,6 +52,7 @@ doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(methodContext.expandString(doCacheClearStr)); @@ -88,10 +89,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<store-value/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionBegin.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionBegin.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionBegin.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionBegin.java Sun Jul 5 10:01:19 2009 @@ -50,6 +50,7 @@ beganTransactionAcsr = new ContextAccessor<Boolean>(element.getAttribute("began-transaction-name"), "beganTransaction"); } + @Override public boolean exec(MethodContext methodContext) { boolean beganTransaction = false; try { @@ -66,10 +67,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<transaction-begin/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionCommit.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionCommit.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionCommit.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionCommit.java Sun Jul 5 10:01:19 2009 @@ -50,6 +50,7 @@ beganTransactionAcsr = new ContextAccessor<Boolean>(element.getAttribute("began-transaction-name"), "beganTransaction"); } + @Override public boolean exec(MethodContext methodContext) { boolean beganTransaction = false; @@ -72,10 +73,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<transaction-commit/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionRollback.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionRollback.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionRollback.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionRollback.java Sun Jul 5 10:01:19 2009 @@ -50,6 +50,7 @@ beganTransactionAcsr = new ContextAccessor<Boolean>(element.getAttribute("began-transaction-name"), "beganTransaction"); } + @Override public boolean exec(MethodContext methodContext) { boolean beganTransaction = false; @@ -72,10 +73,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<transaction-rollback/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ClearField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ClearField.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ClearField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ClearField.java Sun Jul 5 10:01:19 2009 @@ -55,6 +55,7 @@ mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-name")); } + @Override public boolean exec(MethodContext methodContext) { if (!mapAcsr.isEmpty()) { Map<String, Object> toMap = mapAcsr.get(methodContext); @@ -75,9 +76,11 @@ return true; } + @Override public String rawString() { return "<clear-field field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToEnv.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToEnv.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToEnv.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToEnv.java Sun Jul 5 10:01:19 2009 @@ -51,14 +51,17 @@ toEnvAcsr = new ContextAccessor<Object>(element.getAttribute("to-env-name")); } + @Override public boolean exec(MethodContext methodContext) { toEnvAcsr.put(methodContext, envAcsr.get(methodContext)); return true; } + @Override public String rawString() { return "<env-to-env env-name=\"" + this.envAcsr + "\" to-env-name=\"" + this.toEnvAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToField.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToField.java Sun Jul 5 10:01:19 2009 @@ -61,6 +61,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { Object envVar = envAcsr.get(methodContext); @@ -85,9 +86,11 @@ return true; } + @Override public String rawString() { return "<env-to-field env-name=\"" + this.envAcsr + "\" field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToEnv.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToEnv.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToEnv.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToEnv.java Sun Jul 5 10:01:19 2009 @@ -63,6 +63,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { Object fieldVal = null; @@ -89,9 +90,11 @@ return true; } + @Override public String rawString() { return "<field-to-env env-name=\"" + this.envAcsr + "\" field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToField.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToField.java Sun Jul 5 10:01:19 2009 @@ -66,6 +66,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { Object fieldVal = null; @@ -109,9 +110,11 @@ return true; } + @Override public String rawString() { return "<field-to-field field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\" to-field-name=\"" + this.toFieldAcsr + "\" to-map-name=\"" + this.toMapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java Sun Jul 5 10:01:19 2009 @@ -55,6 +55,7 @@ listAcsr = new ContextAccessor<List<Object>>(element.getAttribute("list"), element.getAttribute("list-name")); } + @Override public boolean exec(MethodContext methodContext) { Object fieldVal = null; @@ -89,9 +90,11 @@ return true; } + @Override public String rawString() { return "<field-to-list list-name=\"" + this.listAcsr + "\" field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java Sun Jul 5 10:01:19 2009 @@ -50,6 +50,7 @@ this.listAcsr = new ContextAccessor<List<? extends Object>>(element.getAttribute("list"), element.getAttribute("list-name")); } + @Override public boolean exec(MethodContext methodContext) { if (listAcsr.isEmpty()) { Debug.logWarning("No list-name specified in iterate tag, doing nothing", module); @@ -67,9 +68,11 @@ return true; } + @Override public String rawString() { return "<first-from-list list-name=\"" + this.listAcsr + "\" entry-name=\"" + this.entryAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java Sun Jul 5 10:01:19 2009 @@ -64,6 +64,7 @@ SimpleMethod.readOperations(element, subOps, simpleMethod); } + @Override public boolean exec(MethodContext methodContext) { if (listAcsr.isEmpty()) { @@ -130,10 +131,12 @@ return this.subOps; } + @Override public String rawString() { // TODO: something more than the empty tag return "<iterate list-name=\"" + this.listAcsr + "\" entry-name=\"" + this.entryAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java Sun Jul 5 10:01:19 2009 @@ -62,6 +62,7 @@ SimpleMethod.readOperations(element, subOps, simpleMethod); } + @Override public boolean exec(MethodContext methodContext) { @@ -106,9 +107,11 @@ return this.subOps; } + @Override public String rawString() { return "<iterate-map map-name=\"" + this.mapAcsr + "\" key=\"" + this.keyAcsr + "\" value=\"" + this.valueAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java Sun Jul 5 10:01:19 2009 @@ -52,6 +52,7 @@ toListAcsr = new ContextAccessor<List<Object>>(element.getAttribute("to-list"), element.getAttribute("to-list-name")); } + @Override public boolean exec(MethodContext methodContext) { List<Object> fromList = listAcsr.get(methodContext); List<Object> toList = toListAcsr.get(methodContext); @@ -71,10 +72,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<list-to-list/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java Sun Jul 5 10:01:19 2009 @@ -58,6 +58,7 @@ SimpleMethod.readOperations(element, subOps, simpleMethod); } + @Override public boolean exec(MethodContext methodContext) { String countStrExp = methodContext.expandString(this.countStr); int count = 0; @@ -91,10 +92,12 @@ return this.subOps; } + @Override public String rawString() { return "<loop count=\"" + this.countStr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { return this.rawString(); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java Sun Jul 5 10:01:19 2009 @@ -52,6 +52,7 @@ toMapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("to-map"), element.getAttribute("to-map-name")); } + @Override public boolean exec(MethodContext methodContext) { Map<String, Object> fromMap = null; if (!mapAcsr.isEmpty()) { @@ -79,10 +80,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<map-to-map/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java Sun Jul 5 10:01:19 2009 @@ -62,6 +62,7 @@ this.mc = new MapComparator(this.orderByAcsrList); } + @Override public boolean exec(MethodContext methodContext) { List<Map<Object, Object>> orderList = listAcsr.get(methodContext); @@ -76,9 +77,11 @@ return true; } + @Override public String rawString() { return "<order-map-list list-name=\"" + this.listAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java Sun Jul 5 10:01:19 2009 @@ -93,6 +93,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { Object newValue = null; if (!this.fromField.isEmpty()) { @@ -198,6 +199,7 @@ return true; } + @Override public String rawString() { return "<set-calendar field=\"" + this.field + (this.valueExdr.isEmpty() ? "" : "\" value=\"" + this.valueExdr.getOriginal()) @@ -205,6 +207,7 @@ + (this.defaultExdr.isEmpty() ? "" : "\" default-value=\"" + this.defaultExdr.getOriginal()) + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java Sun Jul 5 10:01:19 2009 @@ -75,6 +75,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { Object newValue = null; if (!this.fromField.isEmpty()) { @@ -120,6 +121,7 @@ return true; } + @Override public String rawString() { return "<set field=\"" + this.field + (this.valueExdr.isEmpty() ? "" : "\" value=\"" + this.valueExdr.getOriginal()) @@ -128,6 +130,7 @@ + (this.type == null || this.type.length() == 0 ? "" : "\" type=\"" + this.type) + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java Sun Jul 5 10:01:19 2009 @@ -65,6 +65,7 @@ argListAcsr = new ContextAccessor<List<? extends Object>>(element.getAttribute("arg-list"), element.getAttribute("arg-list-name")); } + @Override public boolean exec(MethodContext methodContext) { if (!mapAcsr.isEmpty()) { Map<String, Object> toMap = mapAcsr.get(methodContext); @@ -116,10 +117,12 @@ return newValue.toString(); } + @Override public String rawString() { // TODO: something more than the empty tag return "<string-append string=\"" + this.string + "\" prefix=\"" + this.prefix + "\" suffix=\"" + this.suffix + "\" field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java Sun Jul 5 10:01:19 2009 @@ -62,6 +62,7 @@ messageFieldName = element.getAttribute("message-field-name"); } + @Override public boolean exec(MethodContext methodContext) { String valueStr = methodContext.expandString(string); @@ -95,10 +96,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<string-to-field string=\"" + this.string + "\" field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java Sun Jul 5 10:01:19 2009 @@ -58,6 +58,7 @@ messageFieldName = UtilValidate.isNotEmpty(element.getAttribute("message-field")) ? element.getAttribute("message-field") : element.getAttribute("message-field-name"); } + @Override public boolean exec(MethodContext methodContext) { String valueStr = methodContext.expandString(string); if (!argListAcsr.isEmpty()) { @@ -85,10 +86,12 @@ return true; } + @Override public String rawString() { // TODO: something more than the empty tag return "<string-to-list string=\"" + this.string + "\" list-name=\"" + this.listAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java Sun Jul 5 10:01:19 2009 @@ -68,6 +68,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { if (!mapAcsr.isEmpty()) { Map<String, Object> toMap = mapAcsr.get(methodContext); @@ -114,10 +115,12 @@ return outStr; } + @Override public String rawString() { // TODO: something more than the empty tag return "<to-string field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java Sun Jul 5 10:01:19 2009 @@ -56,6 +56,7 @@ requestAcsr = new FlexibleServletAccessor<Object>(element.getAttribute("request-name"), fieldAcsr.toString()); } + @Override public boolean exec(MethodContext methodContext) { // only run this if it is in an EVENT context if (methodContext.getMethodType() == MethodContext.EVENT) { @@ -82,10 +83,12 @@ return true; } + @Override public String rawString() { // TODO: add all attributes and other info return "<field-to-request field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java Sun Jul 5 10:01:19 2009 @@ -56,6 +56,7 @@ sessionAcsr = new FlexibleServletAccessor<Object>(element.getAttribute("session-name"), fieldAcsr.toString()); } + @Override public boolean exec(MethodContext methodContext) { // only run this if it is in an EVENT context if (methodContext.getMethodType() == MethodContext.EVENT) { @@ -82,10 +83,12 @@ return true; } + @Override public String rawString() { // TODO: add all attributes and other info return "<field-to-session field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java Sun Jul 5 10:01:19 2009 @@ -51,6 +51,7 @@ listAcsr = new ContextAccessor<List<String>>(element.getAttribute("list-name"), requestName); } + @Override public boolean exec(MethodContext methodContext) { List<String> listVal = null; // only run this if it is in an EVENT context @@ -80,9 +81,11 @@ return true; } + @Override public String rawString() { return "<request-parameters-to-list request-name=\"" + this.requestName + "\" list-name=\"" + this.listAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java Sun Jul 5 10:01:19 2009 @@ -60,6 +60,7 @@ defaultVal = element.getAttribute("default"); } + @Override public boolean exec(MethodContext methodContext) { String defaultVal = methodContext.expandString(this.defaultVal); @@ -99,10 +100,12 @@ return true; } + @Override public String rawString() { // TODO: add all attributes and other info return "<request-to-field request-name=\"" + this.requestAcsr + "\" field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java Sun Jul 5 10:01:19 2009 @@ -61,6 +61,7 @@ defaultVal = element.getAttribute("default"); } + @Override public boolean exec(MethodContext methodContext) { String defaultVal = methodContext.expandString(this.defaultVal); @@ -100,10 +101,12 @@ return true; } + @Override public String rawString() { // TODO: add all attributes and other info return "<session-to-field session-name=\"" + this.sessionAcsr + "\" field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java Sun Jul 5 10:01:19 2009 @@ -61,6 +61,7 @@ mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-name")); } + @Override public boolean exec(MethodContext methodContext) { String resource = methodContext.expandString(this.resource); String property = methodContext.expandString(this.property); @@ -110,10 +111,12 @@ return true; } + @Override public String rawString() { // TODO: add all attributes and other info return "<webapp-property-to-field field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java Sun Jul 5 10:01:19 2009 @@ -72,6 +72,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { boolean isValid = true; @@ -129,10 +130,12 @@ } } + @Override public String rawString() { // TODO: add all attributes and other info return "<check-id field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java Sun Jul 5 10:01:19 2009 @@ -91,6 +91,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { boolean hasPermission = false; @@ -187,10 +188,12 @@ } } + @Override public String rawString() { // TODO: add all attributes and other info return "<check-permission/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java Sun Jul 5 10:01:19 2009 @@ -79,6 +79,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -145,10 +146,12 @@ return allSubOps; } + @Override public String rawString() { // TODO: add all attributes and other info return "<if-compare field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\" value=\"" + value + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java Sun Jul 5 10:01:19 2009 @@ -92,6 +92,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -167,10 +168,12 @@ return allSubOps; } + @Override public String rawString() { // TODO: add all attributes and other info return "<if-compare-field field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java Sun Jul 5 10:01:19 2009 @@ -68,6 +68,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -109,9 +110,11 @@ return allSubOps; } + @Override public String rawString() { return "<if-empty field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java Sun Jul 5 10:01:19 2009 @@ -67,6 +67,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -114,9 +115,11 @@ return allSubOps; } + @Override public String rawString() { return "<if-has-permission permission=\"" + this.permissionExdr + "\" action=\"" + this.actionExdr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java Sun Jul 5 10:01:19 2009 @@ -69,6 +69,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { // only run subOps if element is instanceOf boolean runSubOps = false; @@ -106,10 +107,12 @@ return allSubOps; } + @Override public String rawString() { // TODO: add all attributes and other info return "<if-instance-of field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java Sun Jul 5 10:01:19 2009 @@ -69,6 +69,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -116,10 +117,12 @@ return allSubOps; } + @Override public String rawString() { // TODO: add all attributes and other info return "<if-not-empty field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java Sun Jul 5 10:01:19 2009 @@ -75,6 +75,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -129,10 +130,12 @@ return allSubOps; } + @Override public String rawString() { // TODO: add all attributes and other info return "<if-regexp field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java Sun Jul 5 10:01:19 2009 @@ -70,6 +70,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -147,10 +148,12 @@ return allSubOps; } + @Override public String rawString() { // TODO: add all attributes and other info return "<if-validate-method field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java Sun Jul 5 10:01:19 2009 @@ -98,6 +98,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { String typeString = methodContext.expandString(this.typeString); int type; @@ -220,10 +221,12 @@ return true; } + @Override public String rawString() { // TODO: add all attributes and other info return "<calculate field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java Sun Jul 5 10:01:19 2009 @@ -68,6 +68,7 @@ } } + @Override public boolean exec(MethodContext methodContext) { String levelStr = methodContext.expandString(this.levelStr); String message = methodContext.expandString(this.message); @@ -112,10 +113,12 @@ return true; } + @Override public String rawString() { // TODO: add all attributes and other info return "<log level=\"" + this.levelStr + "\" message=\"" + this.message + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java Sun Jul 5 10:01:19 2009 @@ -64,6 +64,7 @@ argListAcsr = new ContextAccessor<List<? extends Object>>(element.getAttribute("arg-list-name")); } + @Override public boolean exec(MethodContext methodContext) { String resource = methodContext.expandString(this.resource); String property = methodContext.expandString(this.property); @@ -106,10 +107,12 @@ return true; } + @Override public String rawString() { // TODO: add all attributes and other info return "<property-to-field field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java Sun Jul 5 10:01:19 2009 @@ -53,6 +53,7 @@ resultAcsr = new ContextAccessor<Object>(element.getAttribute("result-name"), fieldAcsr.toString()); } + @Override public boolean exec(MethodContext methodContext) { // only run this if it is in an SERVICE context if (methodContext.getMethodType() == MethodContext.SERVICE) { @@ -82,10 +83,12 @@ return true; } + @Override public String rawString() { // TODO: add all attributes and other info return "<field-to-result field-name=\"" + this.fieldAcsr + "\" map-name=\"" + this.mapAcsr + "\"/>"; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java Sun Jul 5 10:01:19 2009 @@ -58,6 +58,7 @@ } } + @Override public void exec(Map<String, Object> inMap, Map<String, Object> results, List<Object> messages, Locale locale, ClassLoader loader) {} public static Boolean doRealCompare(Object value1, Object value2, String operator, String type, String format, Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java Sun Jul 5 10:01:19 2009 @@ -33,6 +33,7 @@ this.value = element.getAttribute("value"); } + @Override public void exec(Map<String, Object> inMap, Map<String, Object> results, List<Object> messages, Locale locale, ClassLoader loader) { Object fieldValue = inMap.get(fieldName); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java Sun Jul 5 10:01:19 2009 @@ -33,6 +33,7 @@ this.compareName = element.getAttribute("field"); } + @Override public void exec(Map<String, Object> inMap, Map<String, Object> results, List<Object> messages, Locale locale, ClassLoader loader) { Object compareValue = inMap.get(compareName); Object fieldValue = inMap.get(fieldName); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java Sun Jul 5 10:01:19 2009 @@ -35,6 +35,7 @@ constant = UtilXml.elementValue(element); } + @Override public String exec(Map<String, Object> inMap, List<Object> messages, Locale locale, ClassLoader loader) { return constant; } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java Sun Jul 5 10:01:19 2009 @@ -55,6 +55,7 @@ format = element.getAttribute("format"); } + @Override public void exec(Map<String, Object> inMap, Map<String, Object> results, List<Object> messages, Locale locale, ClassLoader loader) { Object fieldObject = inMap.get(fieldName); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java Sun Jul 5 10:01:19 2009 @@ -43,6 +43,7 @@ setIfNull = !"false".equals(element.getAttribute("set-if-null")); } + @Override public void exec(Map<String, Object> inMap, Map<String, Object> results, List<Object> messages, Locale locale, ClassLoader loader) { Object fieldValue = inMap.get(fieldName); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java Sun Jul 5 10:01:19 2009 @@ -37,6 +37,7 @@ fieldName = element.getAttribute("field"); } + @Override public String exec(Map<String, Object> inMap, List<Object> messages, Locale locale, ClassLoader loader) { Object obj = inMap.get(fieldName); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java Sun Jul 5 10:01:19 2009 @@ -32,6 +32,7 @@ super(element, simpleMapProcess); } + @Override public void exec(Map<String, Object> inMap, Map<String, Object> results, List<Object> messages, Locale locale, ClassLoader loader) { Object obj = inMap.get(fieldName); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java Sun Jul 5 10:01:19 2009 @@ -39,6 +39,7 @@ property = element.getAttribute("property"); } + @Override public String exec(Map inMap, List messages, Locale locale, ClassLoader loader) { String propStr = UtilProperties.getPropertyValue(UtilURL.fromResource(resource, loader), property); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java Sun Jul 5 10:01:19 2009 @@ -47,6 +47,7 @@ } } + @Override public void exec(Map<String, Object> inMap, Map<String, Object> results, List<Object> messages, Locale locale, ClassLoader loader) { Object obj = inMap.get(fieldName); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java Sun Jul 5 10:01:19 2009 @@ -41,6 +41,7 @@ this.className = element.getAttribute("class"); } + @Override public void exec(Map<String, Object> inMap, Map<String, Object> results, List<Object> messages, Locale locale, ClassLoader loader) { Object obj = inMap.get(fieldName); Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java (original) +++ ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java Sun Jul 5 10:01:19 2009 @@ -60,10 +60,12 @@ this.delegator = delegator; } + @Override public GenericDelegator getDelegator() { return delegator; } + @Override public void setDelegator(GenericDelegator delegator) { this.delegator = delegator; } @@ -71,6 +73,7 @@ /** * @see org.ofbiz.security.Security#findUserLoginSecurityGroupByUserLoginId(java.lang.String) */ + @Override public Iterator<GenericValue> findUserLoginSecurityGroupByUserLoginId(String userLoginId) { List<GenericValue> collection = userLoginSecurityGroupByUserLoginId.get(userLoginId); @@ -92,6 +95,7 @@ /** * @see org.ofbiz.security.Security#securityGroupPermissionExists(java.lang.String, java.lang.String) */ + @Override public boolean securityGroupPermissionExists(String groupId, String permission) { GenericValue securityGroupPermissionValue = delegator.makeValue("SecurityGroupPermission", UtilMisc.toMap("groupId", groupId, "permissionId", permission)); @@ -116,6 +120,7 @@ /** * @see org.ofbiz.security.Security#hasPermission(java.lang.String, javax.servlet.http.HttpSession) */ + @Override public boolean hasPermission(String permission, HttpSession session) { GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); @@ -127,6 +132,7 @@ /** * @see org.ofbiz.security.Security#hasPermission(java.lang.String, org.ofbiz.entity.GenericValue) */ + @Override public boolean hasPermission(String permission, GenericValue userLogin) { if (userLogin == null) return false; @@ -144,6 +150,7 @@ /** * @see org.ofbiz.security.Security#hasEntityPermission(java.lang.String, java.lang.String, javax.servlet.http.HttpSession) */ + @Override public boolean hasEntityPermission(String entity, String action, HttpSession session) { GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); @@ -154,6 +161,7 @@ /** * @see org.ofbiz.security.Security#hasEntityPermission(java.lang.String, java.lang.String, org.ofbiz.entity.GenericValue) */ + @Override public boolean hasEntityPermission(String entity, String action, GenericValue userLogin) { if (userLogin == null) return false; @@ -179,6 +187,7 @@ /** * @see org.ofbiz.security.Security#hasRolePermission(java.lang.String, java.lang.String, java.lang.String, java.lang.String, javax.servlet.http.HttpSession) */ + @Override public boolean hasRolePermission(String application, String action, String primaryKey, String role, HttpSession session) { GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); return hasRolePermission(application, action, primaryKey, role, userLogin); @@ -187,6 +196,7 @@ /** * @see org.ofbiz.security.Security#hasRolePermission(java.lang.String, java.lang.String, java.lang.String, java.lang.String, org.ofbiz.entity.GenericValue) */ + @Override public boolean hasRolePermission(String application, String action, String primaryKey, String role, GenericValue userLogin) { List<String> roles = null; if (role != null && !role.equals("")) @@ -197,6 +207,7 @@ /** * @see org.ofbiz.security.Security#hasRolePermission(java.lang.String, java.lang.String, java.lang.String, java.util.List, javax.servlet.http.HttpSession) */ + @Override public boolean hasRolePermission(String application, String action, String primaryKey, List<String> roles, HttpSession session) { GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); return hasRolePermission(application, action, primaryKey, roles, userLogin); @@ -205,6 +216,7 @@ /** * @see org.ofbiz.security.Security#hasRolePermission(java.lang.String, java.lang.String, java.lang.String, java.util.List, org.ofbiz.entity.GenericValue) */ + @Override public boolean hasRolePermission(String application, String action, String primaryKey, List<String> roles, GenericValue userLogin) { String entityName = null; EntityCondition condition = null; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java Sun Jul 5 10:01:19 2009 @@ -329,7 +329,6 @@ * Gets the Security object associated with this dispatcher * @return Security object associated with this dispatcher */ - @Deprecated public Security getSecurity(); /** |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |