svn commit: r943420 - in /incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c: IAccessEntity.java impl/AccessEntity.java

[scottbw]

Author: scottbw
Date: Wed May 12 09:54:36 2010
New Revision: 943420

URL: http://svn.apache.org/viewvc?rev=943420&view=rev
Log:
Removed unused methods for Access, also add default ports for HTTP and HTTPS.

Modified:
    
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAccessEntity.java
    
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AccessEntity.java

Modified: 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAccessEntity.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAccessEntity.java?rev=943420&r1=943419&r2=943420&view=diff
==============================================================================
--- 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAccessEntity.java 
(original)
+++ 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAccessEntity.java 
Wed May 12 09:54:36 2010
@@ -20,10 +20,6 @@ public interface IAccessEntity extends I
 
        public String getOrigin();
 
-       public void setOrigin(String uri);
-
        public boolean hasSubDomains();
 
-       public void setSubDomains(boolean subDomains);
-
 }

Modified: 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AccessEntity.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AccessEntity.java?rev=943420&r1=943419&r2=943420&view=diff
==============================================================================
--- 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AccessEntity.java
 (original)
+++ 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AccessEntity.java
 Wed May 12 09:54:36 2010
@@ -34,25 +34,14 @@ public class AccessEntity implements IAc
                fOrigin = null;
                fSubDomains = false;
        }
-
-       public AccessEntity(String uri, boolean subDomains) {
-               super();
-               fOrigin = uri;
-               fSubDomains = subDomains;
-       }
-
+       
        public String getOrigin() {
                return fOrigin;
        }
-       public void setOrigin(String uri) {
-               fOrigin = uri;
-       }
+
        public boolean hasSubDomains() {
                return fSubDomains;
        }
-       public void setSubDomains(boolean subDomains) {
-               fSubDomains = subDomains;
-       }
 
        public void fromXML(Element element) {  
                // Origin is required
@@ -86,7 +75,13 @@ public class AccessEntity implements IAc
                if (uri.getPath()!=null && uri.getPath().length()>0) throw new 
Exception("origin has path information");
                if (uri.getFragment()!=null) throw new Exception("origin has 
fragment information");
                if (uri.getQuery()!=null) throw new Exception("origin has query 
information");
-               URI processedURI = new 
URI(uri.getScheme(),null,uri.getHost(),uri.getPort(),null,null,null);
+               
+               // Default schemes
+               int port = uri.getPort();
+               if (uri.getScheme().equals("http") && port == -1) port = 80;
+               if (uri.getScheme().equals("https") && port == -1) port = 443;
+               
+               URI processedURI = new 
URI(uri.getScheme(),null,uri.getHost(),port,null,null,null);
                fOrigin = processedURI.toString();
        }