[exo-jcr-commits] exo-jcr SVN: r2913 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core: value and 1 other directory.

[do-not-reply at jboss.org]

Author: nzamosenchuk
Date: 2010-08-13 07:56:46 -0400 (Fri, 13 Aug 2010)
New Revision: 2913

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java
Log:
EXOJCR-776 : Repository.toString returns also def.workspace and the whole list of workspaces, Value.toString returns value, if it is possible.

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java	2010-08-13 09:06:03 UTC (rev 2912)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java	2010-08-13 11:56:46 UTC (rev 2913)
@@ -49,6 +49,7 @@
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -637,7 +638,7 @@
    public void removeWorkspace(String workspaceName) throws RepositoryException
    {
       if (!canRemoveWorkspace(workspaceName))
-
+         
          throw new RepositoryException("Workspace " + workspaceName + " in use. If you want to "
             + " remove workspace close all open sessions");
 
@@ -725,8 +726,10 @@
          default :
             stateTitle = "undefined";
       }
-      return String.format("Repository {\n name: %s;\n system workspace: %s;\n state: %s \n}", name,
-         systemWorkspaceName, stateTitle);
+      String defaultWorkspaceName = config.getDefaultWorkspaceName();
+      return String.format(
+         "Repository {\n name: %s;\n system workspace: %s;\n default workspace: %s;\n workspaces: %s;\n state: %s \n}",
+         name, systemWorkspaceName, defaultWorkspaceName, Arrays.toString(getWorkspaceNames()), stateTitle);
    }
 
 }

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java	2010-08-13 09:06:03 UTC (rev 2912)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java	2010-08-13 11:56:46 UTC (rev 2913)
@@ -426,6 +426,8 @@
    public String toString()
    {
       String typeName;
+      // contains size or value
+      String info;
       try
       {
          typeName = PropertyType.nameFromValue(type);
@@ -435,8 +437,27 @@
          // Value has abnormal type
          typeName = String.valueOf(type);
       }
-      return String.format("Value {\n type: %s;\n data-class: %s;\n size: %s bytes\n}", typeName, internalData == null
-         ? null : internalData.getClass().getName(), internalData == null ? "undefined" : internalData.getLength());
+      if (type == PropertyType.BINARY)
+      {
+         info = "size: " + ((internalData == null) ? "undefined" : (internalData.getLength() + " bytes"));
+      }
+      else
+      {
+         try
+         {
+            info = "value: '" + getString() + "'";
+         }
+         catch (IllegalStateException e)
+         {
+            info = "can't retrieve value";
+         }
+         catch (RepositoryException e)
+         {
+            info = "can't retrieve value";
+         }
+      }
+      return String.format("Value {\n type: %s;\n data-class: %s;\n %s\n}", typeName, internalData == null ? null
+         : internalData.getClass().getName(), info);
    }
 
 }