You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2005/04/26 09:08:29 UTC
svn commit: r164757 - in
/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core:
NodeImpl.java RepositoryImpl.java
Author: jukka
Date: Tue Apr 26 00:08:27 2005
New Revision: 164757
URL: http://svn.apache.org/viewcvs?rev=164757&view=rev
Log:
Fixed indentation of commented code (I broke it during tab removal :-( ).
Modified:
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java?rev=164757&r1=164756&r2=164757&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java Tue Apr 26 00:08:27 2005
@@ -311,23 +311,23 @@
genValues = new InternalValue[]{InternalValue.create(thisState.getUUID())};
}
/*
- todo consolidate version history creation code (currently in ItemImpl.initVersionHistories)
- } else if (nt.getQName().equals(MIX_VERSIONABLE)) {
- // mix:versionable node type
- VersionHistory hist = session.getVersionManager().getOrCreateVersionHistory(this);
- if (name.equals(JCR_VERSIONHISTORY)) {
- // jcr:versionHistory property
- genValues = new InternalValue[]{InternalValue.create(new UUID(hist.getUUID()))};
- } else if (name.equals(JCR_BASEVERSION)) {
- // jcr:baseVersion property
- genValues = new InternalValue[]{InternalValue.create(new UUID(hist.getRootVersion().getUUID()))};
- } else if (name.equals(JCR_ISCHECKEDOUT)) {
- // jcr:isCheckedOut property
- genValues = new InternalValue[]{InternalValue.create(true)};
- } else if (name.equals(JCR_PREDECESSORS)) {
- // jcr:predecessors property
- genValues = new InternalValue[]{InternalValue.create(new UUID(hist.getRootVersion().getUUID()))};
- }
+ todo consolidate version history creation code (currently in ItemImpl.initVersionHistories)
+ } else if (nt.getQName().equals(MIX_VERSIONABLE)) {
+ // mix:versionable node type
+ VersionHistory hist = session.getVersionManager().getOrCreateVersionHistory(this);
+ if (name.equals(JCR_VERSIONHISTORY)) {
+ // jcr:versionHistory property
+ genValues = new InternalValue[]{InternalValue.create(new UUID(hist.getUUID()))};
+ } else if (name.equals(JCR_BASEVERSION)) {
+ // jcr:baseVersion property
+ genValues = new InternalValue[]{InternalValue.create(new UUID(hist.getRootVersion().getUUID()))};
+ } else if (name.equals(JCR_ISCHECKEDOUT)) {
+ // jcr:isCheckedOut property
+ genValues = new InternalValue[]{InternalValue.create(true)};
+ } else if (name.equals(JCR_PREDECESSORS)) {
+ // jcr:predecessors property
+ genValues = new InternalValue[]{InternalValue.create(new UUID(hist.getRootVersion().getUUID()))};
+ }
*/
} else if (nt.getQName().equals(NT_HIERARCHYNODE)) {
// nt:hierarchyNode node type
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=164757&r1=164756&r2=164757&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java Tue Apr 26 00:08:27 2005
@@ -170,18 +170,18 @@
// load uuid of the repository's root node
InputStream in = uuidFile.getInputStream();
/*
- // uuid is stored in binary format (16 bytes)
- byte[] bytes = new byte[16];
- try {
- in.read(bytes);
- } finally {
- try {
- in.close();
- } catch (IOException ioe) {
- // ignore
- }
- }
- rootNodeUUID = new UUID(bytes).toString();
+ // uuid is stored in binary format (16 bytes)
+ byte[] bytes = new byte[16];
+ try {
+ in.read(bytes);
+ } finally {
+ try {
+ in.close();
+ } catch (IOException ioe) {
+ // ignore
+ }
+ }
+ rootNodeUUID = new UUID(bytes).toString(); // uuid is stored in binary format (16 bytes)
*/
// uuid is stored in text format (36 characters) for better readability
char[] chars = new char[36];