[pcgen-commit-svn] SF.net SVN: pcgen:[14017] Trunk/pcgen/code/src/java/pcgen/persistence/lst

[<th...@us...>]

Revision: 14017
          http://pcgen.svn.sourceforge.net/pcgen/?rev=14017&view=rev
Author:   thpr
Date:     2010-12-01 02:58:58 +0000 (Wed, 01 Dec 2010)

Log Message:
-----------
Eliminate LanguageLoader (use GenericLoader)

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java

Removed Paths:
-------------
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/LanguageLoader.java

Deleted: Trunk/pcgen/code/src/java/pcgen/persistence/lst/LanguageLoader.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/LanguageLoader.java	2010-12-01 02:54:03 UTC (rev 14016)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/LanguageLoader.java	2010-12-01 02:58:58 UTC (rev 14017)
@@ -1,127 +0,0 @@
-/*
- * LanguageLoader.java
- * Copyright 2001 (C) Bryan McRoberts <mer...@ya...>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Created on February 22, 2002, 10:29 PM
- *
- * $Id$
- */
-package pcgen.persistence.lst;
-
-import java.util.StringTokenizer;
-
-import pcgen.cdom.enumeration.ObjectKey;
-import pcgen.core.Language;
-import pcgen.persistence.PersistenceLayerException;
-import pcgen.persistence.SystemLoader;
-import pcgen.rules.context.LoadContext;
-import pcgen.util.Logging;
-
-/**
- *
- * @author  David Rice <dav...@jc...>
- * @version $Revision$
- */
-final class LanguageLoader extends LstObjectFileLoader<Language>
-{
-	/** Creates a new instance of LanguageLoader */
-	public LanguageLoader()
-	{
-		super();
-	}
-
-	/**
-	 * @see pcgen.persistence.lst.LstObjectFileLoader#parseLine(LoadContext, pcgen.core.PObject, java.lang.String, pcgen.persistence.lst.CampaignSourceEntry)
-	 */
-	@Override
-	public Language parseLine(LoadContext context, Language aLang,
-		String lstLine, SourceEntry source) throws PersistenceLayerException
-	{
-		Language lang = aLang;
-
-		boolean isnew = false;
-		if (lang == null)
-		{
-			lang = new Language();
-			isnew = true;
-		}
-
-		final StringTokenizer colToken =
-				new StringTokenizer(lstLine, SystemLoader.TAB_DELIM);
-
-		if (colToken.hasMoreTokens())
-		{
-			lang.setName(colToken.nextToken());
-			lang.put(ObjectKey.SOURCE_CAMPAIGN, source.getCampaign());
-			lang.setSourceURI(source.getURI());
-			if (isnew)
-			{
-				context.addStatefulInformation(lang);
-				context.ref.importObject(lang);
-			}
-		}
-
-		while (colToken.hasMoreTokens())
-		{
-			final String token = colToken.nextToken().trim();
-			final int colonLoc = token.indexOf(':');
-			if (colonLoc == -1)
-			{
-				Logging
-						.errorPrint("Invalid Token - does not contain a colon: '"
-								+ token
-								+ "' in Language "
-								+ lang.getDisplayName() + " of " + source);
-				continue;
-			}
-			else if (colonLoc == 0)
-			{
-				Logging.errorPrint("Invalid Token - starts with a colon: '"
-						+ token + "' in Language " + lang.getDisplayName()
-						+ " of " + source);
-				continue;
-			}
-
-			String key = token.substring(0, colonLoc);
-			String value = (colonLoc == token.length() - 1) ? null : token
-					.substring(colonLoc + 1);
-			if (context.processToken(lang, key, value))
-			{
-				context.commit();
-			}
-			else
-			{
-				context.rollback();
-				Logging.replayParsedMessages();
- 			}
-			Logging.clearParseMessages();
-		}
-
-		completeObject(context, source, lang);
-		return null;
-	}
-
-	/**
-	 * @see pcgen.persistence.lst.LstObjectFileLoader#getObjectKeyed(LoadContext, java.lang.String)
-	 */
-	@Override
-	protected Language getObjectKeyed(LoadContext context, String aKey)
-	{
-		return context.ref.silentlyGetConstructedCDOMObject(Language.class, aKey);
-	}
-
-}

Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java	2010-12-01 02:54:03 UTC (rev 14016)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java	2010-12-01 02:58:58 UTC (rev 14017)
@@ -69,6 +69,7 @@
 import pcgen.core.EquipmentModifier;
 import pcgen.core.GameMode;
 import pcgen.core.Globals;
+import pcgen.core.Language;
 import pcgen.core.PCTemplate;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.Race;
@@ -186,7 +187,7 @@
 		}
 	};
 
-	private LanguageLoader languageLoader = new LanguageLoader();
+	private GenericLoader<Language> languageLoader = new GenericLoader<Language>(Language.class);
 	private LoadInfoLoader loadInfoLoader = new LoadInfoLoader();
 	private UnitSetLoader unitSetLoader = new UnitSetLoader();
 	private EquipSlotLoader eqSlotLoader = new EquipSlotLoader();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.