From 419a36a7f5aa2b20e1716210bedd1377b0f791b1 Mon Sep 17 00:00:00 2001
From: ray <ray@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Thu, 13 Nov 2003 02:33:33 +0000
Subject: [PATCH] Removed the now-obsolete site id stuff, see
 JDBCTableSiteIdentifier.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@1297 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 .../servlet/user/UserRepository.java          | 67 +------------------
 1 file changed, 1 insertion(+), 66 deletions(-)

diff --git a/projects/samskivert/src/java/com/samskivert/servlet/user/UserRepository.java b/projects/samskivert/src/java/com/samskivert/servlet/user/UserRepository.java
index 7b5821a7..a9cfa19b 100644
--- a/projects/samskivert/src/java/com/samskivert/servlet/user/UserRepository.java
+++ b/projects/samskivert/src/java/com/samskivert/servlet/user/UserRepository.java
@@ -1,5 +1,5 @@
 //
-// $Id: UserRepository.java,v 1.35 2003/11/13 00:53:00 mdb Exp $
+// $Id: UserRepository.java,v 1.36 2003/11/13 02:33:33 ray Exp $
 //
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001 Michael Bayne
@@ -45,7 +45,6 @@ import com.samskivert.jdbc.jora.Session;
 import com.samskivert.jdbc.jora.Table;
 import com.samskivert.util.HashIntMap;
 
-import com.samskivert.servlet.Site;
 import com.samskivert.servlet.SiteIdentifier;
 
 /**
@@ -74,9 +73,6 @@ public class UserRepository extends JORARepository
         throws PersistenceException
     {
 	super(provider, USER_REPOSITORY_IDENT);
-
-        /** Load all our site data into mem. */
-        loadAllSites();
     }
 
     /**
@@ -95,10 +91,6 @@ public class UserRepository extends JORARepository
 	// create our table object
 	_utable = new Table(
             getUserClass().getName(), "users", session, "userId");
-
-        // create the sites table object
-        _stable = new Table(
-            Site.class.getName(), "sites", session, "siteId");
     }
 
     /**
@@ -339,54 +331,6 @@ public class UserRepository extends JORARepository
         return true;
     }
 
-    /**
-     * Load all the site records into memory.
-     */
-    protected void loadAllSites ()
-	throws PersistenceException
-    {
-	execute(new Operation () {
-            public Object invoke (Connection conn, DatabaseLiaison liaison)
-                throws PersistenceException, SQLException
-	    {
-		Cursor c = _stable.select("");
-                Iterator itr = c.toArrayList().iterator();
-                while (itr.hasNext()) {
-                    Site site = (Site)itr.next();
-                    _siteIdToSite.put(site.siteId, site);
-                    _siteNameToSite.put(site.siteString, site);
-                }
-                return null;
-	    }
-	});
-    }
-
-    /**
-     * Get the site id for the passed in SiteName (stringId)
-     */
-    public int getSiteId (String stringId)
-    {
-        Site site = (Site)_siteNameToSite.get(stringId);
-        return (site == null) ? -1 : site.siteId;
-    }
-
-    /**
-     * Get the "Site Name" (stringId) for the give siteId
-     */
-    public String getSiteName (int siteId)
-    {
-        Site site = (Site)_siteIdToSite.get(siteId);
-        return (site == null) ? null : site.siteString;
-    }
-
-    /**
-     * Returns an iterator over all of our Site records.
-     */
-    public Iterator enumerateSites ()
-    {
-        return _siteIdToSite.elements();
-    }
-
     /**
      * 'Delete' the users account such that they can no longer access it,
      * however we do not delete the record from the db.  The name is
@@ -660,18 +604,9 @@ public class UserRepository extends JORARepository
 	}
     }
 
-    /** Map that contains siteName -> Site mapping. */
-    protected HashMap _siteNameToSite = new HashMap();
-
-    /** Map that contains siteId -> Site mapping. */
-    protected HashIntMap _siteIdToSite = new HashIntMap();
-
     /** A wrapper that provides access to the userstable. */
     protected Table _utable;
 
-    /** A wrapper that provides access to the sites table. */
-    protected Table _stable;
-
     /** The minimum allowable length of a username. */
     protected static final int MINIMUM_USERNAME_LENGTH = 3;
 }