svn commit: r900812 - in /mina/trunk: core/src/main/java/org/apache/mina/core/file/ transport-apr/src/main/java/org/apache/mina/transport/socket/apr/

[adc]

Author: adc
Date: Tue Jan 19 15:09:50 2010
New Revision: 900812

URL: http://svn.apache.org/viewvc?rev=900812&view=rev
Log:
DIRMINA-707 Removed redundant method

Modified:
    
mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java
    mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java
    
mina/trunk/core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java
    
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java?rev=900812&r1=900811&r2=900812&view=diff
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java 
(original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java 
Tue Jan 19 15:09:50 2010
@@ -78,12 +78,8 @@
         remainingBytes -= value;
     }
 
-       public String getFilename() {
-               return null;
-       }
-
-       public boolean hasFilename() {
-               return false;
-       }
+    public String getFilename() {
+        return null;
+    }
 
 }

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java?rev=900812&r1=900811&r2=900812&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java 
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java Tue 
Jan 19 15:09:50 2010
@@ -69,13 +69,6 @@
     long getWrittenBytes();
 
     /**
-     * Indicates if the FileRegion has the filename for the underlying 
FileChannel.
-     * 
-     * @return  true if getFilename() will return a valid filename
-     */
-    boolean hasFilename();
-    
-    /**
      * Provides an absolute filename for the underlying FileChannel.
      * 
      * @return  the absolute filename, or <tt>null</tt> if the FileRegion

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java?rev=900812&r1=900811&r2=900812&view=diff
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java 
(original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java 
Tue Jan 19 15:09:50 2010
@@ -48,10 +48,6 @@
         this.file = file;
     }
 
-    public boolean hasFilename() {
-       return true;
-    }
-    
     public String getFilename() {
        return file.getAbsolutePath();
     }

Modified: 
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java?rev=900812&r1=900811&r2=900812&view=diff
==============================================================================
--- 
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
 (original)
+++ 
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
 Tue Jan 19 15:09:50 2010
@@ -441,7 +441,7 @@
      */
     @Override
     protected int transferFile(AprSession session, FileRegion region, int 
length) throws Exception {
-        if (!region.hasFilename()) {
+        if (region.getFilename() == null) {
             throw new UnsupportedOperationException();
         }