You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/03/15 19:29:06 UTC
svn commit: r1457049 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser:
ASTDbPath.java ASTObjPath.java
Author: aadamchik
Date: Fri Mar 15 18:29:05 2013
New Revision: 1457049
URL: http://svn.apache.org/r1457049
Log:
CAY-1803 Define toString() in path expressions
actually reimplementing toString
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java?rev=1457049&r1=1457048&r2=1457049&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java Fri Mar 15 18:29:05 2013
@@ -33,7 +33,7 @@ import org.apache.cayenne.map.Entity;
* @since 1.1
*/
public class ASTDbPath extends ASTPath {
-
+
public static final String DB_PREFIX = "db:";
ASTDbPath(int id) {
@@ -64,19 +64,16 @@ public class ASTDbPath extends ASTPath {
protected Map<?, ?> toMap(Object o) {
if (o instanceof Map) {
return (Map<?, ?>) o;
- }
- else if (o instanceof ObjectId) {
+ } else if (o instanceof ObjectId) {
return ((ObjectId) o).getIdSnapshot();
- }
- else if (o instanceof Persistent) {
+ } else if (o instanceof Persistent) {
Persistent persistent = (Persistent) o;
// TODO: returns ObjectId snapshot for now.. should probably
// retrieve full snapshot...
ObjectId oid = persistent.getObjectId();
return (oid != null) ? oid.getIdSnapshot() : null;
- }
- else {
+ } else {
return null;
}
}
@@ -96,7 +93,7 @@ public class ASTDbPath extends ASTPath {
pw.print(DB_PREFIX);
pw.print(path);
}
-
+
/**
* @since 3.0
*/
@@ -109,6 +106,15 @@ public class ASTDbPath extends ASTPath {
pw.print(path);
}
+ /**
+ * @since 3.2
+ */
+ @Override
+ public String toString() {
+ // shouldn't rely on super, see CAY-1803
+ return DB_PREFIX + path;
+ }
+
@Override
public int getType() {
return Expression.DB_PATH;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java?rev=1457049&r1=1457048&r2=1457049&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java Fri Mar 15 18:29:05 2013
@@ -83,6 +83,15 @@ public class ASTObjPath extends ASTPath
pw.print('.');
pw.print(path);
}
+
+ /**
+ * @since 3.2
+ */
+ @Override
+ public String toString() {
+ // shouldn't rely on super, see CAY-1803
+ return path;
+ }
@Override
public int getType() {