[exo-jcr-commits] exo-jcr SVN: r1234 - in jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr: impl/core/value and 2 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Dec 29 08:34:35 EST 2009


Author: tolusha
Date: 2009-12-29 08:34:34 -0500 (Tue, 29 Dec 2009)
New Revision: 1234

Modified:
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/value/ExtendedValue.java
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/AbstractPersistedValueData.java
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CleanableFilePersistedValueData.java
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/StreamPersistedValueData.java
Log:
EXOJCR-300: code cleanup

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/value/ExtendedValue.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/value/ExtendedValue.java	2009-12-29 12:38:58 UTC (rev 1233)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/value/ExtendedValue.java	2009-12-29 13:34:34 UTC (rev 1234)
@@ -39,14 +39,6 @@
     */
    public int getOrderNumber();
 
-   // TODO cleanup
-//   /**
-//    * Set order value in the list
-//    * 
-//    * @return order value in the list
-//    */
-//   public void setOrderNumber(int orderNumber);
-
    /**
     * Return length of the value .
     * 

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java	2009-12-29 12:38:58 UTC (rev 1233)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java	2009-12-29 13:34:34 UTC (rev 1234)
@@ -296,25 +296,9 @@
       }
    }
 
-   // TODO cleanup
-//   /**
-//    * {@inheritDoc}
-//    */
-//   public void setOrderNumber(int order)
-//   {
-//      try
-//      {
-//         getLocalData(type == PropertyType.BINARY).setOrderNumber(order);
-//      }
-//      catch (IOException e)
-//      {
-//         throw new RuntimeException(e);
-//      }
-//   }
-
    /**
-    * {@inheritDoc}
-    */
+     * {@inheritDoc}
+     */
    public long read(OutputStream stream, long length, long position) throws IOException, RepositoryException
    {
       return getInternalData().read(stream, length, position);

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/AbstractPersistedValueData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/AbstractPersistedValueData.java	2009-12-29 12:38:58 UTC (rev 1233)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/AbstractPersistedValueData.java	2009-12-29 13:34:34 UTC (rev 1234)
@@ -61,13 +61,12 @@
 
       return false;
    }
-   
+
    /**
     * Create transient copy of persisted data.
     * 
     * @return TransientValueData
     * @throws RepositoryException if error ocurs
     */
-   @Deprecated
    public abstract TransientValueData createTransientCopy() throws RepositoryException;
 }

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java	2009-12-29 12:38:58 UTC (rev 1233)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java	2009-12-29 13:34:34 UTC (rev 1234)
@@ -383,38 +383,7 @@
          return new String(getAsByteArray(), Constants.DEFAULT_ENCODING);
       }
 
-      // ///////////////////////////////////
       /**
-       * Make sense for stream storage only.
-       * 
-       * @param cleaner
-       *          FileCleaner
-       */
-      @Deprecated
-      public void setFileCleaner(FileCleaner cleaner)
-      {
-         this.fileCleaner = cleaner;
-      }
-
-      // TODO 
-      //   /**
-      //    * @param tempDirectory
-      //    */
-      //   public void setTempDirectory(File tempDirectory)
-      //   {
-      //      this.tempDirectory = tempDirectory;
-      //   }
-
-      /**
-       * @param maxBufferSize
-       */
-      @Deprecated
-      public void setMaxBufferSize(int maxBufferSize)
-      {
-         this.maxBufferSize = maxBufferSize;
-      }
-
-      /**
        * {@inheritDoc}
        */
       protected void finalize() throws Throwable

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CleanableFilePersistedValueData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CleanableFilePersistedValueData.java	2009-12-29 12:38:58 UTC (rev 1233)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CleanableFilePersistedValueData.java	2009-12-29 13:34:34 UTC (rev 1234)
@@ -94,7 +94,6 @@
     * {@inheritDoc}
     */
    @Override
-   @Deprecated
    public TransientValueData createTransientCopy() throws RepositoryException
    {
       return new TransientValueData(this);

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java	2009-12-29 12:38:58 UTC (rev 1233)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java	2009-12-29 13:34:34 UTC (rev 1234)
@@ -176,7 +176,6 @@
     * {@inheritDoc}
     */
    @Override
-   @Deprecated
    public TransientValueData createTransientCopy() throws RepositoryException
    {
       return new TransientValueData(this);

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/StreamPersistedValueData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/StreamPersistedValueData.java	2009-12-29 12:38:58 UTC (rev 1233)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/StreamPersistedValueData.java	2009-12-29 13:34:34 UTC (rev 1234)
@@ -63,7 +63,7 @@
    {
       this(orderNumber, tempFile, null);
    }
-   
+
    /**
     * StreamPersistedValueData constructor for stream data with know destenation file.
     * <p/>
@@ -93,21 +93,7 @@
       super(orderNumber, destFile);
       this.tempFile = tempFile;
       this.stream = null;
-   }   
-//   
-//   /**
-//    * StreamPersistedValueData  constructor for spooled file.
-//    *
-//    * @param file File
-//    * @param stream InputStream
-//    * @param orderNumber int
-//    */
-//   public StreamPersistedValueData(File file, File tempFile, InputStream stream, int orderNumber)
-//   {
-//      super(orderNumber, file);
-//      this.tempFile = tempFile;
-//      this.stream = stream;
-//   }
+   }
 
    /**
     * Return original data stream or null. <br/>
@@ -153,7 +139,6 @@
       this.stream = null;
    }
 
-
    /**
     * Return status of persisted state.
     * 
@@ -216,7 +201,6 @@
     * {@inheritDoc}
     */
    @Override
-   @Deprecated
    public TransientValueData createTransientCopy() throws RepositoryException
    {
       return new TransientValueData(this);



More information about the exo-jcr-commits mailing list