[Bedework-commit] exchgsynch r54 - trunk/common/src/org/bedework/exchgsynch/diff

[svnadmin at bedework.org]

Author: douglm
Date: 2011-02-26 12:16:56 -0500 (Sat, 26 Feb 2011)
New Revision: 54

Modified:
   trunk/common/src/org/bedework/exchgsynch/diff/CompWrapper.java
   trunk/common/src/org/bedework/exchgsynch/diff/CompsWrapper.java
   trunk/common/src/org/bedework/exchgsynch/diff/XmlIcalCompare.java
Log:
Prepare for move to different package

Modified: trunk/common/src/org/bedework/exchgsynch/diff/CompWrapper.java
===================================================================
--- trunk/common/src/org/bedework/exchgsynch/diff/CompWrapper.java	2011-02-26 16:59:35 UTC (rev 53)
+++ trunk/common/src/org/bedework/exchgsynch/diff/CompWrapper.java	2011-02-26 17:16:56 UTC (rev 54)
@@ -25,8 +25,6 @@
  */
 package org.bedework.exchgsynch.diff;
 
-import org.bedework.exchgsynch.intf.SynchException;
-
 import edu.rpi.sss.util.xml.NsContext;
 import edu.rpi.sss.util.xml.tagdefs.XcalTags;
 
@@ -269,9 +267,8 @@
    *
    * @param that
    * @return
-   * @throws SynchException
    */
-  public List<BaseEntityWrapper> diff(final CompWrapper that) throws SynchException {
+  public List<BaseEntityWrapper> diff(final CompWrapper that) {
     List<BaseEntityWrapper> u = props.diff(that.props);
     u.addAll(comps.diff(that.comps));
 

Modified: trunk/common/src/org/bedework/exchgsynch/diff/CompsWrapper.java
===================================================================
--- trunk/common/src/org/bedework/exchgsynch/diff/CompsWrapper.java	2011-02-26 16:59:35 UTC (rev 53)
+++ trunk/common/src/org/bedework/exchgsynch/diff/CompsWrapper.java	2011-02-26 17:16:56 UTC (rev 54)
@@ -25,8 +25,6 @@
  */
 package org.bedework.exchgsynch.diff;
 
-import org.bedework.exchgsynch.intf.SynchException;
-
 import ietf.params.xml.ns.icalendar_2.ArrayOfComponents;
 import ietf.params.xml.ns.icalendar_2.BaseComponentType;
 
@@ -73,7 +71,7 @@
     return new CompWrapper(this, el.getName(), el.getValue());
   }
 
-  public List<BaseEntityWrapper> diff(final CompsWrapper that) throws SynchException {
+  public List<BaseEntityWrapper> diff(final CompsWrapper that) {
     List<BaseEntityWrapper> updates = new ArrayList<BaseEntityWrapper>();
 
     int thatI = 0;
@@ -129,7 +127,7 @@
 
       if (cmp == 0) {
         // Screwed up somewhere
-        throw new SynchException("Comparison == 0: that's not right");
+        throw new RuntimeException("Comparison == 0: that's not right");
       }
 
       // Extra ones in the target

Modified: trunk/common/src/org/bedework/exchgsynch/diff/XmlIcalCompare.java
===================================================================
--- trunk/common/src/org/bedework/exchgsynch/diff/XmlIcalCompare.java	2011-02-26 16:59:35 UTC (rev 53)
+++ trunk/common/src/org/bedework/exchgsynch/diff/XmlIcalCompare.java	2011-02-26 17:16:56 UTC (rev 54)
@@ -25,8 +25,6 @@
 */
 package org.bedework.exchgsynch.diff;
 
-import org.bedework.exchgsynch.intf.SynchException;
-
 import edu.rpi.sss.util.xml.NsContext;
 import edu.rpi.sss.util.xml.tagdefs.XcalTags;
 
@@ -72,10 +70,9 @@
    * @param val1
    * @param val2
    * @return true if val1 and val2 differ.
-   * @throws SynchException
    */
   public boolean differ(final BaseComponentType val1,
-                        final BaseComponentType val2) throws SynchException {
+                        final BaseComponentType val2) {
     debug = getLogger().isDebugEnabled();
 
     CompWrapper cw1 = new CompWrapper(null,
@@ -200,6 +197,7 @@
    *   We select a parameter to delete it or change its value. The value is a value-type
    *  element
    */
+  @SuppressWarnings("unchecked")
   private XpathUpdate makeUpdate(final BaseEntityWrapper be) {
     Stack<BaseWrapper> els = new Stack<BaseWrapper>();