[Bedework-commit] dumprestore r281 - trunk/src/org/bedework/dumprestore/restore/rules

[svnadmin at bedework.org]

Author: douglm
Date: 2009-03-11 00:46:03 -0400 (Wed, 11 Mar 2009)
New Revision: 281

Modified:
   trunk/src/org/bedework/dumprestore/restore/rules/ContactRule.java
   trunk/src/org/bedework/dumprestore/restore/rules/LocationRule.java
Log:
REmove duplicated Uid code from CalFacadeUtil.

No functional change

Modified: trunk/src/org/bedework/dumprestore/restore/rules/ContactRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/ContactRule.java	2009-03-06 04:59:48 UTC (rev 280)
+++ trunk/src/org/bedework/dumprestore/restore/rules/ContactRule.java	2009-03-11 04:46:03 UTC (rev 281)
@@ -54,9 +54,10 @@
 package org.bedework.dumprestore.restore.rules;
 
 import org.bedework.calfacade.BwContact;
-import org.bedework.calfacade.util.CalFacadeUtil;
 import org.bedework.dumprestore.restore.RestoreGlobals;
 
+import edu.rpi.sss.util.Uid;
+
 /**
  * @author Mike Douglass   douglm at rpi.edu
  * @version 1.0
@@ -80,7 +81,7 @@
 
     if (entity.getUid() == null) {
       // Presume migrating
-      entity.setUid(CalFacadeUtil.getUid());
+      entity.setUid(Uid.getUid());
     }
 
     try {

Modified: trunk/src/org/bedework/dumprestore/restore/rules/LocationRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/LocationRule.java	2009-03-06 04:59:48 UTC (rev 280)
+++ trunk/src/org/bedework/dumprestore/restore/rules/LocationRule.java	2009-03-11 04:46:03 UTC (rev 281)
@@ -55,9 +55,10 @@
 
 import org.bedework.calfacade.BwLocation;
 import org.bedework.calfacade.BwString;
-import org.bedework.calfacade.util.CalFacadeUtil;
 import org.bedework.dumprestore.restore.RestoreGlobals;
 
+import edu.rpi.sss.util.Uid;
+
 /**
  * @author Mike Douglass   douglm at rpi.edu
  * @version 1.0
@@ -83,7 +84,7 @@
 
     if (entity.getUid() == null) {
       // Presume migrating
-      entity.setUid(CalFacadeUtil.getUid());
+      entity.setUid(Uid.getUid());
     }
 
     try {