[Taka-cvs] takaglyphedit/org/takadb/editor/database/entities MultiradEntity.java, 1.2, 1.3 RadicalEntity.java, 1.5, 1.6

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

Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19097/org/takadb/editor/database/entities

Modified Files:
	MultiradEntity.java RadicalEntity.java 
Log Message:
improvements to multirads

Index: RadicalEntity.java
===================================================================
RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities/RadicalEntity.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RadicalEntity.java	5 Oct 2008 22:18:59 -0000	1.5
--- RadicalEntity.java	9 Jan 2010 19:37:23 -0000	1.6
***************
*** 263,266 ****
--- 263,268 ----
  
  		for (int i = 0; i < radicalNames.length; i++) {
+ 			if (!radicalNames[i].endsWith("xml"))
+ 				continue;
  			String filename = radicalPath + radicalNames[i];
  			if (new File (filename).isFile()) {

Index: MultiradEntity.java
===================================================================
RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities/MultiradEntity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MultiradEntity.java	8 Oct 2008 23:50:29 -0000	1.2
--- MultiradEntity.java	9 Jan 2010 19:37:23 -0000	1.3
***************
*** 57,61 ****
  							else if (lTokens[3].equals("js03"))
  							{
! 								lMultiRad._elementId = 1783;
  							}
  							else if (lTokens[3].equals("js04"))
--- 57,61 ----
  							else if (lTokens[3].equals("js03"))
  							{
! 								lMultiRad._elementId = 50002;
  							}
  							else if (lTokens[3].equals("js04"))
***************
*** 69,73 ****
  							else if (lTokens[3].equals("js06"))
  							{
! 								//need to create an element
  							}
  							else if (lTokens[3].equals("js07"))
--- 69,73 ----
  							else if (lTokens[3].equals("js06"))
  							{
! 								lMultiRad._elementId = 1565;
  							}
  							else if (lTokens[3].equals("js07"))
***************
*** 75,78 ****
--- 75,85 ----
  								lMultiRad._elementId = 2481;
  							}
+ 							else if (lTokens[3].equals("js08"))
+ 							{
+ 								lMultiRad._elementId = 50000;
+ 							}else if (lTokens[3].equals("js09"))
+ 							{
+ 								lMultiRad._elementId = 50001;
+ 							}
  						} else
  						{