[Columba-cvs] macchiato/src/java/org/macchiato/db FrequencyIO.java,1.4,1.5

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/columba/macchiato/src/java/org/macchiato/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10922/db

Modified Files:
	FrequencyIO.java 
Log Message:
[intern] don't throw Exception, use IOException and ClassNotFoundException instead -> added finally clause to close streams

Index: FrequencyIO.java
===================================================================
RCS file: /cvsroot/columba/macchiato/src/java/org/macchiato/db/FrequencyIO.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FrequencyIO.java	11 Jul 2004 14:46:34 -0000	1.4
--- FrequencyIO.java	30 Jul 2004 16:35:57 -0000	1.5
***************
*** 1,8 ****
  //The contents of this file are subject to the Mozilla Public License Version 1.1
! //(the "License"); you may not use this file except in compliance with the 
  //License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
  //
  //Software distributed under the License is distributed on an "AS IS" basis,
! //WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
  //for the specific language governing rights and
  //limitations under the License.
--- 1,8 ----
  //The contents of this file are subject to the Mozilla Public License Version 1.1
! //(the "License"); you may not use this file except in compliance with the
  //License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
  //
  //Software distributed under the License is distributed on an "AS IS" basis,
! //WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
  //for the specific language governing rights and
  //limitations under the License.
***************
*** 11,20 ****
  //
  //The Initial Developers of the Original Code are Frederik Dietz and Timo Stich.
! //Portions created by Frederik Dietz and Timo Stich are Copyright (C) 2003. 
  //
  //All Rights Reserved.
  package org.macchiato.db;

  import java.io.File;
  import java.util.Iterator;

--- 11,22 ----
  //
  //The Initial Developers of the Original Code are Frederik Dietz and Timo Stich.
! //Portions created by Frederik Dietz and Timo Stich are Copyright (C) 2003.
  //
  //All Rights Reserved.
+ 
  package org.macchiato.db;

  import java.io.File;
+ import java.io.IOException;
  import java.util.Iterator;

***************
*** 23,135 ****

  /**
!  * 
   *
   * @author fdietz
   */
  public class FrequencyIO {

! 	/**
! 	 * Save frequency db to file.
! 	 * 
! 	 * @param map			frequency db
! 	 * @param file			file
! 	 * @throws Exception
! 	 */
! 	public static void save(FrequencyDB map, File file) throws Exception {
! 		ObjectWriter writer= new ObjectWriter(file);
! 
! 		// save bad/good message count
! 		writer.writeObject(new Integer(map.getBadMessageCount()));
! 		writer.writeObject(new Integer(map.getGoodMessageCount()));
! 
! 		// save total number of tokens
! 		writer.writeObject(new Integer(map.tokenCount()));

! 		Iterator it= map.tokenKeyIterator();
! 		while (it.hasNext()) {
! 			String key= (String) it.next();
! 			DBToken token= map.getToken(key);
! 			/*
! 			MacchiatoLogger.log.info(
! 				" write token[" + key + "]=" + token.toString());
! 			*/
! 			writer.writeObject(key);

! 			writer.writeObject(new Integer(token.getBadCount()));
! 			writer.writeObject(new Integer(token.getGoodCount()));
! 			writer.writeObject(new Float(token.getScore()));
! 			writer.writeObject(new Long(token.getTimeStamp()));
! 		}

! 		// save total number of message md5 sums
! 		writer.writeObject(new Integer(map.md5SumCount()));

! 		it= map.md5SumIterator();
! 		while (it.hasNext()) {
! 		    byte[] data= (byte[]) it.next();
! 		    MD5Sum sum = map.getMessageMD5Sum(data);
! 		    
! 			writer.writeObject(data);
! 			writer.writeObject(new Long(sum.getTimestamp()));
! 		}

! 		writer.close();
! 	}

! 	/**
! 	 * Load frequency db from file.
! 	 * 
! 	 * @param map			frequency map
! 	 * @param file			file
! 	 * @throws Exception
! 	 */
! 	public static void load(FrequencyDB map, File file) throws Exception {
! 		ObjectReader reader= new ObjectReader(file);

! 		// read bad/good message count
! 		map.setBadMessageCount(((Integer) reader.readObject()).intValue());
! 		map.setGoodMessageCount(((Integer) reader.readObject()).intValue());

! 		// read total number of tokens
! 		int count= ((Integer) reader.readObject()).intValue();

! 		String o= null;
! 		for (int i= 0; i < count; i++) {

! 			o= (String) reader.readObject();
! 			DBToken token= new DBTokenImpl(o);

! 			Integer bad= (Integer) reader.readObject();
! 			token.setBadCount(bad.intValue());
! 			Integer good= (Integer) reader.readObject();
! 			token.setGoodCount(good.intValue());
! 			Float score= (Float) reader.readObject();
! 			token.setScore(score.floatValue());
! 			Long timeStamp = (Long) reader.readObject();
! 			token.setTimeStamp(timeStamp.longValue());

! 			/*
! 			MacchiatoLogger.log.info(
! 				"read token[" + o + "]=" + token);
! 			*/

! 			map.addToken(token);
! 		}

! 		// read total number of message md5 sums
! 		count= ((Integer) reader.readObject()).intValue();

! 		Object value= null;
! 		for (int i= 0; i < count; i++) {
! 			value= reader.readObject();

! 			MD5Sum sum = new MD5Sum((byte[]) value);
! 			value = reader.readObject();
! 			sum.setTimestamp(((Long) value).longValue());
! 			
! 			map.addMessageMD5Sum(sum);
! 		}

! 		reader.close();
! 	}
  }
