Jacques Le Roux
c2e23f819d
Fix a typo I made in r912587
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915332 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 13:26:37 +00:00
Adam Heath
90698c511a
Removed concurrent backport, as it is only useful when running on java
...
1.5, and ofbiz requires 1.6 now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915167 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 03:51:02 +00:00
Erwan de Ferrieres
de2a2f0abb
Corrected OFBIZ-3495 Removing a value from the webtools interface ( https://issues.apache.org/jira/browse/OFBIZ-3495 )
...
Thanks Olivier
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915044 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 20:07:57 +00:00
Adam Heath
350a287883
Make use of FSE.expand(), instead of expandString, to provide support
...
for direct setting of values in widgets. This closes OFBIZ-3486.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912645 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 16:34:47 +00:00
Adam Heath
38e3b6c5cc
Tests cases for expand feature. This finally brings us back to 100%
...
coverage on FSE.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912628 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 15:41:10 +00:00
Adam Heath
f94403991e
Add expand() variants, that don't cast the result to a string, instead
...
just returning the raw value directly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912625 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 15:40:16 +00:00
Adam Heath
6aa322189a
Use an internal key class, which shares the same character array, as the
...
key in the cache.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912624 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 15:39:40 +00:00
Adam Heath
b262ef487e
CurrElem no longer creates a new string for nested expression
...
evaluation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912623 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 15:39:13 +00:00
Adam Heath
3197175d18
Add testing on CurrElem.isEmpty.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912622 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 15:38:44 +00:00
Adam Heath
ace8638618
Memory reduction on const elements; this was done by making the common
...
path, the case where you have a plain string that needs to be converted
to FSE, just contain a single char array; this is how it used to be. In
other cases, constant strings will still share the array of chars with
other nested instances.
This commit does not have 100% coverage. That will be fixed shortly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912621 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 15:38:07 +00:00
Adam Heath
ff54da1f0e
Fix several spacing issues, no other changes.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912619 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 15:37:38 +00:00
Adam Heath
e701384495
Add @Override annotation on several methods.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912618 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 15:37:11 +00:00
Adam Heath
0a1109c76b
Make all the exact instance append methods protected, just like the
...
method they are supposed to implement.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912617 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 15:36:41 +00:00
Adam Heath
ca07e2f00e
Change type of compare object to String.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912616 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 15:36:07 +00:00
Jacques Le Roux
dfcf76790c
Fix a bug visible in IE8, reported by Koon Sang on user ML, fix suggested by James SG
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912587 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 14:42:54 +00:00
Bilgin Ismet Ibryam
0d9386bb26
Changed UtilDateTime.getDayEnd method to set 0 nanoseconds instead of 999999999. This change is needed for compatibility with MSSQL datetime field which has accuracy of 3 milliseconds.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912509 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 08:36:21 +00:00
Bilgin Ismet Ibryam
75f2d0f5dc
Fix typo in RequestHandler.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912507 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 08:25:50 +00:00
Adam Heath
0a0abee244
Remove dead code. At this point, FSE has full test coverage.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912286 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:34:47 +00:00
Adam Heath
1ff7fd79c0
toString now calls getOriginal.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912285 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:34:17 +00:00
Adam Heath
fb997ed8e9
If there is no ${, then don't create a list just to add a single item to
...
it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912284 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:33:44 +00:00
Adam Heath
e2712b8a9e
BUG FIX: Fix getOriginal and toString, to return the unparsed version.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912283 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:33:12 +00:00
Adam Heath
15876ae52d
Add variant of getInstance that allows the caching to be skipped.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912282 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:32:39 +00:00
Adam Heath
34d06a62c1
BUG FIX: Fix parsing of currency when there is no variable, and no
...
trailing ).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912281 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:32:00 +00:00
Adam Heath
cadd966d80
BUG FIX: Fix parsing of currency, by using the correct subExpression,
...
instead of the entire parent expression.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912280 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:31:30 +00:00
Adam Heath
60765d55f4
Lots and lots of tests for FSE; not 100% coverage, there are some bugs
...
that need to be fixed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912279 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:30:59 +00:00
Adam Heath
9a104c6b8d
BUG FIX: During static expansion, if the context was null, then the
...
passed expression would be returned. This is not what would occur if
you called getInstance(null), as that always returns an FSE that expands
to "". So, fix static expansion to return "" if the expression is null.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912278 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:30:27 +00:00
Adam Heath
2f952125f2
Move the testMap assignments to the beginning of the method.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912277 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:29:57 +00:00
Adam Heath
ada3f15e23
Extend fseTest to check isEmpty.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912276 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:29:29 +00:00
Adam Heath
a06cf78184
Create an fseTest helper method.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912275 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:29:02 +00:00
Adam Heath
edf6b0952a
Remove local compare object.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912274 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:28:27 +00:00
Adam Heath
0f4bed043d
Switch assertTrue calls to assertEquals.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912273 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:28:00 +00:00
Adam Heath
f7ec7cb185
Move FlexibleStringExpander tests to a separate file.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912272 13f79535-47bb-0310-9956-ffa450edef68
2010-02-21 01:27:32 +00:00
Scott Gray
21251f0907
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.model.ModelIndex.getMainEntity()
- Use ModelIndex.getModelEntity() instead
org.ofbiz.entity.model.ModelIndex.setMainEntity(ModelEntity)
- Use one of the ModelIndex constructors instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912250 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 23:16:17 +00:00
Scott Gray
1d8fbd982e
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.model.ModelEntity.getPk(int)
- Use ModelEntity.getPksIterator() instead
org.ofbiz.entity.model.ModelEntity.getNopk(int)
- Use ModelEntity.getNopksIterator() instead
org.ofbiz.entity.model.ModelEntity.getField(int)
- Use ModelEntity.getFieldsIterator() instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912249 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 23:10:09 +00:00
Scott Gray
318b7ae549
Reverting r912247, not all methods removed had been deprecated prior to 9.04
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912248 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 23:04:51 +00:00
Scott Gray
27ef95fa9c
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.model.ModelEntity.getPk(int)
- Use ModelEntity.getPksIterator() instead
org.ofbiz.entity.model.ModelEntity.getPksCopy()
- Use ModelEntity.getPkFieldsUnmodifiable() instead
org.ofbiz.entity.model.ModelEntity.getNopk(int)
- Use ModelEntity.getNopksIterator() instead
org.ofbiz.entity.model.ModelEntity.getField(int)
- Use ModelEntity.getFieldsIterator() instead
org.ofbiz.entity.model.ModelEntity.getFieldsCopy()
- Use ModelEntity.getFieldsUnmodifiable() instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912247 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 22:59:22 +00:00
Scott Gray
a4c34e4e34
Added missing code necessary to generate relation elements in ModelEntity.toXmlElement(...)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912246 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 22:53:22 +00:00
Scott Gray
5145912da8
- Added @SuppressWarnings("hiding") to field module (hides ModelInfo.module)
...
- Comment typo fix
- Removed a couple of unnecessary casts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912245 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 22:53:18 +00:00
Scott Gray
1a31419fcd
Removed all uses of deprecated method ModelEntity.getFieldsCopy()
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912244 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 22:53:14 +00:00
Scott Gray
a830f3f436
Removed all uses of deprecated method ModelEntity.getField(int)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912243 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 22:53:09 +00:00
Scott Gray
2c2da0e964
Removed all uses of deprecated method ModelEntity.getNopk(int)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912241 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 22:52:58 +00:00
Scott Gray
96a474870c
Removed all uses of deprecated method ModelEntity.getPk(int)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912240 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 22:52:53 +00:00
Scott Gray
b44d9fde91
Javadoc typo fix
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912227 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 21:15:06 +00:00
Scott Gray
5bfd3c432b
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.condition.EntityWhereString(String)
- Use EntityCondition.makeConditionWhere(String) instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912226 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 21:15:00 +00:00
Scott Gray
114ea16f93
Removed unneccesary semicolons
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912225 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 21:09:28 +00:00
Scott Gray
51bcefa91d
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.condition.EntityFunction.LENGTH(EntityConditionValue)
- Use EntityFunction.LENGTH(EntityConditionValue) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.LENGTH(Object)
- Use EntityFunction.LENGTH(Object) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.TRIM(EntityConditionValue)
- Use EntityFunction.TRIM(EntityConditionValue) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.TRIM(Object)
- Use EntityFunction.TRIM(Object) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.UPPER(EntityConditionValue)
- Use EntityFunction.UPPER(EntityConditionValue) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.UPPER(Object)
- Use EntityFunction.UPPER(Object) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.LOWER(EntityConditionValue)
- Use EntityFunction.LOWER(EntityConditionValue) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.LOWER(Object)
- Use EntityFunction.LOWER(Object) instead (method rather than constructor)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912224 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 21:09:23 +00:00
Scott Gray
a3e3df15af
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.condition.EntityFieldValue(String)
- Use EntityFieldValue.makeFieldValue(String) instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912221 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 20:50:49 +00:00
Scott Gray
e0563af6cd
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.condition.EntityFieldMap(EntityComparisonOperator<L, R>, EntityJoinOperator, V…)
- Use EntityCondition.makeCondition(EntityComparisonOperator<L, R>, EntityJoinOperator, Object…) instead
org.ofbiz.entity.condition.EntityFieldMap(Map<String,V>, EntityComparisonOperator<L, R>, EntityJoinOperator)
- Use EntityCondition.makeCondition(Map<String, ? extends Object>, EntityComparisonOperator<L, R>, EntityJoinOperator) instead
org.ofbiz.entity.condition.EntityFieldMap(EntityJoinOperator, Object...)
- Use EntityCondition.makeCondition(EntityJoinOperator, Object...) instead
org.ofbiz.entity.condition.EntityFieldMap(Map<String, ? extends Object>, EntityJoinOperator)
- Use EntityCondition.makeCondition(Map<String, ? extends Object>, EntityJoinOperator) instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912220 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 20:47:27 +00:00
Scott Gray
ea65488869
Removed unneccesary deprecation warning suppression
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912212 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 20:19:35 +00:00
Scott Gray
0c3baeae57
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.condition.EntityExpr(L, EntityComparisonOperator<L,R>, R)
- Use EntityCondition.makeCondition(L, EntityComparisonOperator<LL,RR>, R) instead
org.ofbiz.entity.condition.EntityExpr(String, EntityComparisonOperator<String,R>, R)
- Use EntityCondition.makeCondition(L, EntityComparisonOperator<LL,RR>, R) instead
org.ofbiz.entity.condition.EntityExpr(L, boolean, EntityComparisonOperator<L,R>, R, boolean)
- Use EntityCondition.makeCondition(L, EntityComparisonOperator<LL,RR>, R) instead
- Use EntityFunction.UPPER_FIELD(L) in place of leftUpper = true
- Use EntityFunction.UPPER(R) in place of rightUpper = true
org.ofbiz.entity.condition.EntityExpr(EntityCondition, EntityJoinOperator, EntityCondition)
- Use EntityCondition.makeCondition(EntityCondition, EntityJoinOperator, EntityCondition) instead
org.ofbiz.entity.condition.EntityExpr.setLUpper(boolean)
org.ofbiz.entity.condition.EntityExpr.isLUpper()
org.ofbiz.entity.condition.EntityExpr.isRUpper()
org.ofbiz.entity.condition.EntityExpr.setRUpper(boolean)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912211 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 20:19:30 +00:00