Thread: [Jsxe-cvs] SF.net SVN: jsxe: [1162] tags/05pre3/treeview
Status: Inactive
Brought to you by:
ian_lewis
From: <ian...@us...> - 2006-08-22 02:15:42
|
Revision: 1162 Author: ian_lewis Date: 2006-08-21 19:15:35 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=1162&view=rev Log Message: ----------- Updated russian translation Modified Paths: -------------- tags/05pre3/treeview/Changelog tags/05pre3/treeview/messages/messages.ru Modified: tags/05pre3/treeview/Changelog =================================================================== --- tags/05pre3/treeview/Changelog 2006-08-22 02:15:23 UTC (rev 1161) +++ tags/05pre3/treeview/Changelog 2006-08-22 02:15:35 UTC (rev 1162) @@ -1,3 +1,7 @@ +08/21/2006 Ian Lewis <Ian...@me...> + + * Updated russian translation. + 08/08/2006 Ian Lewis <Ian...@me...> * Fixed undo when adding/editing a node that is specified in a DTD/Schema. Modified: tags/05pre3/treeview/messages/messages.ru =================================================================== --- tags/05pre3/treeview/messages/messages.ru 2006-08-22 02:15:23 UTC (rev 1161) +++ tags/05pre3/treeview/messages/messages.ru 2006-08-22 02:15:35 UTC (rev 1162) @@ -1,35 +1,35 @@ # JSXE tree view English properties file -# $Id: messages 1101 2006-08-03 15:40:34Z ian_lewis $ +# $Id: messages 1101 2006-08-03 15:40:34Z ian_lewis $ # Maintained by Alexandr Gridnev (ale...@ya...) #:mode=properties: #:tabSize=4:indentSize=4:noTabs=true: #:folding=explicit:collapseFolds=1: -TreeView.Options.Title=Отображение деревом - -TreeView.Options.Show.Comments=Показывать узлы-комментарии -TreeView.Options.Show.Comments.ToolTip=Если это выбрано - то узлы-комментарии будут отображаться в дереве -TreeView.Options.Continuous.Layout=При движении разделителей - сразу перерисовывать -TreeView.Options.Continuous.Layout.ToolTip=<html>Если выбрано - то при перемещении разделителей то что они разделяют будет сразу перерисовываться.<br>Если не выбрано - то положение линии будет отображаться черной полоской, а перерисовано все будет после того как вы отпустите мышару.</html> -TreeView.Options.Show.Attributes=Показывать элементы атрибутов в дереве: -TreeView.Options.Show.Attributes.ToolTip=<html>Эта опция определяет какие атрибуты элементов будут отображены в дереве.<ul><li><strong>Никаких</strong> - Атрибутов не покажут.</li><li><strong>только ID </strong> - Покажут только атрибут, определенный как ID.</li><li><strong>Все</strong> - Покажут все что есть.</li></ul></html> -Show.Attributes.None=Никаких -Show.Attributes.ID.Only=Только ID -Show.Attributes.All=Все - -treeview.document.root=Это корень документа - -treeview.rename.node.label=Переименовать узел -treeview.remove.node.label=Удалить узел -treeview.add.attribute.label=Добавить атрибут +TreeView.Options.Title=Отображение деревом + +TreeView.Options.Show.Comments=Показывать узлы-комментарии +TreeView.Options.Show.Comments.ToolTip=Если это выбрано - то узлы-комментарии будут отображаться в дереве +TreeView.Options.Continuous.Layout=При движении разделителей - сразу перерисовывать +TreeView.Options.Continuous.Layout.ToolTip=<html>Если выбрано - то при перемещении разделителей то что они разделяют будет сразу перерисовываться.<br>Если не выбрано - то положение линии будет отображаться черной полоской, а перерисовано все будет после того как вы отпустите мышару.</html> +TreeView.Options.Show.Attributes=Показывать элементы атрибутов в дереве: +TreeView.Options.Show.Attributes.ToolTip=<html>Эта опция определяет какие атрибуты элементов будут отображены в дереве.<ul><li><strong>Никаких</strong> - Атрибутов не покажут.</li><li><strong>только ID </strong> - Покажут только атрибут, определенный как ID.</li><li><strong>Все</strong> - Покажут все что есть.</li></ul></html> +Show.Attributes.None=Никаких +Show.Attributes.ID.Only=Только ID +Show.Attributes.All=Все + +treeview.document.root=Это корень документа + +treeview.rename.node.label=Переименовать узел +treeview.remove.node.label=Удалить узел +treeview.add.attribute.label=Добавить атрибут treeview.remove.attribute.label=Удалить атрибут -treeview.edit.node.label=Редактировать узел -TreeView.EditDocType.Title=Редактировать определение типа документа (DTD) -Edit.Node.Dialog.Title=Редактирование узла - -treeview.add.doctype.node.label=Добавить определение типа документа (DTD) -treeview.add.element.node.label=Добавить узел-элемент -treeview.add.text.node.label=Добавить узел-текст -treeview.add.cdata.node.label=Добавиь узел-CDATA -treeview.add.pi.node.label=Добавить правило обработки -treeview.add.comment.node.label=Добавить комментарий +treeview.edit.node.label=Редактировать узел +TreeView.EditDocType.Title=Редактировать определение типа документа (DTD) +Edit.Node.Dialog.Title=Редактирование узла + +treeview.add.doctype.node.label=Добавить определение типа документа (DTD) +treeview.add.element.node.label=Добавить узел-элемент +treeview.add.text.node.label=Добавить узел-текст +treeview.add.cdata.node.label=Добавиь узел-CDATA +treeview.add.pi.node.label=Добавить правило обработки +treeview.add.comment.node.label=Добавить комментарий This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ian...@us...> - 2006-08-31 03:18:59
|
Revision: 1209 http://svn.sourceforge.net/jsxe/?rev=1209&view=rev Author: ian_lewis Date: 2006-08-30 20:18:53 -0700 (Wed, 30 Aug 2006) Log Message: ----------- Merge from trunk rev. 1208 Modified Paths: -------------- tags/05pre3/treeview/Changelog tags/05pre3/treeview/dependency.props tags/05pre3/treeview/src/treeview/TreeViewTree.java tags/05pre3/treeview/src/treeview/action/CutNodeAction.java Modified: tags/05pre3/treeview/Changelog =================================================================== --- tags/05pre3/treeview/Changelog 2006-08-30 18:26:35 UTC (rev 1208) +++ tags/05pre3/treeview/Changelog 2006-08-31 03:18:53 UTC (rev 1209) @@ -1,3 +1,12 @@ +08/30/2006 Ian Lewis <Ian...@me...> + + * Fixed null pointer exception when trying to cut a node that can't be + cut. + +08/29/2006 Ian Lewis <Ian...@me...> + + * Updated japanese translation + 08/21/2006 Ian Lewis <Ian...@me...> * Updated russian translation. Modified: tags/05pre3/treeview/dependency.props =================================================================== --- tags/05pre3/treeview/dependency.props 2006-08-30 18:26:35 UTC (rev 1208) +++ tags/05pre3/treeview/dependency.props 2006-08-31 03:18:53 UTC (rev 1209) @@ -1 +1 @@ -dependency.0=jsxe 00.05.03.00 +dependency.0=jsxe 00.05.04.00 Modified: tags/05pre3/treeview/src/treeview/TreeViewTree.java =================================================================== --- tags/05pre3/treeview/src/treeview/TreeViewTree.java 2006-08-30 18:26:35 UTC (rev 1208) +++ tags/05pre3/treeview/src/treeview/TreeViewTree.java 2006-08-31 03:18:53 UTC (rev 1209) @@ -196,8 +196,8 @@ Clipboard clipBoard = getToolkit().getSystemClipboard(); if (selectedNode != null) { try { - clipBoard.setContents(new TransferableNode(selectedNode), this); selectedNode.getParentNode().remove(selectedNode); + clipBoard.setContents(new TransferableNode(selectedNode), this); updateUI(); return true; } catch (IllegalStateException e) { @@ -205,7 +205,6 @@ } catch (HeadlessException e) { Log.log(Log.ERROR, this, e); } catch (DOMException e) { - clipBoard.setContents(null, this); throw e; } } Modified: tags/05pre3/treeview/src/treeview/action/CutNodeAction.java =================================================================== --- tags/05pre3/treeview/src/treeview/action/CutNodeAction.java 2006-08-30 18:26:35 UTC (rev 1208) +++ tags/05pre3/treeview/src/treeview/action/CutNodeAction.java 2006-08-31 03:18:53 UTC (rev 1209) @@ -29,10 +29,7 @@ import treeview.*; //{{{ AWT classes -import java.awt.datatransfer.Clipboard; import java.awt.event.ActionEvent; -import java.awt.Toolkit; -import java.awt.HeadlessException; //}}} //{{{ Swing classes @@ -52,6 +49,7 @@ import net.sourceforge.jsxe.gui.DocumentView; import net.sourceforge.jsxe.gui.Messages; import net.sourceforge.jsxe.gui.TabbedView; +import net.sourceforge.jsxe.gui.GUIUtilities; import net.sourceforge.jsxe.dom.AdapterNode; import net.sourceforge.jsxe.util.Log; //}}} @@ -91,7 +89,7 @@ try { tree.cut(); } catch (DOMException dome) { - JOptionPane.showMessageDialog(tree, dome, "XML Error", JOptionPane.WARNING_MESSAGE); + GUIUtilities.error(tree, "XML.Error", new Object[] { dome }); } } }//}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ian...@us...> - 2006-08-31 20:20:21
|
Revision: 1212 http://svn.sourceforge.net/jsxe/?rev=1212&view=rev Author: ian_lewis Date: 2006-08-31 13:20:10 -0700 (Thu, 31 Aug 2006) Log Message: ----------- Updated the treeview to use new ContextSpecificActions Modified Paths: -------------- tags/05pre3/treeview/Changelog tags/05pre3/treeview/src/treeview/DefaultView.java tags/05pre3/treeview/src/treeview/TreeViewPlugin.java tags/05pre3/treeview/src/treeview/TreeViewTree.java tags/05pre3/treeview/src/treeview/action/CopyNodeAction.java tags/05pre3/treeview/src/treeview/action/CutNodeAction.java tags/05pre3/treeview/src/treeview/action/PasteNodeAction.java Modified: tags/05pre3/treeview/Changelog =================================================================== --- tags/05pre3/treeview/Changelog 2006-08-31 20:19:03 UTC (rev 1211) +++ tags/05pre3/treeview/Changelog 2006-08-31 20:20:10 UTC (rev 1212) @@ -1,3 +1,8 @@ +08/31/2006 Ian Lewis <Ian...@me...> + + * Updated the sourceview actions to use the new ContextSpecificActions in + jsXe. + 08/30/2006 Ian Lewis <Ian...@me...> * Fixed null pointer exception when trying to cut a node that can't be Modified: tags/05pre3/treeview/src/treeview/DefaultView.java =================================================================== --- tags/05pre3/treeview/src/treeview/DefaultView.java 2006-08-31 20:19:03 UTC (rev 1211) +++ tags/05pre3/treeview/src/treeview/DefaultView.java 2006-08-31 20:20:10 UTC (rev 1212) @@ -32,8 +32,10 @@ import net.sourceforge.jsxe.dom.*; import net.sourceforge.jsxe.dom.completion.ElementDecl; import net.sourceforge.jsxe.*; +import net.sourceforge.jsxe.action.ContextSpecificAction; import net.sourceforge.jsxe.gui.DocumentView; import net.sourceforge.jsxe.gui.Messages; +import net.sourceforge.jsxe.gui.TabbedView; import net.sourceforge.jsxe.util.Log; import net.sourceforge.jsxe.msg.PropertyChanged; import net.sourceforge.jsxe.msg.UndoEvent; @@ -120,6 +122,7 @@ m_valueTextArea.setFont(new Font("Monospaced", 0, 12)); m_valueTextArea.setLineWrap(false); JScrollPane htmlView = new JScrollPane(m_valueTextArea); + //}}} //{{{ init attributes table @@ -138,6 +141,11 @@ JScrollPane treeView = new JScrollPane(tree); tree.addTreeSelectionListener(new DefaultTreeSelectionListener(this)); + //add context specific actions for the tree. + ActionManager.addActionImplementation("cut", tree, new CutNodeAction()); + ActionManager.addActionImplementation("copy", tree, new CopyNodeAction()); + ActionManager.addActionImplementation("paste", tree, new PasteNodeAction()); + //starts editing if the user start typing on one of the nodes //seems to catch user shortcuts too. Not sure how to resolve that. @@ -233,6 +241,10 @@ } } + ActionManager.removeActionImplementation("cut", tree); + ActionManager.removeActionImplementation("copy", tree); + ActionManager.removeActionImplementation("paste", tree); + EditBus.removeFromBus(this); return true; Modified: tags/05pre3/treeview/src/treeview/TreeViewPlugin.java =================================================================== --- tags/05pre3/treeview/src/treeview/TreeViewPlugin.java 2006-08-31 20:19:03 UTC (rev 1211) +++ tags/05pre3/treeview/src/treeview/TreeViewPlugin.java 2006-08-31 20:20:10 UTC (rev 1212) @@ -63,9 +63,6 @@ addAction(new RemoveAttributeAction()); addAction(new EditNodeAction()); addAction(new AddDocTypeAction()); - addAction(new CutNodeAction()); - addAction(new CopyNodeAction()); - addAction(new PasteNodeAction()); }//}}} //{{{ newDocumentView() Modified: tags/05pre3/treeview/src/treeview/TreeViewTree.java =================================================================== --- tags/05pre3/treeview/src/treeview/TreeViewTree.java 2006-08-31 20:19:03 UTC (rev 1211) +++ tags/05pre3/treeview/src/treeview/TreeViewTree.java 2006-08-31 20:20:10 UTC (rev 1212) @@ -684,48 +684,48 @@ }//}}} - //{{{ ElementTreeCellRenderer class + // //{{{ ElementTreeCellRenderer class - private class ElementTreeCellRenderer extends DefaultTreeCellRenderer { + // private class ElementTreeCellRenderer extends DefaultTreeCellRenderer { - //{{{ ElementTreeCellRenderer constructor + // //{{{ ElementTreeCellRenderer constructor - public ElementTreeCellRenderer() { - m_defaultLeafIcon = getLeafIcon(); - }//}}} + // public ElementTreeCellRenderer() { + // m_defaultLeafIcon = getLeafIcon(); + // }//}}} - //{{{ getTreeCellRendererComponent + // //{{{ getTreeCellRendererComponent - public Component getTreeCellRendererComponent(JTree tree, - Object value, boolean selected, boolean expanded, - boolean leaf, int row, boolean hasFocus) - { - AdapterNode node = (AdapterNode)value; + // public Component getTreeCellRendererComponent(JTree tree, + // Object value, boolean selected, boolean expanded, + // boolean leaf, int row, boolean hasFocus) + // { + // AdapterNode node = (AdapterNode)value; - // We can rename processing instruction nodes here too. - if (node.getNodeType() == AdapterNode.PROCESSING_INSTRUCTION_NODE) { - setIcon(m_defaultLeafIcon); - setLeafIcon(m_defaultLeafIcon); - setOpenIcon(m_defaultLeafIcon); - setClosedIcon(m_defaultLeafIcon); - setToolTipText(Messages.getMessage("xml.processing.instruction")); - } else { - setIcon(m_elementIcon); - setLeafIcon(m_elementIcon); - setOpenIcon(m_elementIcon); - setClosedIcon(m_elementIcon); - setToolTipText(Messages.getMessage("xml.element")); - } + // // We can rename processing instruction nodes here too. + // if (node.getNodeType() == AdapterNode.PROCESSING_INSTRUCTION_NODE) { + // setIcon(m_defaultLeafIcon); + // setLeafIcon(m_defaultLeafIcon); + // setOpenIcon(m_defaultLeafIcon); + // setClosedIcon(m_defaultLeafIcon); + // setToolTipText(Messages.getMessage("xml.processing.instruction")); + // } else { + // setIcon(m_elementIcon); + // setLeafIcon(m_elementIcon); + // setOpenIcon(m_elementIcon); + // setClosedIcon(m_elementIcon); + // setToolTipText(Messages.getMessage("xml.element")); + // } - //just use the node name, we don't want attributes and such. - setText(((AdapterNode)value).getNodeName()); - return this; + // //just use the node name, we don't want attributes and such. + // setText(((AdapterNode)value).getNodeName()); + // return this; - }//}}} + // }//}}} - private Icon m_defaultLeafIcon; + // private Icon m_defaultLeafIcon; - }//}}} + // }//}}} //{{{ ElementCellEditor class Modified: tags/05pre3/treeview/src/treeview/action/CopyNodeAction.java =================================================================== --- tags/05pre3/treeview/src/treeview/action/CopyNodeAction.java 2006-08-31 20:19:03 UTC (rev 1211) +++ tags/05pre3/treeview/src/treeview/action/CopyNodeAction.java 2006-08-31 20:20:10 UTC (rev 1212) @@ -29,10 +29,8 @@ import treeview.*; //{{{ AWT classes -import java.awt.datatransfer.Clipboard; import java.awt.event.ActionEvent; -import java.awt.Toolkit; -import java.awt.HeadlessException; +import java.awt.Component; //}}} //{{{ Swing classes @@ -43,7 +41,7 @@ //{{{ jsXe classes import net.sourceforge.jsxe.jsXe; -import net.sourceforge.jsxe.LocalizedAction; +import net.sourceforge.jsxe.action.ContextSpecificAction; import net.sourceforge.jsxe.gui.DocumentView; import net.sourceforge.jsxe.gui.Messages; import net.sourceforge.jsxe.gui.TabbedView; @@ -60,24 +58,10 @@ * @author Ian Lewis (<a href="mailto:Ian...@me...">Ian...@me...</a>) * @version $Id$ */ -public class CopyNodeAction extends LocalizedAction { +public class CopyNodeAction implements ContextSpecificAction.ActionImplementation { - //{{{ CopyNodeAction constructor - /** - * Creates a action that copies the current node out of the tree and into - * the clipboard. - */ - public CopyNodeAction() { - super(TreeViewPlugin.PLUGIN_NAME+".copy"); - }//}}} - - //{{{ getLabel() - public String getLabel() { - return Messages.getMessage("common.copy"); - }//}}} - //{{{ invoke() - public void invoke(TabbedView view, ActionEvent evt) { + public void invoke(TabbedView view, Component comp, ActionEvent evt) { DocumentView docView = view.getDocumentView(); if (docView instanceof DefaultView) { DefaultView defView = (DefaultView)docView; Modified: tags/05pre3/treeview/src/treeview/action/CutNodeAction.java =================================================================== --- tags/05pre3/treeview/src/treeview/action/CutNodeAction.java 2006-08-31 20:19:03 UTC (rev 1211) +++ tags/05pre3/treeview/src/treeview/action/CutNodeAction.java 2006-08-31 20:20:10 UTC (rev 1212) @@ -30,6 +30,7 @@ //{{{ AWT classes import java.awt.event.ActionEvent; +import java.awt.Component; //}}} //{{{ Swing classes @@ -45,11 +46,10 @@ //{{{ jsXe classes import net.sourceforge.jsxe.jsXe; -import net.sourceforge.jsxe.LocalizedAction; +import net.sourceforge.jsxe.action.ContextSpecificAction; import net.sourceforge.jsxe.gui.DocumentView; import net.sourceforge.jsxe.gui.Messages; import net.sourceforge.jsxe.gui.TabbedView; -import net.sourceforge.jsxe.gui.GUIUtilities; import net.sourceforge.jsxe.dom.AdapterNode; import net.sourceforge.jsxe.util.Log; //}}} @@ -63,25 +63,10 @@ * @author Ian Lewis (<a href="mailto:Ian...@me...">Ian...@me...</a>) * @version $Id$ */ -public class CutNodeAction extends LocalizedAction { +public class CutNodeAction implements ContextSpecificAction.ActionImplementation { - //{{{ CutNodeAction constructor - /** - * Creates a action that cuts the current node out of the tree and into - * the clipboard. - */ - public CutNodeAction() { - super(TreeViewPlugin.PLUGIN_NAME+".cut"); - // putValue(Action.ACCELERATOR_KEY,KeyStroke.getKeyStroke("ctrl X")); - }//}}} - - //{{{ getLabel() - public String getLabel() { - return Messages.getMessage("common.cut"); - }//}}} - //{{{ invoke() - public void invoke(TabbedView view, ActionEvent evt) { + public void invoke(TabbedView view, Component comp, ActionEvent evt) { DocumentView docView = view.getDocumentView(); if (docView instanceof DefaultView) { DefaultView defView = (DefaultView)docView; @@ -89,7 +74,7 @@ try { tree.cut(); } catch (DOMException dome) { - GUIUtilities.error(tree, "XML.Error", new Object[] { dome }); + JOptionPane.showMessageDialog(tree, dome, "XML Error", JOptionPane.WARNING_MESSAGE); } } }//}}} Modified: tags/05pre3/treeview/src/treeview/action/PasteNodeAction.java =================================================================== --- tags/05pre3/treeview/src/treeview/action/PasteNodeAction.java 2006-08-31 20:19:03 UTC (rev 1211) +++ tags/05pre3/treeview/src/treeview/action/PasteNodeAction.java 2006-08-31 20:20:10 UTC (rev 1212) @@ -29,10 +29,8 @@ import treeview.*; //{{{ AWT classes -import java.awt.datatransfer.Clipboard; import java.awt.event.ActionEvent; -import java.awt.Toolkit; -import java.awt.HeadlessException; +import java.awt.Component; //}}} //{{{ Swing classes @@ -48,7 +46,7 @@ //{{{ jsXe classes import net.sourceforge.jsxe.jsXe; -import net.sourceforge.jsxe.LocalizedAction; +import net.sourceforge.jsxe.action.ContextSpecificAction; import net.sourceforge.jsxe.gui.DocumentView; import net.sourceforge.jsxe.gui.Messages; import net.sourceforge.jsxe.gui.TabbedView; @@ -65,24 +63,10 @@ * @author Ian Lewis (<a href="mailto:Ian...@me...">Ian...@me...</a>) * @version $Id$ */ -public class PasteNodeAction extends LocalizedAction { +public class PasteNodeAction implements ContextSpecificAction.ActionImplementation { - //{{{ PasteNodeAction constructor - /** - * Creates an action that pastes the node in the clipboard to the currently - * selected node in the tree. - */ - public PasteNodeAction() { - super(TreeViewPlugin.PLUGIN_NAME+".paste"); - }//}}} - - //{{{ getLabel() - public String getLabel() { - return Messages.getMessage("common.paste"); - }//}}} - //{{{ invoke() - public void invoke(TabbedView view, ActionEvent evt) { + public void invoke(TabbedView view, Component comp, ActionEvent evt) { DocumentView docView = view.getDocumentView(); if (docView instanceof DefaultView) { DefaultView defView = (DefaultView)docView; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ian...@us...> - 2006-10-20 10:31:42
|
Revision: 1260 http://svn.sourceforge.net/jsxe/?rev=1260&view=rev Author: ian_lewis Date: 2006-10-20 03:31:32 -0700 (Fri, 20 Oct 2006) Log Message: ----------- Updated Japanese translation Modified Paths: -------------- tags/05pre3/treeview/Changelog tags/05pre3/treeview/messages/messages.ja Modified: tags/05pre3/treeview/Changelog =================================================================== --- tags/05pre3/treeview/Changelog 2006-10-20 10:22:12 UTC (rev 1259) +++ tags/05pre3/treeview/Changelog 2006-10-20 10:31:32 UTC (rev 1260) @@ -1,3 +1,7 @@ +10/20/2006 Ian Lewis <Ian...@me...> + + * Updated Japanese translation. + 08/31/2006 Ian Lewis <Ian...@me...> * Updated the sourceview actions to use the new ContextSpecificActions in Modified: tags/05pre3/treeview/messages/messages.ja =================================================================== --- tags/05pre3/treeview/messages/messages.ja 2006-10-20 10:22:12 UTC (rev 1259) +++ tags/05pre3/treeview/messages/messages.ja 2006-10-20 10:31:32 UTC (rev 1260) @@ -13,7 +13,7 @@ Show.Attributes.ID.Only=IDだけ Show.Attributes.All=全て -treeview.rename.node.label=ノードをリネーム +treeview.rename.node.label=ノードの名前を変更する treeview.remove.node.label=ノードを削除 treeview.add.attribute.label=属性を追加 treeview.remove.attribute.label=属性を削除 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |