[dna-commits] DNA SVN: r1334 - trunk/dna-graph/src/main/java/org/jboss/dna/graph/request.
dna-commits at lists.jboss.org
dna-commits at lists.jboss.org
Mon Nov 23 17:46:42 EST 2009
Author: rhauch
Date: 2009-11-23 17:46:41 -0500 (Mon, 23 Nov 2009)
New Revision: 1334
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/ChangeRequest.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CloneBranchRequest.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CopyBranchRequest.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CreateNodeRequest.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteBranchRequest.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteChildrenRequest.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/LockBranchRequest.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/MoveBranchRequest.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RemovePropertyRequest.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RenameNodeRequest.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/SetPropertyRequest.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/UnlockBranchRequest.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/UpdatePropertiesRequest.java
Log:
Merge branch 'patches'
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/ChangeRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/ChangeRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/ChangeRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -47,7 +47,8 @@
Path path );
/**
- * Get the location of the top-most node that is to be changed by this request.
+ * Get the location of the top-most node that is to be changed by this request. If this request has been completed, this
+ * location will always have a {@link Location#getPath() path}.
*
* @return the location changed by this request
*/
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CloneBranchRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CloneBranchRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CloneBranchRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -261,7 +261,7 @@
*/
@Override
public Location changedLocation() {
- return into;
+ return actualIntoLocation != null ? actualIntoLocation : into;
}
/**
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CopyBranchRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CopyBranchRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CopyBranchRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -268,7 +268,7 @@
*/
@Override
public Location changedLocation() {
- return into;
+ return actualIntoLocation != null ? actualIntoLocation : into;
}
/**
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CreateNodeRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CreateNodeRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CreateNodeRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -322,7 +322,7 @@
*/
@Override
public Location changedLocation() {
- return actualLocation;
+ return actualLocation != null ? actualLocation : under;
}
/**
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteBranchRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteBranchRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteBranchRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -131,7 +131,7 @@
*/
@Override
public Location changedLocation() {
- return at;
+ return actualLocation != null ? actualLocation : at;
}
/**
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteChildrenRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteChildrenRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteChildrenRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -217,7 +217,7 @@
*/
@Override
public Location changedLocation() {
- return at;
+ return actualLocation != null ? actualLocation : at;
}
/**
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/LockBranchRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/LockBranchRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/LockBranchRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -167,7 +167,7 @@
*/
@Override
public Location changedLocation() {
- return actualLocation;
+ return actualLocation != null ? actualLocation : at;
}
/**
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/MoveBranchRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/MoveBranchRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/MoveBranchRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -297,12 +297,15 @@
/**
* {@inheritDoc}
+ * <p>
+ * This method returns the {@link #getActualLocationAfter()} location, or if null the {@link #into()} location.
+ * </p>
*
* @see org.jboss.dna.graph.request.ChangeRequest#changedLocation()
*/
@Override
public Location changedLocation() {
- return into != null ? into : before;
+ return actualNewLocation != null ? actualNewLocation : into != null ? into : before;
}
/**
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RemovePropertyRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RemovePropertyRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RemovePropertyRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -186,7 +186,7 @@
*/
@Override
public Location changedLocation() {
- return from;
+ return actualLocation != null ? actualLocation : from;
}
/**
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RenameNodeRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RenameNodeRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RenameNodeRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -138,6 +138,7 @@
String msg = GraphI18n.actualNewLocationMustHaveSameNameAsRequest.text(newLocation, toName());
throw new IllegalArgumentException(msg);
}
+ this.actualOldLocation = oldLocation;
this.actualNewLocation = newLocation;
}
@@ -172,12 +173,15 @@
/**
* {@inheritDoc}
+ * <p>
+ * This method returns the {@link #getActualLocationAfter()} location, or if null the {@link #at()} location.
+ * </p>
*
* @see org.jboss.dna.graph.request.ChangeRequest#changedLocation()
*/
@Override
public Location changedLocation() {
- return at;
+ return actualNewLocation != null ? actualNewLocation : at;
}
/**
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/SetPropertyRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/SetPropertyRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/SetPropertyRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -187,7 +187,7 @@
*/
@Override
public Location changedLocation() {
- return on;
+ return actualLocation != null ? actualLocation : on;
}
/**
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/UnlockBranchRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/UnlockBranchRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/UnlockBranchRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -133,7 +133,7 @@
*/
@Override
public Location changedLocation() {
- return actualLocation;
+ return actualLocation != null ? actualLocation : at;
}
/**
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/UpdatePropertiesRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/UpdatePropertiesRequest.java 2009-11-23 20:41:11 UTC (rev 1333)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/UpdatePropertiesRequest.java 2009-11-23 22:46:41 UTC (rev 1334)
@@ -204,7 +204,7 @@
*/
@Override
public Location changedLocation() {
- return on;
+ return actualLocation != null ? actualLocation : on;
}
/**
More information about the dna-commits
mailing list