svn commit: r476401 - in /forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader: AbstractReader.java FileReader.java HTTPReader.java IReader.java

[rgardler]

Author: rgardler
Date: Fri Nov 17 17:15:27 2006
New Revision: 476401

URL: http://svn.apache.org/viewvc?view=rev&rev=476401
Log:
@refactor remove unused getScheme() method (scheme is now identified by the 
bean ID)
@refactor implement empty init method in AbstractReader since it is not always 
used

Modified:
    
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/AbstractReader.java
    
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/FileReader.java
    
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/HTTPReader.java
    
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/IReader.java

Modified: 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/AbstractReader.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/AbstractReader.java?view=diff&rev=476401&r1=476400&r2=476401
==============================================================================
--- 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/AbstractReader.java
 (original)
+++ 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/AbstractReader.java
 Fri Nov 17 17:15:27 2006
@@ -22,4 +22,8 @@
                this.init();
        }
 
+       public void init() {
+               // Do Nothing
+       }
+
 }

Modified: 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/FileReader.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/FileReader.java?view=diff&rev=476401&r1=476400&r2=476401
==============================================================================
--- 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/FileReader.java
 (original)
+++ 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/FileReader.java
 Fri Nov 17 17:15:27 2006
@@ -35,14 +35,6 @@
        /*
         * (non-Javadoc)
         * 
-        * @see org.apache.forrest.reader.IReader#init()
-        */
-       public void init() {
-       }
-
-       /*
-        * (non-Javadoc)
-        * 
         * @see 
org.apache.forrest.reader.IReader#read(org.apache.forrest.test.core.locationMap.Location)
         */
        public AbstractSourceDocument read(final Location location) {
@@ -56,9 +48,5 @@
                                throw new SourceException("Source URL is 
invalid", e);
                }
                return result;
-       }
-
-       public String getScheme() {
-               return "file";
        }
 }

Modified: 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/HTTPReader.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/HTTPReader.java?view=diff&rev=476401&r1=476400&r2=476401
==============================================================================
--- 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/HTTPReader.java
 (original)
+++ 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/HTTPReader.java
 Fri Nov 17 17:15:27 2006
@@ -75,8 +75,4 @@
                }
                return result;
        }
-
-       public String getScheme() {
-               return "http";
-       }
 }

Modified: 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/IReader.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/IReader.java?view=diff&rev=476401&r1=476400&r2=476401
==============================================================================
--- 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/IReader.java 
(original)
+++ 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/reader/IReader.java 
Fri Nov 17 17:15:27 2006
@@ -42,10 +42,4 @@
        public abstract AbstractSourceDocument read(Location location)
                        throws MalformedURLException;
 
-       /**
-        * Get the scheme that this reader handles.
-        * 
-        * @return
-        */
-       public abstract String getScheme();
 }