svn commit: r480299 - in /db/derby/code/trunk/java/demo/localcal: ./ lib/ src/ src/CalendarController.java src/RequestManager.java

[da...@apache.org]

Author: davidvc
Date: Tue Nov 28 16:25:20 2006
New Revision: 480299

URL: http://svn.apache.org/viewvc?view=rev&rev=480299
Log:
Fixed some formatting/comments and one bugfix.  Also added svn:ignore
to the proper places so things don't accidentally get checked in.

Modified:
    db/derby/code/trunk/java/demo/localcal/   (props changed)
    db/derby/code/trunk/java/demo/localcal/lib/   (props changed)
    db/derby/code/trunk/java/demo/localcal/src/   (props changed)
    db/derby/code/trunk/java/demo/localcal/src/CalendarController.java
    db/derby/code/trunk/java/demo/localcal/src/RequestManager.java

Propchange: db/derby/code/trunk/java/demo/localcal/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 28 16:25:20 2006
@@ -0,0 +1,2 @@
+dist
+classes

Propchange: db/derby/code/trunk/java/demo/localcal/lib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 28 16:25:20 2006
@@ -0,0 +1 @@
+*.jar

Propchange: db/derby/code/trunk/java/demo/localcal/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 28 16:25:20 2006
@@ -0,0 +1 @@
+org

Modified: db/derby/code/trunk/java/demo/localcal/src/CalendarController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/localcal/src/CalendarController.java?view=diff&rev=480299&r1=480298&r2=480299
==============================================================================
--- db/derby/code/trunk/java/demo/localcal/src/CalendarController.java (original)
+++ db/derby/code/trunk/java/demo/localcal/src/CalendarController.java Tue Nov 28 16:25:20 2006
@@ -125,12 +125,8 @@
     }
     
     /**
-     * Go online.  This means (a) send up to Google Calendar any stored
-     * requests, logging any errors that occur and (b) getting the latest
-     * list of events from Google Calendar.
-     *
-     * @return a JSON String representing the latest list of events for
-     *      this calendar
+     * Go online.  This method gets any pending requests and sends
+     * them up to Google Calendar.
      */
     public void goOnline() throws Exception {
         log("GOING ONLINE...");
@@ -157,7 +153,7 @@
         return this.online;
     }
     
-        /**
+    /**
      * Refresh our calendar from Google Calendar and return a JSON string that 
      * represents the array of entries for the given date range
      *

Modified: db/derby/code/trunk/java/demo/localcal/src/RequestManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/localcal/src/RequestManager.java?view=diff&rev=480299&r1=480298&r2=480299
==============================================================================
--- db/derby/code/trunk/java/demo/localcal/src/RequestManager.java (original)
+++ db/derby/code/trunk/java/demo/localcal/src/RequestManager.java Tue Nov 28 16:25:20 2006
@@ -216,8 +216,6 @@
             } catch ( Exception e ) {
                 System.out.println("ERROR submitting " + request + ": " +
                    e.getMessage());
-                conflicts.add(e.getMessage());
-                // e.printStackTrace();
                 failures++;
                 deleteRequest(request);
             }
@@ -225,9 +223,7 @@
         
         System.out.println("==== DONE - " + totalRequests + " requests submitted ==== ");
         System.out.println("");
-        
-        // Now clean out the request table
-                
+                        
         return failures;
     }