You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2007/08/22 14:54:39 UTC
svn commit: r568601 -
/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java
Author: reschke
Date: Wed Aug 22 05:54:39 2007
New Revision: 568601
URL: http://svn.apache.org/viewvc?rev=568601&view=rev
Log:
JCR-1074: fix getNodeTypeSpec() so that the list of super types is properly handled if all of them are custom.
Modified:
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java?rev=568601&r1=568600&r2=568601&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java Wed Aug 22 05:54:39 2007
@@ -261,21 +261,22 @@
writer.println(" " + typeName);
writer.println("Supertypes");
NodeType[] supertypes = type.getDeclaredSupertypes();
- if (supertypes.length > 0) {
- Arrays.sort(supertypes, NODE_TYPE_COMPARATOR);
- for (int i = 0; i < supertypes.length; i++) {
- String name = supertypes[i].getName();
- if (name.startsWith("nt:") ||
- (name.equals("mix:referenceable") &&
- (typeName.equals("mix:versionable") ||
- typeName.equals("nt:resource") ||
- typeName.equals("nt:versionHistory") ||
- typeName.equals("nt:version") ||
- typeName.equals("nt:frozenNode")))) {
- writer.println(" " + supertypes[i].getName());
- }
+ Arrays.sort(supertypes, NODE_TYPE_COMPARATOR);
+ boolean hasPrinted = false;
+ for (int i = 0; i < supertypes.length; i++) {
+ String name = supertypes[i].getName();
+ if (name.startsWith("nt:") ||
+ (name.equals("mix:referenceable") &&
+ (typeName.equals("mix:versionable") ||
+ typeName.equals("nt:resource") ||
+ typeName.equals("nt:versionHistory") ||
+ typeName.equals("nt:version") ||
+ typeName.equals("nt:frozenNode")))) {
+ writer.println(" " + supertypes[i].getName());
+ hasPrinted = true;
}
- } else {
+ }
+ if (!hasPrinted) {
writer.println(" []");
}
writer.println("IsMixin");