[Bedework-commit] calendarapi r1449 - in trunk: calCore/src/org/bedework/calcore/hibernate icalendar/src/org/bedework/icalendar sysevents/src/org/bedework/sysevents

[svnadmin at bedework.org]

Author: douglm
Date: 2011-02-24 15:09:46 -0500 (Thu, 24 Feb 2011)
New Revision: 1449

Modified:
   trunk/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java
   trunk/calCore/src/org/bedework/calcore/hibernate/CoreEvents.java
   trunk/icalendar/src/org/bedework/icalendar/IcalTranslator.java
   trunk/icalendar/src/org/bedework/icalendar/ToXEvent.java
   trunk/icalendar/src/org/bedework/icalendar/WsXMLTranslator.java
   trunk/sysevents/src/org/bedework/sysevents/NotificationsHandlerFactory.java
Log:
Bring 3.7 up to date with bwxml

Minor changes to reduce warnings

Modified: trunk/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java
===================================================================
--- trunk/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java	2011-02-24 20:09:38 UTC (rev 1448)
+++ trunk/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java	2011-02-24 20:09:46 UTC (rev 1449)
@@ -98,12 +98,12 @@
 
     private CoreCalendars cols;
 
-    BwStats stats;
+    //BwStats stats;
     CacheStats cs;
 
     CollectionCache(final CoreCalendars cols,
                     final BwStats stats) {
-      this.stats = stats;
+      //this.stats = stats;
       this.cols = cols;
       cs = stats.getCollectionCacheStats();
     }

Modified: trunk/calCore/src/org/bedework/calcore/hibernate/CoreEvents.java
===================================================================
--- trunk/calCore/src/org/bedework/calcore/hibernate/CoreEvents.java	2011-02-24 20:09:38 UTC (rev 1448)
+++ trunk/calCore/src/org/bedework/calcore/hibernate/CoreEvents.java	2011-02-24 20:09:46 UTC (rev 1449)
@@ -3078,6 +3078,7 @@
     }
   }
 
+  /*
   private void stat(final String name,
                     final String val) throws CalFacadeException {
     try {
@@ -3085,7 +3086,7 @@
     } catch (NotificationException ne) {
       throw new CalFacadeException(ne);
     }
-  }
+  }*/
 
   private void stat(final String name,
                     final Long startTime) throws CalFacadeException {

Modified: trunk/icalendar/src/org/bedework/icalendar/IcalTranslator.java
===================================================================
--- trunk/icalendar/src/org/bedework/icalendar/IcalTranslator.java	2011-02-24 20:09:38 UTC (rev 1448)
+++ trunk/icalendar/src/org/bedework/icalendar/IcalTranslator.java	2011-02-24 20:09:46 UTC (rev 1449)
@@ -72,7 +72,6 @@
 import ietf.params.xml.ns.icalendar_2.ArrayOfProperties;
 import ietf.params.xml.ns.icalendar_2.BaseComponentType;
 import ietf.params.xml.ns.icalendar_2.BasePropertyType;
-import ietf.params.xml.ns.icalendar_2.IcalendarType;
 import ietf.params.xml.ns.icalendar_2.MethodPropType;
 import ietf.params.xml.ns.icalendar_2.ProdidPropType;
 import ietf.params.xml.ns.icalendar_2.VcalendarType;
@@ -661,7 +660,7 @@
    * @throws CalFacadeException
    */
   public Icalendar fromIcal(final BwCalendar col,
-                            final IcalendarType ical,
+                            final ietf.params.xml.ns.icalendar_2.Icalendar ical,
                             final boolean diff) throws CalFacadeException {
 
     Icalendar ic = new Icalendar();
@@ -898,10 +897,10 @@
    * @return XML IcalendarType
    * @throws CalFacadeException
    */
-  public IcalendarType toXMLIcalendar(final EventInfo val,
+  public ietf.params.xml.ns.icalendar_2.Icalendar toXMLIcalendar(final EventInfo val,
                                       final int methodType) throws CalFacadeException {
 
-    IcalendarType ical = new IcalendarType();
+    ietf.params.xml.ns.icalendar_2.Icalendar ical = new ietf.params.xml.ns.icalendar_2.Icalendar();
     VcalendarType vcal = new VcalendarType();
 
     ical.getVcalendars().add(vcal);

Modified: trunk/icalendar/src/org/bedework/icalendar/ToXEvent.java
===================================================================
--- trunk/icalendar/src/org/bedework/icalendar/ToXEvent.java	2011-02-24 20:09:38 UTC (rev 1448)
+++ trunk/icalendar/src/org/bedework/icalendar/ToXEvent.java	2011-02-24 20:09:46 UTC (rev 1449)
@@ -297,7 +297,6 @@
           // LANG
           ContactPropType c = new ContactPropType();
           c.setText(ctct.getName().getValue());
-          String l = ctct.getLink();
 
           pl.add(of.createContact(
                     (ContactPropType)langProp(

Modified: trunk/icalendar/src/org/bedework/icalendar/WsXMLTranslator.java
===================================================================
--- trunk/icalendar/src/org/bedework/icalendar/WsXMLTranslator.java	2011-02-24 20:09:38 UTC (rev 1448)
+++ trunk/icalendar/src/org/bedework/icalendar/WsXMLTranslator.java	2011-02-24 20:09:46 UTC (rev 1449)
@@ -65,7 +65,7 @@
 import ietf.params.xml.ns.icalendar_2.ExrulePropType;
 import ietf.params.xml.ns.icalendar_2.FreebusyPropType;
 import ietf.params.xml.ns.icalendar_2.GeoPropType;
-import ietf.params.xml.ns.icalendar_2.IcalendarType;
+import ietf.params.xml.ns.icalendar_2.Icalendar;
 import ietf.params.xml.ns.icalendar_2.IntegerPropertyType;
 import ietf.params.xml.ns.icalendar_2.LastModifiedPropType;
 import ietf.params.xml.ns.icalendar_2.LocationPropType;
@@ -237,7 +237,7 @@
    * @return Calendar object or null for no data
    * @throws CalFacadeException
    */
-  public Calendar fromXcal(final IcalendarType ical) throws CalFacadeException {
+  public Calendar fromXcal(final Icalendar ical) throws CalFacadeException {
     BuildState bs = new BuildState();
 
     bs.tzRegistry = tzRegistry;

Modified: trunk/sysevents/src/org/bedework/sysevents/NotificationsHandlerFactory.java
===================================================================
--- trunk/sysevents/src/org/bedework/sysevents/NotificationsHandlerFactory.java	2011-02-24 20:09:38 UTC (rev 1448)
+++ trunk/sysevents/src/org/bedework/sysevents/NotificationsHandlerFactory.java	2011-02-24 20:09:46 UTC (rev 1449)
@@ -27,15 +27,11 @@
 
 import org.bedework.sysevents.events.SysEvent;
 
-import org.apache.log4j.Logger;
-
 /** Return a single instance of a notifications handler.
  *
  * @author Mike Douglass
  */
 public class NotificationsHandlerFactory {
-  private static boolean debug = Logger.getLogger(NotificationsHandlerFactory.class).isDebugEnabled();
-
   private static volatile NotificationsHandler handler;
 
   private static volatile Object synchit = new Object();