svn commit: r1227996 - in /incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory: MemoryManagerService.java MemoryManagerServiceImpl.java OffHeapMemoryBuffer.java

[bp...@apache.org]

Author: bperroud
Date: Fri Jan  6 07:15:42 2012
New Revision: 1227996

URL: http://svn.apache.org/viewvc?rev=1227996&view=rev
Log:
DIRECTMEMORY-48 : change modifiers to enable overloading / abstraction

Modified:
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java

Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java?rev=1227996&r1=1227995&r2=1227996&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java Fri Jan  6 07:15:42 2012
@@ -20,7 +20,6 @@ package org.apache.directmemory.memory;
  */
 
 
-
 import java.util.List;
 
 public interface MemoryManagerService

Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java?rev=1227996&r1=1227995&r2=1227996&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java Fri Jan  6 07:15:42 2012
@@ -32,11 +32,11 @@ public class MemoryManagerServiceImpl
     implements MemoryManagerService
 {
 
-    private static final Logger LOG = LoggerFactory.getLogger( MemoryManager.class );
+    protected static final Logger LOG = LoggerFactory.getLogger( MemoryManager.class );
 
-    private List<OffHeapMemoryBuffer> buffers = new Vector<OffHeapMemoryBuffer>();
+    protected List<OffHeapMemoryBuffer> buffers = new Vector<OffHeapMemoryBuffer>();
 
-    private OffHeapMemoryBuffer activeBuffer;
+    protected OffHeapMemoryBuffer activeBuffer;
 
     public MemoryManagerServiceImpl()
     {

Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java?rev=1227996&r1=1227995&r2=1227996&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java Fri Jan  6 07:15:42 2012
@@ -39,14 +39,14 @@ import java.util.zip.Checksum;
 
 public class OffHeapMemoryBuffer
 {
-    private static Logger logger = LoggerFactory.getLogger( OffHeapMemoryBuffer.class );
+    protected static Logger logger = LoggerFactory.getLogger( OffHeapMemoryBuffer.class );
 
     protected ByteBuffer buffer;
 
     //TODO: Variable 'pointers' must be private and have accessor methods.
     public List<Pointer> pointers = new ArrayList<Pointer>();
 
-    private AtomicInteger used = new AtomicInteger();
+    protected final AtomicInteger used = new AtomicInteger();
 
     public int bufferNumber;
 
@@ -76,7 +76,7 @@ public class OffHeapMemoryBuffer
         return new OffHeapMemoryBuffer( ByteBuffer.allocateDirect( capacity ), -1 );
     }
 
-    private OffHeapMemoryBuffer( ByteBuffer buffer, int bufferNumber )
+    protected OffHeapMemoryBuffer( ByteBuffer buffer, int bufferNumber )
     {
         this.buffer = buffer;
         this.bufferNumber = bufferNumber;
@@ -94,7 +94,7 @@ public class OffHeapMemoryBuffer
         return first;
     }
 
-    public Pointer slice( Pointer existing, int capacity )
+    protected Pointer slice( Pointer existing, int capacity )
     {
         Pointer fresh = new Pointer();
         fresh.bufferNumber = existing.bufferNumber;
@@ -106,7 +106,7 @@ public class OffHeapMemoryBuffer
     }
 
 
-    public Pointer firstMatch( int capacity )
+    protected Pointer firstMatch( int capacity )
     {
         for ( Pointer ptr : pointers )
         {
@@ -181,7 +181,7 @@ public class OffHeapMemoryBuffer
         return store( payload, expiresIn, 0 );
     }
 
-    private synchronized Pointer store( byte[] payload, long expiresIn, long expires )
+    protected synchronized Pointer store( byte[] payload, long expiresIn, long expires )
     {
         Pointer goodOne = firstMatch( payload.length );
 
@@ -224,7 +224,7 @@ public class OffHeapMemoryBuffer
         return fresh;
     }
 
-    private QueryResults select( String whereClause )
+    protected QueryResults select( String whereClause )
         throws QueryParseException, QueryExecutionException
     {
         Query q = new Query();
@@ -232,7 +232,7 @@ public class OffHeapMemoryBuffer
         return q.execute( pointers );
     }
 
-    private QueryResults selectOrderBy( String whereClause, String orderBy, String limit )
+    protected QueryResults selectOrderBy( String whereClause, String orderBy, String limit )
         throws QueryParseException, QueryExecutionException
     {
         Query q = new Query();