You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2009/06/10 20:47:01 UTC
svn commit: r783447 - in /jackrabbit/trunk:
jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/
jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/
jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/...
Author: angela
Date: Wed Jun 10 18:46:57 2009
New Revision: 783447
URL: http://svn.apache.org/viewvc?rev=783447&view=rev
Log:
minor improvement (redundant casts)
Modified:
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCloneSameNameSibsTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyBetweenWorkspacesSameNameSibsTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopySameNameSibsTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveSameNameSibsTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractCopy.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCloneSameNameSibsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCloneSameNameSibsTest.java?rev=783447&r1=783446&r2=783447&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCloneSameNameSibsTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCloneSameNameSibsTest.java Wed Jun 10 18:46:57 2009
@@ -51,7 +51,7 @@
int cnt = 0;
NodeIterator iter = node2.getNodes();
while (iter.hasNext()) {
- Node n = (Node) iter.nextNode();
+ Node n = iter.nextNode();
assertTrue(n.getName().equals(orderList[cnt]));
cnt++;
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyBetweenWorkspacesSameNameSibsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyBetweenWorkspacesSameNameSibsTest.java?rev=783447&r1=783446&r2=783447&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyBetweenWorkspacesSameNameSibsTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyBetweenWorkspacesSameNameSibsTest.java Wed Jun 10 18:46:57 2009
@@ -50,7 +50,7 @@
int cnt = 0;
NodeIterator iter = node2.getNodes();
while (iter.hasNext()) {
- Node n = (Node) iter.nextNode();
+ Node n = iter.nextNode();
assertTrue(n.getName().equals(orderList[cnt]));
cnt++;
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopySameNameSibsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopySameNameSibsTest.java?rev=783447&r1=783446&r2=783447&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopySameNameSibsTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopySameNameSibsTest.java Wed Jun 10 18:46:57 2009
@@ -60,7 +60,7 @@
int cnt = 0;
NodeIterator iter = node2.getNodes();
while (iter.hasNext()) {
- Node n = (Node) iter.nextNode();
+ Node n = iter.nextNode();
assertTrue(n.getName().equals(orderList[cnt]));
cnt++;
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveSameNameSibsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveSameNameSibsTest.java?rev=783447&r1=783446&r2=783447&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveSameNameSibsTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveSameNameSibsTest.java Wed Jun 10 18:46:57 2009
@@ -64,7 +64,7 @@
int cnt = 0;
NodeIterator iter = node2.getNodes();
while (iter.hasNext()) {
- Node n = (Node) iter.nextNode();
+ Node n = iter.nextNode();
assertTrue(n.getName().equals(orderList[cnt]));
cnt++;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractCopy.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractCopy.java?rev=783447&r1=783446&r2=783447&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractCopy.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractCopy.java Wed Jun 10 18:46:57 2009
@@ -49,7 +49,7 @@
throws RepositoryException {
NodeState srcItemState = getNodeState(srcPath, srcMgrProvider.getHierarchyManager());
- this.srcState = (NodeState)srcItemState;
+ this.srcState = srcItemState;
this.destParentState = getNodeState(destPath.getAncestor(1), destMgrProvider.getHierarchyManager());
// check for illegal index present in destination path
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java?rev=783447&r1=783446&r2=783447&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java Wed Jun 10 18:46:57 2009
@@ -60,7 +60,7 @@
//----------------------------------------< Access Operation Parameters >---
public NodeId getNodeId() throws RepositoryException {
- return (NodeId) nodeState.getNodeId();
+ return nodeState.getNodeId();
}
//------------------------------------------------------------< Factory >---
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java?rev=783447&r1=783446&r2=783447&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java Wed Jun 10 18:46:57 2009
@@ -215,7 +215,7 @@
// assert that the entry is available
conflicting.getItemState();
- nodeState = resolveUUIDConflict(parent, (NodeEntry) conflicting, nodeInfo);
+ nodeState = resolveUUIDConflict(parent, conflicting, nodeInfo);
} catch (ItemNotFoundException e) {
// no conflict: create new with given uuid
nodeState = importNode(nodeInfo, parent);
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java?rev=783447&r1=783446&r2=783447&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java Wed Jun 10 18:46:57 2009
@@ -204,7 +204,7 @@
public void testExternalRemoval() throws RepositoryException, NotExecutableException {
String uuid = refNode.getUUID();
- Node refNode2 = (Node) testSession.getNodeByUUID(uuid);
+ Node refNode2 = testSession.getNodeByUUID(uuid);
String srcPath = refNode.getPath();
String destPath = destParentNode.getPath() + "/" + nodeName2;
@@ -230,7 +230,7 @@
refNode.save();
String uuid = refNode.getUUID();
- Node refNode2 = (Node) testSession.getNodeByUUID(uuid);
+ Node refNode2 = testSession.getNodeByUUID(uuid);
Node c2 = (Node) testSession.getItem(childN.getPath());
Property p2 = (Property) testSession.getItem(p.getPath());
// transiently remove the property -> test effect of external removal.
@@ -258,7 +258,7 @@
refNode.save();
String uuid = refNode.getUUID();
- Node refNode2 = (Node) testSession.getNodeByUUID(uuid);
+ Node refNode2 = testSession.getNodeByUUID(uuid);
Node c2 = (Node) testSession.getItem(childN.getPath());
Property p2 = (Property) testSession.getItem(p.getPath());
// transiently modify -> test effect of external removal.