[Taka-cvs] takaglyphedit/org/takadb/editor/shell UIEditorElementPanel.java, 1.9, 1.10 UIRelationshipWindow.java, 1.15, 1.16 UIEditorWindow.java, 1.22, 1.23

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

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

Modified Files:
	UIEditorElementPanel.java UIRelationshipWindow.java 
	UIEditorWindow.java 
Log Message:
new reload action
new UCS column in rel window

Index: UIEditorElementPanel.java
===================================================================
RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/shell/UIEditorElementPanel.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** UIEditorElementPanel.java	5 Oct 2008 22:18:59 -0000	1.9
--- UIEditorElementPanel.java	13 Mar 2009 02:29:09 -0000	1.10
***************
*** 96,99 ****
--- 96,102 ----
  			this.changed = true;
  			signalListeners();
+ 			variantsTable.repaint();
+ 			setEditedGlyph (thisElement.glyphs.size());
+ 			repaint();
  		} else if (e.getSource() == cloneVariantButton) {
  			ElementEntity.Glyph newGlyph = (ElementEntity.Glyph)thisElement.glyphs.get (new Integer (currentEditedGlyph)).clone();
***************
*** 102,107 ****
  			this.changed = true;
  			signalListeners();
! 		} else if (e.getSource() == deleteVariantButton) {
! 			// FIXME
  		}
  
--- 105,123 ----
  			this.changed = true;
  			signalListeners();
! 			setEditedGlyph (thisElement.glyphs.size());
! 			variantsTable.repaint();
! 		} else if (e.getSource() == deleteVariantButton) 
! 		{
! 			/*
! 			if (thisElement.glyphs.size() > 1)
! 			{
! 				thisElement.glyphs.remove(new Integer(currentEditedGlyph));
! 				variantsTableModel.fireTableDataChanged();
! 				setEditedGlyph(0);
! 				this.changed = true;
! 				signalListeners();
! 				variantsTable.repaint();
! 			}
! 			*/
  		}
  

Index: UIRelationshipWindow.java
===================================================================
RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/shell/UIRelationshipWindow.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** UIRelationshipWindow.java	9 Mar 2009 18:17:14 -0000	1.15
--- UIRelationshipWindow.java	13 Mar 2009 02:29:09 -0000	1.16
***************
*** 242,245 ****
--- 242,247 ----
  						return "Element";
  					case 3:
+ 						return "UCS";
+ 					case 4:
  						return "JIS";
  				}
***************
*** 286,292 ****
--- 288,303 ----
  							{
  								CharacterEntity lChar = (CharacterEntity)dbcontroller.getCharacter(new Integer(((CharacterEntity.Identifier)lCharId).characterId));
+ 								return Integer.toString(lChar.jaUcsCode, 16).toUpperCase();
+ 							}
+ 							break;
+ 						case 4:
+ 							lCharId = dbcontroller.findCharacterByJaElementId(elementId.intValue());
+ 							if ( lCharId != null )
+ 							{
+ 								CharacterEntity lChar = (CharacterEntity)dbcontroller.getCharacter(new Integer(((CharacterEntity.Identifier)lCharId).characterId));
  								return Integer.toString(lChar.jaJisCode, 16).toUpperCase();
  							}
  							break;
+ 						
  					}
  				}

Index: UIEditorWindow.java
===================================================================
RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/shell/UIEditorWindow.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** UIEditorWindow.java	7 Mar 2009 21:25:12 -0000	1.22
--- UIEditorWindow.java	13 Mar 2009 02:29:09 -0000	1.23
***************
*** 5,8 ****
--- 5,9 ----
  package org.takadb.editor.shell;
  
+ import java.io.File;
  import java.util.*;
  import java.awt.*;
***************
*** 401,407 ****
--- 402,470 ----
  		public void actionPerformed(ActionEvent e) {
  			DBControllerClient.getInstance().loadAllXML();
+ 			setEditedObject (currentEditedObject.getIdentifier());
+ 		}
+ 
+ 	}
+ 	
+ 	private class ReloadAction extends AbstractAction 
+ 	{
+ 		private static final long serialVersionUID = 1L;
+ 		public ReloadAction()
+ 		{
+ 			super ("Reload");
  		}
+ 		
+ 		public void actionPerformed(ActionEvent e)
+ 		{
+ 			if (currentEditedObject != null && currentEditedObject instanceof ElementEntity)
+ 			{
+ 				 String elementPath = TakaEditorClientPreferences.getDataPath() + "/xml/element/" + ((ElementEntity)currentEditedObject).elementId + ".xml";
+ 				 if (new File(elementPath).isFile())
+ 				 {
+ 					 try
+ 					 {
+ 						 ElementEntity element = (ElementEntity)XStreamUtil.xmlLoadObject (elementPath);
+ 						 if (element != null)
+ 						 {
+ 							 DBControllerClient.getInstance().setElement(element);
+ 							 setEditedObject (new ElementEntity.Identifier (element.elementId));
+ 						 }
+ 					 }
+ 					 catch (com.thoughtworks.xstream.converters.ConversionException lE)
+ 					 {
+ 						 System.err.println("Error parsing file: " + elementPath);
+ 						 throw lE;
+ 					 }
+ 				 
+ 					
+ 				 }
  
+ 			 }
+ 			else if (currentEditedObject != null && currentEditedObject instanceof CharacterEntity)
+ 			{
+ 				 String characterPath = TakaEditorClientPreferences.getDataPath() + "/xml/character/" + ((CharacterEntity)currentEditedObject).characterId + "xml";
+ 				 if (new File(characterPath).isFile())
+ 				 {
+ 					 try
+ 					 {
+ 						 CharacterEntity character = (CharacterEntity)XStreamUtil.xmlLoadObject (characterPath);
+ 						 if (character != null)
+ 						 {
+ 							 DBControllerClient.getInstance().setCharacter(character);
+ 							 setEditedObject (new CharacterEntity.Identifier(character.characterId));
+ 						 }
+ 					 }
+ 					 catch (com.thoughtworks.xstream.converters.ConversionException lE)
+ 					 {
+ 						 System.err.println("Error parsing file: " + characterPath);
+ 						 throw lE;
+ 					 }
+ 				 
+ 					
+ 				 }
+ 			}
+ 		}
  	}
+ 	
  
  	private class CleanAllElements extends AbstractAction {
***************
*** 530,533 ****
--- 593,597 ----
  		fileMenu.addSeparator();
  		fileMenu.add (new ReloadXMLAction());
+ 		fileMenu.add(new ReloadAction());
  		fileMenu.add (new CleanAllElements());
  		fileMenu.addSeparator();