Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4074] branches/openutils-bshd5-backport
|
From: <gca...@us...> - 2012-06-29 13:17:47
|
Revision: 4074
http://openutils.svn.sourceforge.net/openutils/?rev=4074&view=rev
Author: gcatania
Date: 2012-06-29 13:17:38 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Merged revisions 4073 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5
........
r4073 | gcatania | 2012-06-29 15:14:53 +0200 (Fri, 29 Jun 2012) | 1 line
BSHD-15 fixed for FilterMetadataSupport, readability improvement
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4073&view=rev
Modified Paths:
--------------
branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java
branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
Property Changed:
----------------
branches/openutils-bshd5-backport/
branches/openutils-bshd5-backport/pom.xml
branches/openutils-bshd5-backport/src/
Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
- /trunk/openutils-bshd5:1-4040,4042-4056,4058-4071
+ /trunk/openutils-bshd5:1-4040,4042-4056,4058-4073
Modified: svn:mergeinfo
- /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*
+ /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*
Property changes on: branches/openutils-bshd5-backport/pom.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070
+ /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073
Property changes on: branches/openutils-bshd5-backport/src
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070
+ /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2012-06-29 13:14:53 UTC (rev 4073)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2012-06-29 13:17:38 UTC (rev 4074)
@@ -67,7 +67,7 @@
private Character escapeCharacter;
- private PropertySelector selector;
+ private PropertySelector selector = new ExcludeBackrefPropertySelector(); // BSHD-15
private MatchMode matchMode;
@@ -343,7 +343,7 @@
{
ex.ignoreCase();
}
- ex.setPropertySelector(selector != null ? selector : new ExcludeBackrefPropertySelector()); // BSHD-15
+ ex.setPropertySelector(selector);
Set<String> excludedPropertiesForPath = excludedProperties.get(associationPath);
if (excludedPropertiesForPath != null)
{
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2012-06-29 13:14:53 UTC (rev 4073)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2012-06-29 13:17:38 UTC (rev 4074)
@@ -193,6 +193,7 @@
private Example example(Object entity, Set<String> propertiesToExclude)
{
Example ex = Example.create(entity);
+ ex.setPropertySelector(new ExcludeBackrefPropertySelector()); // BSHD-15
for (String propertyName : propertiesToExclude)
{
// skip properties handled by filterMetadata
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
