[Taka-cvs] takaglyphedit/org/takadb/editor/database DBControllerClient.java, 1.11, 1.12

[Benoit C. <ben...@us...>]

Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/database
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32537/org/takadb/editor/database

Modified Files:
	DBControllerClient.java 
Log Message:
new command: save and clean all elements

Index: DBControllerClient.java
===================================================================
RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/database/DBControllerClient.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DBControllerClient.java	5 Oct 2008 22:18:59 -0000	1.11
--- DBControllerClient.java	7 Mar 2009 21:25:12 -0000	1.12
***************
*** 14,17 ****
--- 14,18 ----
  import java.lang.ref.WeakReference;
  import java.sql.Connection;
+ import java.util.ArrayList;
  import java.util.Collections;
  import java.util.HashSet;
***************
*** 122,126 ****
  		Iterator<CharacterEntity> iter = getAllCharacters().iterator();
  		while (iter.hasNext()) {
! 			CharacterEntity character = (CharacterEntity)iter.next();
  			character.persist();
  		}
--- 123,127 ----
  		Iterator<CharacterEntity> iter = getAllCharacters().iterator();
  		while (iter.hasNext()) {
! 			CharacterEntity character = iter.next();
  			character.persist();
  		}
***************
*** 135,142 ****
  
  		Iterator<ElementEntity> iter = getAllElements().iterator();
! 		while (iter.hasNext()) {
  			ElementEntity element = iter.next();
  			element.persist();
  		}
  
  	}
--- 136,163 ----
  
  		Iterator<ElementEntity> iter = getAllElements().iterator();
! 		ArrayList<ElementEntity> lToDelete = new ArrayList<ElementEntity>();
! 		while (iter.hasNext()) 
! 		{
  			ElementEntity element = iter.next();
+ 			//check if the element is used
+ 			DBElementSearch.ElementSearchNode search = new DBElementSearch.ElementSearchElementNode (-1, -1, element.elementId, true);
+ 			HashSet<Integer> results = DBElementSearch.searchElements (this, search);
+ 			if (results.size() == 1)  //the element itself is included
+ 			{
+ 				DBIdentifier lCharId = this.findCharacterByJaElementId(element.elementId);
+ 				if ( lCharId == null )
+ 				{
+ 					lToDelete.add(element);
+ 					continue;
+ 				}
+ 			}
  			element.persist();
  		}
+ 		for (Iterator<ElementEntity> lToDeleteIter = lToDelete.iterator(); lToDeleteIter.hasNext();)
+ 		{
+ 			ElementEntity elementEntity = lToDeleteIter.next();
+ 			File lFile =  new File(savePath + elementEntity.elementId + ".xml");
+ 			lFile.delete();
+ 		}
  
  	}