--- 25,150 ----

  /**
!  *
   *
   * @author fdietz
   */
  public class FrequencyIO {
+     
+     /**
+      * Save frequency db to file.
+      *
+      * @param map			frequency db
+      * @param file			file
+      * @throws Exception
+      */
+     public static void save(FrequencyDB map, File file) throws IOException {
+         ObjectWriter writer = null;
+         try {
+             writer = new ObjectWriter(file);

!             // save bad/good message count
!             writer.writeObject(new Integer(map.getBadMessageCount()));
!             writer.writeObject(new Integer(map.getGoodMessageCount()));

!             // save total number of tokens
!             writer.writeObject(new Integer(map.tokenCount()));

!             Iterator it = map.tokenKeyIterator();
!             while (it.hasNext()) {
!                 String key= (String) it.next();
!                 DBToken token= map.getToken(key);
!                             /*
!                             MacchiatoLogger.log.info(
!                                     " write token[" + key + "]=" + token.toString());
!                              */
!                 writer.writeObject(key);

!                 writer.writeObject(new Integer(token.getBadCount()));
!                 writer.writeObject(new Integer(token.getGoodCount()));
!                 writer.writeObject(new Float(token.getScore()));
!                 writer.writeObject(new Long(token.getTimeStamp()));
!             }

!             // save total number of message md5 sums
!             writer.writeObject(new Integer(map.md5SumCount()));

!             it = map.md5SumIterator();
!             while (it.hasNext()) {
!                 byte[] data = (byte[]) it.next();
!                 MD5Sum sum = map.getMessageMD5Sum(data);

!                 writer.writeObject(data);
!                 writer.writeObject(new Long(sum.getTimestamp()));
!             }
!         } finally {
!             if (writer != null) {
!                 writer.close();
!             }
!         }
!     }
!     
!     /**
!      * Load frequency db from file.
!      *
!      * @param map			frequency map
!      * @param file			file
!      * @throws Exception
!      */
!     public static void load(FrequencyDB map, File file) throws IOException {
!         ObjectReader reader = null;
!         try {
!             reader = new ObjectReader(file);

!             // read bad/good message count
!             map.setBadMessageCount(((Integer) reader.readObject()).intValue());
!             map.setGoodMessageCount(((Integer) reader.readObject()).intValue());

!             // read total number of tokens
!             int count = ((Integer) reader.readObject()).intValue();

!             String o = null;
!             for (int i = 0; i < count; i++) {

!                 o = (String) reader.readObject();
!                 DBToken token = new DBTokenImpl(o);

!                 Integer bad = (Integer) reader.readObject();
!                 token.setBadCount(bad.intValue());
!                 Integer good = (Integer) reader.readObject();
!                 token.setGoodCount(good.intValue());
!                 Float score = (Float) reader.readObject();
!                 token.setScore(score.floatValue());
!                 Long timeStamp = (Long) reader.readObject();
!                 token.setTimeStamp(timeStamp.longValue());

!                             /*
!                             MacchiatoLogger.log.info(
!                                     "read token[" + o + "]=" + token);
!                              */

!                 map.addToken(token);
!             }

!             // read total number of message md5 sums
!             count = ((Integer) reader.readObject()).intValue();

!             Object value = null;
!             for (int i = 0; i < count; i++) {
!                 value = reader.readObject();

!                 MD5Sum sum = new MD5Sum((byte[]) value);
!                 value = reader.readObject();
!                 sum.setTimestamp(((Long) value).longValue());

!                 map.addMessageMD5Sum(sum);
!             }
!         } catch (ClassNotFoundException cnfe) {
!             //this is a desaster and should not occur at all
!             throw new RuntimeException(cnfe);
!         } finally {
!             if (reader != null) {
!                 reader.close();
!             }
!         }
!     }
  }