[Bedework-commit] carddav r30 - trunk/server/src/org/bedework/carddav/server

[svnadmin at bedework.org]

Author: douglm
Date: 2009-02-28 22:23:46 -0500 (Sat, 28 Feb 2009)
New Revision: 30

Modified:
   trunk/server/src/org/bedework/carddav/server/CarddavColNode.java
   trunk/server/src/org/bedework/carddav/server/CarddavCollection.java
   trunk/server/src/org/bedework/carddav/server/CarddavNode.java
   trunk/server/src/org/bedework/carddav/server/CarddavResource.java
   trunk/server/src/org/bedework/carddav/server/CarddavURI.java
Log:
Fix up carddav so it compiles again

Modified: trunk/server/src/org/bedework/carddav/server/CarddavColNode.java
===================================================================
--- trunk/server/src/org/bedework/carddav/server/CarddavColNode.java	2009-02-22 05:16:21 UTC (rev 29)
+++ trunk/server/src/org/bedework/carddav/server/CarddavColNode.java	2009-03-01 03:23:46 UTC (rev 30)
@@ -56,8 +56,6 @@
  *   @author Mike Douglass   douglm at rpi.edu
  */
 public class CarddavColNode extends CarddavNode {
-  private CarddavCollection col;
-
   private AccessPrincipal owner;
 
   private String vfreeBusyString;
@@ -91,8 +89,10 @@
    * @param cdURI
    * @param sysi
    * @param debug
+   * @throws WebdavException
    */
-  public CarddavColNode(CarddavURI cdURI, SysIntf sysi, boolean debug) {
+  public CarddavColNode(CarddavURI cdURI, SysIntf sysi,
+                        boolean debug) throws WebdavException {
     super(cdURI, sysi, debug);
 
     col = cdURI.getCol();

Modified: trunk/server/src/org/bedework/carddav/server/CarddavCollection.java
===================================================================
--- trunk/server/src/org/bedework/carddav/server/CarddavCollection.java	2009-02-22 05:16:21 UTC (rev 29)
+++ trunk/server/src/org/bedework/carddav/server/CarddavCollection.java	2009-03-01 03:23:46 UTC (rev 30)
@@ -25,18 +25,26 @@
 */
 package org.bedework.carddav.server;
 
-import edu.rpi.cct.webdav.servlet.shared.WdCollection;
+import edu.rpi.cct.webdav.servlet.shared.WdCollectionBase;
+import edu.rpi.cct.webdav.servlet.shared.WebdavException;
 
 /**
  * @author douglm
  *
  */
-public class CarddavCollection extends WdCollection {
+public class CarddavCollection extends WdCollectionBase {
   private CarddavCollection parent;
 
   private boolean addressBook;
 
   /**
+   * @throws WebdavException
+   */
+  public CarddavCollection() throws WebdavException {
+    super();
+  }
+
+  /**
    * @param val
    */
   public void setParent(CarddavCollection val) {

Modified: trunk/server/src/org/bedework/carddav/server/CarddavNode.java
===================================================================
--- trunk/server/src/org/bedework/carddav/server/CarddavNode.java	2009-02-22 05:16:21 UTC (rev 29)
+++ trunk/server/src/org/bedework/carddav/server/CarddavNode.java	2009-03-01 03:23:46 UTC (rev 30)
@@ -28,6 +28,7 @@
 import org.bedework.carddav.server.CarddavBWIntf.QueryResult;
 import org.bedework.carddav.server.SysIntf.GetLimits;
 
+import edu.rpi.cct.webdav.servlet.shared.WdCollection;
 import edu.rpi.cct.webdav.servlet.shared.WebdavException;
 import edu.rpi.cct.webdav.servlet.shared.WebdavNsIntf;
 import edu.rpi.cct.webdav.servlet.shared.WebdavNsNode;
@@ -45,7 +46,7 @@
  *   @author Mike Douglass   douglm - rpi.edu
  */
 public abstract class CarddavNode extends WebdavNsNode {
-//  protected CaldavURI cdURI;
+  protected CarddavCollection col;
 
   private final static HashMap<QName, PropertyTagEntry> propertyNames =
     new HashMap<QName, PropertyTagEntry>();
@@ -62,7 +63,8 @@
   /* for accessing calendars */
   private SysIntf sysi;
 
-  CarddavNode(CarddavURI cdURI, SysIntf sysi, boolean debug) {
+  CarddavNode(CarddavURI cdURI, SysIntf sysi,
+              boolean debug) throws WebdavException {
     super(sysi.getUrlHandler(), cdURI.getPath(), cdURI.isCollection(),
           cdURI.getUri(), debug);
 
@@ -85,6 +87,10 @@
    *                         Public methods
    * ==================================================================== */
 
+  public WdCollection getCollection(boolean deref) throws WebdavException {
+    return col;
+  }
+
   /**
    * @return WdCollection containing or represented by this entity
    * @throws WebdavException
@@ -134,6 +140,13 @@
     return false;
   }
 
+  /* (non-Javadoc)
+   * @see edu.rpi.cct.webdav.servlet.shared.WebdavNsNode#getChildren()
+   */
+  public Collection getChildren() throws WebdavException {
+    return null;
+  }
+
   /* ====================================================================
    *                   Property methods
    * ==================================================================== */

Modified: trunk/server/src/org/bedework/carddav/server/CarddavResource.java
===================================================================
--- trunk/server/src/org/bedework/carddav/server/CarddavResource.java	2009-02-22 05:16:21 UTC (rev 29)
+++ trunk/server/src/org/bedework/carddav/server/CarddavResource.java	2009-03-01 03:23:46 UTC (rev 30)
@@ -286,7 +286,11 @@
    * ==================================================================== */
 
   public int hashCode() {
-    return getParent().getPath().hashCode() * getName().hashCode();
+    try {
+      return getParent().getPath().hashCode() * getName().hashCode();
+    } catch (Throwable t) {
+      throw new RuntimeException(t);
+    }
   }
 
   public int compareTo(CarddavResource that)  {

Modified: trunk/server/src/org/bedework/carddav/server/CarddavURI.java
===================================================================
--- trunk/server/src/org/bedework/carddav/server/CarddavURI.java	2009-02-22 05:16:21 UTC (rev 29)
+++ trunk/server/src/org/bedework/carddav/server/CarddavURI.java	2009-03-01 03:23:46 UTC (rev 30)
@@ -28,6 +28,7 @@
 
 import org.bedework.carddav.vcard.Vcard;
 
+import edu.rpi.cct.webdav.servlet.shared.WebdavException;
 import edu.rpi.cmt.access.AccessPrincipal;
 import edu.rpi.cmt.access.Ace;
 
@@ -138,8 +139,9 @@
 
   /**
    * @return String
+   * @throws WebdavException
    */
-  public String getColName() {
+  public String getColName() throws WebdavException {
     return col.getName();
   }
 
@@ -169,8 +171,9 @@
 
   /**
    * @return String
+   * @throws WebdavException
    */
-  public String getPath() {
+  public String getPath() throws WebdavException {
     if (principal != null) {
       return principal.getPrincipalRef();
     }
@@ -184,8 +187,9 @@
 
   /**
    * @return String
+   * @throws WebdavException
    */
-  public String getUri() {
+  public String getUri() throws WebdavException {
 //    if (entityName == null) {
 //      return getPath();
 //    }
@@ -246,9 +250,14 @@
   }
 
   public String toString() {
-    StringBuffer sb = new StringBuffer("CaldavURI{path=");
+    StringBuilder sb = new StringBuilder("CaldavURI{path=");
 
-    sb.append(getPath());
+    try {
+      sb.append(getPath());
+    } catch (Throwable t) {
+      sb.append("exception: ");
+      sb.append(t.getMessage());
+    }
     sb.append(", entityName=");
     sb.append(String.valueOf(entityName));
     sb.append("}");
@@ -257,17 +266,21 @@
   }
 
   public int hashCode() {
-    int hc = entityName.hashCode();
+    try {
+      int hc = entityName.hashCode();
 
-    if (isUser()) {
-      return hc * 1;
-    }
+      if (isUser()) {
+        return hc * 1;
+      }
 
-    if (isGroup()) {
-      return hc * 2;
+      if (isGroup()) {
+        return hc * 2;
+      }
+
+      return hc * 3 + col.getPath().hashCode();
+    } catch (Throwable t) {
+      throw new RuntimeException(t);
     }
-
-    return hc * 3 + col.getPath().hashCode();
   }
 
   public boolean equals(Object o) {