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 2010/12/16 11:55:50 UTC
svn commit: r1049911 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/
Author: angela
Date: Thu Dec 16 10:55:50 2010
New Revision: 1049911
URL: http://svn.apache.org/viewvc?rev=1049911&view=rev
Log:
minor improvement
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVersionHistory.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplRestore.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java?rev=1049911&r1=1049910&r2=1049911&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java Thu Dec 16 10:55:50 2010
@@ -50,6 +50,7 @@ class InternalFrozenVHImpl extends Inter
/**
* {@inheritDoc}
*/
+ @Override
public NodeId getId() {
return node.getNodeId();
}
@@ -81,10 +82,18 @@ class InternalFrozenVHImpl extends Inter
}
/**
- * {@inheritDoc}
+ * @deprecate Use {@link #getBaseVersion()} instead.
*/
public InternalVersion getBaseVesion()
throws VersionException {
+ return getBaseVersion();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public InternalVersion getBaseVersion()
+ throws VersionException {
try {
InternalVersionHistory history = vMgr.getVersionHistory(getVersionHistoryId());
return history.getVersion(getBaseVersionId());
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVersionHistory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVersionHistory.java?rev=1049911&r1=1049910&r2=1049911&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVersionHistory.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVersionHistory.java Thu Dec 16 10:55:50 2010
@@ -53,11 +53,16 @@ public interface InternalFrozenVersionHi
NodeId getBaseVersionId();
/**
+ * @deprecate use {@link #getBaseVersion()} instead
+ */
+ InternalVersion getBaseVesion() throws VersionException;
+
+ /**
* Returns the base version that was assigned to the node at
* the time it was versioned.
*
- * @return the inernal base version
+ * @return the internal base version
* @throws VersionException if the version could not be retrieved
*/
- InternalVersion getBaseVesion() throws VersionException;
+ InternalVersion getBaseVersion() throws VersionException;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java?rev=1049911&r1=1049910&r2=1049911&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java Thu Dec 16 10:55:50 2010
@@ -114,7 +114,7 @@ class InternalVersionHistoryImpl extends
}
/**
- * Initialies the history and loads all internal caches
+ * Initializes the history and loads all internal caches
*
* @throws RepositoryException if an error occurs
*/
@@ -243,6 +243,7 @@ class InternalVersionHistoryImpl extends
/**
* {@inheritDoc}
*/
+ @Override
public NodeId getId() {
return historyId;
}
@@ -250,6 +251,7 @@ class InternalVersionHistoryImpl extends
/**
* {@inheritDoc}
*/
+ @Override
public InternalVersionItem getParent() {
return null;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java?rev=1049911&r1=1049910&r2=1049911&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java Thu Dec 16 10:55:50 2010
@@ -71,7 +71,7 @@ class InternalVersionImpl extends Intern
/**
* Creates a new internal version with the given version history and
- * persistance node. please note, that versions must be created by the
+ * persistence node. please note, that versions must be created by the
* version history.
*
* @param vh containing version history
@@ -94,6 +94,7 @@ class InternalVersionImpl extends Intern
/**
* {@inheritDoc}
*/
+ @Override
public NodeId getId() {
return node.getNodeId();
}
@@ -101,6 +102,7 @@ class InternalVersionImpl extends Intern
/**
* {@inheritDoc}
*/
+ @Override
public InternalVersionItem getParent() {
return versionHistory;
}
@@ -265,7 +267,7 @@ class InternalVersionImpl extends Intern
}
/**
- * stores the given successors or predecessors to the persistance node
+ * stores the given successors or predecessors to the persistence node
*
* @param cessors list of versions to store
* @param propname property name to store
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplRestore.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplRestore.java?rev=1049911&r1=1049910&r2=1049911&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplRestore.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplRestore.java Thu Dec 16 10:55:50 2010
@@ -580,7 +580,7 @@ abstract public class VersionManagerImpl
// choose the initial one
List<InternalVersion> vs = vh.getRootVersion().getSuccessors();
if (vs.isEmpty()) {
- String msg = "Unable to select appropariate version for "
+ String msg = "Unable to select appropriate version for "
+ child.getName() + " using " + vsel;
log.error(msg);
throw new VersionException(msg);