[Jsxe-cvs] SF.net SVN: jsxe: [1233] branches/sourceview2
Status: Inactive
Brought to you by:
ian_lewis
Menu
▾
▴
[Jsxe-cvs] SF.net SVN: jsxe: [1233] branches/sourceview2
|
From: <ian...@us...> - 2006-09-05 15:47:08
|
Revision: 1233
http://svn.sourceforge.net/jsxe/?rev=1233&view=rev
Author: ian_lewis
Date: 2006-09-05 08:46:47 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
Merge from trunk/sourceview of rev. 1232
'
Modified Paths:
--------------
branches/sourceview2/Changelog
branches/sourceview2/src/sourceview/SourceView.java
branches/sourceview2/src/sourceview/SourceViewDocument.java
branches/sourceview2/src/sourceview/SourceViewPlugin.java
branches/sourceview2/src/sourceview/action/EditCopyAction.java
branches/sourceview2/src/sourceview/action/EditCutAction.java
branches/sourceview2/src/sourceview/action/EditFindAction.java
branches/sourceview2/src/sourceview/action/EditFindNextAction.java
branches/sourceview2/src/sourceview/action/EditPasteAction.java
Added Paths:
-----------
branches/sourceview2/messages/messages.properties
branches/sourceview2/messages/messages_de.properties
branches/sourceview2/messages/messages_en_GB.properties
branches/sourceview2/messages/messages_ja.properties
branches/sourceview2/messages/messages_ru.properties
branches/sourceview2/messages/messages_sv.properties
Removed Paths:
-------------
branches/sourceview2/messages/messages
branches/sourceview2/messages/messages.de
branches/sourceview2/messages/messages.en_GB
branches/sourceview2/messages/messages.ja
branches/sourceview2/messages/messages.sv
Modified: branches/sourceview2/Changelog
===================================================================
--- branches/sourceview2/Changelog 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/Changelog 2006-09-05 15:46:47 UTC (rev 1233)
@@ -1,3 +1,22 @@
+08/31/2006 Ian Lewis <Ian...@me...>
+
+ * Updated the sourceview actions to use the new ContextSpecificActions in
+ jsXe.
+
+08/22/2006 Ian Lewis <Ian...@me...>
+
+ * Changing the encoding now updates the SourceViewDocument so that it
+ doesn't cause the SourceViewDocument to get out of sync with the
+ XMLDocument.
+
+08/21/2006 Ian Lewis <Ian...@me...>
+
+ * Updated russian translation.
+
+08/07/2006 Ian Lewis <Ian...@me...>
+
+ * Moved the edit menu to jsXe core and added a hack so that undo will work.
+
07/26/2006 Ian Lewis <Ian...@me...>
* Addded support for the findnext action
Deleted: branches/sourceview2/messages/messages
===================================================================
--- branches/sourceview2/messages/messages 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/messages/messages 2006-09-05 15:46:47 UTC (rev 1233)
@@ -1,33 +0,0 @@
-# JSXE source view English properties file
-# $Id$
-#:mode=properties:
-#:tabSize=4:indentSize=4:noTabs=true:
-#:folding=explicit:collapseFolds=1
-
-#{{{ Source View Options
-SourceView.Options.Title=Source View
-SourceView.Options.EndOfLineMarker=End of line markers
-SourceView.Syntax.Object=Node Type
-SourceView.Syntax.Style=Text Style
-SourceView.ColorChooser.Title=Color Chooser
-SourceView.Markup=Markup
-SourceView.Invalid=Invalid
-#}}}
-
-#{{{ Style Editor
-SourceView.StyleEditor.Title=Style Editor
-SourceView.StyleEditor.Color=Text Color
-SourceView.StyleEditor.Bold=Bold
-SourceView.StyleEditor.Italics=Italics
-#}}}
-
-#{{{ Find Dialog
-SourceView.Find.title and Replace
-SourceView.Ignore.Case=Ignore Case
-SourceView.Search.For=Search for:
-SourceView.Replace.With=Replace With:
-SourceView.Replace.And.Find=Replace&Find
-SourceView.No.More.Matches.title=No More Matches
-SourceView.No.More.Matches.message="No more matches were found. Continue search from the beginning?"
-SourceView.Search.Error.title=Search Error
-#}}}
\ No newline at end of file
Deleted: branches/sourceview2/messages/messages.de
===================================================================
--- branches/sourceview2/messages/messages.de 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/messages/messages.de 2006-09-05 15:46:47 UTC (rev 1233)
@@ -1,30 +0,0 @@
-# JSXE source view German properties file
-# $Id$
-# Maintained by Bianca Shöen
-#:mode=properties:
-#:tabSize=4:indentSize=4:noTabs=true:
-#:folding=explicit:collapseFolds=1:
-
-# ä Ä é ö Ö ü Ü ß
-
-#{{{ Source View Options
-SourceView.Options.Title=Source View Optionen
-SourceView.Syntax.Object=Knoten Typ
-SourceView.Syntax.Style=Text Stil
-SourceView.Syntax.ToolTip=Dieses Tool ermöglicht es, den Font für verschiedene Knoten zu setzen.
-SourceView.ColorChooser.Title=Farbwähler
-SourceView.Markup=Markup
-SourceView.Invalid=Ungültig
-#}}}
-
-#{{{ Style Editor
-SourceView.StyleEditor.Title=Stil Editor
-SourceView.StyleEditor.Color=Textfarbe
-SourceView.StyleEditor.Color.ToolTip=<HTML>Die Farbe dieses Knoten Typs kann hier geändert werden. <BR>H�ckchen dieser Box entfernen setzten die Farbe zu schwarz zurück. <BR>Die rechteckige Box neben diesr Auswahl, kann<BR> benutzt werden um verschiedene Farben auszuwählen.</HTML>
-SourceView.StyleEditor.Bold=Fett
-SourceView.StyleEditor.Bold.ToolTip=schaltet Fettdruck an/aus
-SourceView.StyleEditor.Italics=Kursiv
-SourceView.StyleEditor.Italics.ToolTip=schaltet Kursivdruck an/aus
-
-#}}}
-
Deleted: branches/sourceview2/messages/messages.en_GB
===================================================================
--- branches/sourceview2/messages/messages.en_GB 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/messages/messages.en_GB 2006-09-05 15:46:47 UTC (rev 1233)
@@ -1,13 +0,0 @@
-# JSXE source view British English properties file
-# $Id: messages 996 2006-07-07 03:46:52Z ian_lewis $
-#:mode=properties:
-#:tabSize=4:indentSize=4:noTabs=true:
-#:folding=explicit:collapseFolds=1
-
-#{{{ Source View Options
-SourceView.ColorChooser.Title=Colour Chooser
-#}}}
-
-#{{{ Style Editor
-SourceView.StyleEditor.Color=Text Colour
-#}}}
Deleted: branches/sourceview2/messages/messages.ja
===================================================================
--- branches/sourceview2/messages/messages.ja 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/messages/messages.ja 2006-09-05 15:46:47 UTC (rev 1233)
@@ -1,13 +0,0 @@
-# JSXE source view Japanese properties file
-# $Id$
-# Maintained by Ian Lewis
-#:mode=properties:
-#:tabSize=4:indentSize=4:noTabs=true:
-#:folding=explicit:collapseFolds=1:
-
-#{{{ Source View Options
-SourceView.Options.Title=ソース表示
-SourceView.Syntax.Object=ノードタイプ
-SourceView.Markup=マーク付け
-SourceView.Invalid=無効
-#}}}
Copied: branches/sourceview2/messages/messages.properties (from rev 1232, trunk/sourceview/messages/messages.properties)
===================================================================
--- branches/sourceview2/messages/messages.properties (rev 0)
+++ branches/sourceview2/messages/messages.properties 2006-09-05 15:46:47 UTC (rev 1233)
@@ -0,0 +1,33 @@
+# JSXE source view English properties file
+# $Id$
+#:mode=properties:
+#:tabSize=4:indentSize=4:noTabs=true:
+#:folding=explicit:collapseFolds=1
+
+#{{{ Source View Options
+SourceView.Options.Title=Source View
+SourceView.Options.EndOfLineMarker=End of line markers
+SourceView.Syntax.Object=Node Type
+SourceView.Syntax.Style=Text Style
+SourceView.ColorChooser.Title=Color Chooser
+SourceView.Markup=Markup
+SourceView.Invalid=Invalid
+#}}}
+
+#{{{ Style Editor
+SourceView.StyleEditor.Title=Style Editor
+SourceView.StyleEditor.Color=Text Color
+SourceView.StyleEditor.Bold=Bold
+SourceView.StyleEditor.Italics=Italics
+#}}}
+
+#{{{ Find Dialog
+SourceView.Find.title and Replace
+SourceView.Ignore.Case=Ignore Case
+SourceView.Search.For=Search for:
+SourceView.Replace.With=Replace With:
+SourceView.Replace.And.Find=Replace&Find
+SourceView.No.More.Matches.title=No More Matches
+SourceView.No.More.Matches.message="No more matches were found. Continue search from the beginning?"
+SourceView.Search.Error.title=Search Error
+#}}}
\ No newline at end of file
Deleted: branches/sourceview2/messages/messages.sv
===================================================================
--- branches/sourceview2/messages/messages.sv 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/messages/messages.sv 2006-09-05 15:46:47 UTC (rev 1233)
@@ -1,7 +0,0 @@
-# JSXE Swedish properties file
-# $Id$
-# Currently maintained by Patrik Johansson <pa...@it...>
-#:mode=properties:
-#:tabSize=4:indentSize=4:noTabs=true:
-#:folding=explicit:collapseFolds=1:
-
Copied: branches/sourceview2/messages/messages_de.properties (from rev 1232, trunk/sourceview/messages/messages_de.properties)
===================================================================
--- branches/sourceview2/messages/messages_de.properties (rev 0)
+++ branches/sourceview2/messages/messages_de.properties 2006-09-05 15:46:47 UTC (rev 1233)
@@ -0,0 +1,30 @@
+# JSXE source view German properties file
+# $Id$
+# Maintained by Bianca Shöen
+#:mode=properties:
+#:tabSize=4:indentSize=4:noTabs=true:
+#:folding=explicit:collapseFolds=1:
+
+# ä Ä é ö Ö ü Ü ß
+
+#{{{ Source View Options
+SourceView.Options.Title=Source View Optionen
+SourceView.Syntax.Object=Knoten Typ
+SourceView.Syntax.Style=Text Stil
+SourceView.Syntax.ToolTip=Dieses Tool ermöglicht es, den Font für verschiedene Knoten zu setzen.
+SourceView.ColorChooser.Title=Farbwähler
+SourceView.Markup=Markup
+SourceView.Invalid=Ungültig
+#}}}
+
+#{{{ Style Editor
+SourceView.StyleEditor.Title=Stil Editor
+SourceView.StyleEditor.Color=Textfarbe
+SourceView.StyleEditor.Color.ToolTip=<HTML>Die Farbe dieses Knoten Typs kann hier geändert werden. <BR>H�ckchen dieser Box entfernen setzten die Farbe zu schwarz zurück. <BR>Die rechteckige Box neben diesr Auswahl, kann<BR> benutzt werden um verschiedene Farben auszuwählen.</HTML>
+SourceView.StyleEditor.Bold=Fett
+SourceView.StyleEditor.Bold.ToolTip=schaltet Fettdruck an/aus
+SourceView.StyleEditor.Italics=Kursiv
+SourceView.StyleEditor.Italics.ToolTip=schaltet Kursivdruck an/aus
+
+#}}}
+
Copied: branches/sourceview2/messages/messages_en_GB.properties (from rev 1232, trunk/sourceview/messages/messages_en_GB.properties)
===================================================================
--- branches/sourceview2/messages/messages_en_GB.properties (rev 0)
+++ branches/sourceview2/messages/messages_en_GB.properties 2006-09-05 15:46:47 UTC (rev 1233)
@@ -0,0 +1,13 @@
+# JSXE source view British English properties file
+# $Id: messages 996 2006-07-07 03:46:52Z ian_lewis $
+#:mode=properties:
+#:tabSize=4:indentSize=4:noTabs=true:
+#:folding=explicit:collapseFolds=1
+
+#{{{ Source View Options
+SourceView.ColorChooser.Title=Colour Chooser
+#}}}
+
+#{{{ Style Editor
+SourceView.StyleEditor.Color=Text Colour
+#}}}
Copied: branches/sourceview2/messages/messages_ja.properties (from rev 1232, trunk/sourceview/messages/messages_ja.properties)
===================================================================
--- branches/sourceview2/messages/messages_ja.properties (rev 0)
+++ branches/sourceview2/messages/messages_ja.properties 2006-09-05 15:46:47 UTC (rev 1233)
@@ -0,0 +1,13 @@
+# JSXE source view Japanese properties file
+# $Id$
+# Maintained by Ian Lewis
+#:mode=properties:
+#:tabSize=4:indentSize=4:noTabs=true:
+#:folding=explicit:collapseFolds=1:
+
+#{{{ Source View Options
+SourceView.Options.Title=ソース表示
+SourceView.Syntax.Object=ノードタイプ
+SourceView.Markup=マーク付け
+SourceView.Invalid=無効
+#}}}
Copied: branches/sourceview2/messages/messages_ru.properties (from rev 1232, trunk/sourceview/messages/messages_ru.properties)
===================================================================
--- branches/sourceview2/messages/messages_ru.properties (rev 0)
+++ branches/sourceview2/messages/messages_ru.properties 2006-09-05 15:46:47 UTC (rev 1233)
@@ -0,0 +1,34 @@
+# JSXE source view English properties file
+# $Id: messages 1068 2006-07-26 16:57:45Z ian_lewis $
+# Maintained by Alexandr Gridnev (ale...@ya...)
+#:mode=properties:
+#:tabSize=4:indentSize=4:noTabs=true:
+#:folding=explicit:collapseFolds=1
+
+#{{{ Source View Options
+SourceView.Options.Title=Отображение исходником
+SourceView.Options.EndOfLineMarker=Отображать символы конца строки
+SourceView.Syntax.Object=Тип узла
+SourceView.Syntax.Style=Стиль текста
+SourceView.ColorChooser.Title=Злобное устройство предназначенное для выбора цветов
+SourceView.Markup=Элементы разметки
+SourceView.Invalid=Неправильное
+#}}}
+
+#{{{ Style Editor
+SourceView.StyleEditor.Title=Редактор стилей
+SourceView.StyleEditor.Color=Цвет текста
+SourceView.StyleEditor.Bold=Жирный
+SourceView.StyleEditor.Italics=Курсив
+#}}}
+
+#{{{ Find Dialog
+SourceView.Find.title=Найти и заменить
+SourceView.Ignore.Case=Игнорировать регистр символов
+SourceView.Search.For=Искать:
+SourceView.Replace.With=Заменить на:
+SourceView.Replace.And.Find=Найти и заменить
+SourceView.No.More.Matches.title=Дальше не найдено :(
+SourceView.No.More.Matches.message="Ничего не найдено. Искать с начала документа?"
+SourceView.Search.Error.title=Ошибка поиска :(
+#}}}
Copied: branches/sourceview2/messages/messages_sv.properties (from rev 1232, trunk/sourceview/messages/messages_sv.properties)
===================================================================
--- branches/sourceview2/messages/messages_sv.properties (rev 0)
+++ branches/sourceview2/messages/messages_sv.properties 2006-09-05 15:46:47 UTC (rev 1233)
@@ -0,0 +1,7 @@
+# JSXE Swedish properties file
+# $Id$
+# Currently maintained by Patrik Johansson <pa...@it...>
+#:mode=properties:
+#:tabSize=4:indentSize=4:noTabs=true:
+#:folding=explicit:collapseFolds=1:
+
Modified: branches/sourceview2/src/sourceview/SourceView.java
===================================================================
--- branches/sourceview2/src/sourceview/SourceView.java 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/src/sourceview/SourceView.java 2006-09-05 15:46:47 UTC (rev 1233)
@@ -25,12 +25,9 @@
package sourceview;
//{{{ imports
-/*
-All classes are listed explicitly so
-it is easy to see which package it
-belongs to.
-*/
+import sourceview.action.*;
+
//{{{ jsXe classes
import net.sourceforge.jsxe.*;
import net.sourceforge.jsxe.gui.Messages;
@@ -39,6 +36,8 @@
import net.sourceforge.jsxe.dom.XMLDocument;
import net.sourceforge.jsxe.dom.XMLDocumentListener;
import net.sourceforge.jsxe.msg.PropertyChanged;
+import net.sourceforge.jsxe.msg.UndoEvent;
+import net.sourceforge.jsxe.msg.RedoEvent;
import net.sourceforge.jsxe.util.Log;
import net.sourceforge.jsxe.util.MiscUtilities;
//}}}
@@ -130,6 +129,12 @@
m_textarea.putClientProperty(InputHandler.SMART_HOME_END_PROPERTY, Boolean.TRUE);
+ ActionManager.addActionImplementation("cut", m_textarea, new EditCutAction());
+ ActionManager.addActionImplementation("copy", m_textarea, new EditCopyAction());
+ ActionManager.addActionImplementation("paste", m_textarea, new EditPasteAction());
+ ActionManager.addActionImplementation("find", m_textarea, new EditFindAction());
+ ActionManager.addActionImplementation("findnext", m_textarea, new EditFindNextAction());
+
//{{{ create popup menu
JPopupMenu popup = new JPopupMenu();
@@ -151,30 +156,6 @@
setLayout(new BorderLayout());
add(m_textarea, BorderLayout.CENTER);
- //{{{ Construct Edit Menu
- m_editMenu = new JMenu(Messages.getMessage("Edit.Menu"));
- m_editMenu.setMnemonic('E');
- // These don't do anything yet.
- // JMenuItem menuItem = new JMenuItem("Undo");
- // menuItem.addActionListener( new EditUndoAction() );
- // menu.add( menuItem );
- // menuItem = new JMenuItem("Redo");
- // menuItem.addActionListener( new EditRedoAction() );
- // menu.add(menuItem);
- // menu.addSeparator();
- menuItem = new JMenuItem(ActionManager.getAction("cut"));
- m_editMenu.add(menuItem);
- menuItem = new JMenuItem(ActionManager.getAction("copy"));
- m_editMenu.add(menuItem);
- menuItem = new JMenuItem(ActionManager.getAction("paste"));
- m_editMenu.add(menuItem);
- m_editMenu.addSeparator();
- menuItem = new JMenuItem(ActionManager.getAction("find"));
- m_editMenu.add(menuItem);
- menuItem = new JMenuItem(ActionManager.getAction("findnext"));
- m_editMenu.add(menuItem);
- //}}}
-
setDocumentBuffer(document);
//focus on the text area the first time the view is shown
@@ -223,6 +204,18 @@
SourceViewOptionPane.parseStyle(jsXe.getProperty("source.invalid.color")),
});
}
+ } else {
+ if ((message instanceof UndoEvent) || (message instanceof RedoEvent)) {
+ //hack to get undo to work properly
+ try {
+ int caret = m_textarea.getCaretPosition();
+ m_textarea.setDocument(new SourceViewDocument(m_document));
+ m_textarea.setTokenMarker(new XMLTokenMarker());
+ m_textarea.setCaretPosition(caret);
+ } catch (IOException ioe) {
+ Log.log(Log.ERROR, this, ioe);
+ }
+ }
}
}//}}}
@@ -248,6 +241,13 @@
dialog.dispose();
}
m_document.removeXMLDocumentListener(docListener);
+
+ ActionManager.removeActionImplementation("cut", m_textarea);
+ ActionManager.removeActionImplementation("copy", m_textarea);
+ ActionManager.removeActionImplementation("paste", m_textarea);
+ ActionManager.removeActionImplementation("find", m_textarea);
+ ActionManager.removeActionImplementation("findNext", m_textarea);
+
return true;
}//}}}
@@ -260,7 +260,7 @@
//{{{ getMenus()
public JMenu[] getMenus() {
- return new JMenu[] { m_editMenu };
+ return null;
}//}}}
//{{{ getDocumentBuffer()
@@ -320,6 +320,15 @@
Log.log(Log.WARNING, this, e.getMessage());
}
}
+ if (key.equals(XMLDocument.ENCODING)) {
+ try {
+ //reload the document
+ m_textarea.setDocument(new SourceViewDocument(m_document));
+ m_textarea.setTokenMarker(new XMLTokenMarker());
+ } catch (IOException e) {
+ Log.log(Log.ERROR, this, e);
+ }
+ }
}//}}}
//{{{ structureChanged()
@@ -418,8 +427,6 @@
private String m_replaceString;
private SourceViewPlugin m_plugin;
- private JMenu m_editMenu;
-
//}}}
}
Modified: branches/sourceview2/src/sourceview/SourceViewDocument.java
===================================================================
--- branches/sourceview2/src/sourceview/SourceViewDocument.java 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/src/sourceview/SourceViewDocument.java 2006-09-05 15:46:47 UTC (rev 1233)
@@ -55,6 +55,7 @@
import javax.swing.text.GapContent;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleContext;
+import javax.swing.undo.UndoableEdit;
//}}}
//{{{ DOM classes
@@ -73,6 +74,7 @@
/**
* The Document model used by the SourceView for displaying the text of
* an XML document.
+ *
* @author <a href="mailto:IanLewis at member dot fsf dot org">Ian Lewis</a>
* @version $Id$
* @see SourceView
@@ -85,8 +87,6 @@
super();
m_document = document;
- // document.addXMLDocumentListener(new SourceViewDocumentXMLDocumentListener());
-
if (document != null) {
try {
@@ -138,7 +138,27 @@
//}}}
+ //{{{ beginCompoundEdit()
+
+ public void beginCompoundEdit() {
+ m_document.beginCompoundEdit();
+ }//}}}
+
+ //{{{ endCompoundEdit()
+
+ public void endCompoundEdit() {
+ m_document.endCompoundEdit();
+ }//}}}
+
+ //{{{ addUndoableEdit()
+
+ public void addUndoableEdit(UndoableEdit edit) {
+ // Log.log(Log.DEBUG, this, "adding edit");
+ // m_document.addUndoableEdit(edit);
+ }//}}}
+
//{{{ Private members
+
private XMLDocument m_document;
//}}}
Modified: branches/sourceview2/src/sourceview/SourceViewPlugin.java
===================================================================
--- branches/sourceview2/src/sourceview/SourceViewPlugin.java 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/src/sourceview/SourceViewPlugin.java 2006-09-05 15:46:47 UTC (rev 1233)
@@ -60,11 +60,6 @@
//{{{ SourceViewPlugin
public SourceViewPlugin() {
- addAction(new EditCutAction());
- addAction(new EditCopyAction());
- addAction(new EditPasteAction());
- addAction(new EditFindAction());
- addAction(new EditFindNextAction());
}//}}}
//{{{ newDocumentView()
Modified: branches/sourceview2/src/sourceview/action/EditCopyAction.java
===================================================================
--- branches/sourceview2/src/sourceview/action/EditCopyAction.java 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/src/sourceview/action/EditCopyAction.java 2006-09-05 15:46:47 UTC (rev 1233)
@@ -30,14 +30,14 @@
//{{{ jsXe classes
import net.sourceforge.jsxe.jsXe;
-import net.sourceforge.jsxe.LocalizedAction;
import net.sourceforge.jsxe.gui.TabbedView;
-import net.sourceforge.jsxe.gui.Messages;
+import net.sourceforge.jsxe.action.ContextSpecificAction;
import net.sourceforge.jsxe.gui.DocumentView;
import net.sourceforge.jsxe.util.Log;
//}}}
//{{{ AWT classes
+import java.awt.Component;
import java.awt.event.ActionEvent;
//}}}
@@ -49,20 +49,10 @@
* @author Ian Lewis (<a href="mailto:Ian...@me...">Ian...@me...</a>)
* @version $Id$
*/
-public class EditCopyAction extends LocalizedAction {
+public class EditCopyAction implements ContextSpecificAction.ActionImplementation {
- //{{{ EditCopyAction constructor
- public EditCopyAction() {
- super(SourceViewPlugin.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 SourceView) {
SourceView sourceView = (SourceView)docView;
Modified: branches/sourceview2/src/sourceview/action/EditCutAction.java
===================================================================
--- branches/sourceview2/src/sourceview/action/EditCutAction.java 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/src/sourceview/action/EditCutAction.java 2006-09-05 15:46:47 UTC (rev 1233)
@@ -30,14 +30,14 @@
//{{{ jsXe classes
import net.sourceforge.jsxe.jsXe;
-import net.sourceforge.jsxe.LocalizedAction;
+import net.sourceforge.jsxe.action.ContextSpecificAction;
import net.sourceforge.jsxe.gui.TabbedView;
-import net.sourceforge.jsxe.gui.Messages;
import net.sourceforge.jsxe.gui.DocumentView;
import net.sourceforge.jsxe.util.Log;
//}}}
//{{{ AWT classes
+import java.awt.Component;
import java.awt.event.ActionEvent;
//}}}
@@ -49,20 +49,10 @@
* @author Ian Lewis (<a href="mailto:Ian...@me...">Ian...@me...</a>)
* @version $Id$
*/
-public class EditCutAction extends LocalizedAction {
+public class EditCutAction implements ContextSpecificAction.ActionImplementation {
- //{{{ EditCutAction constructor
- public EditCutAction() {
- super(SourceViewPlugin.PLUGIN_NAME+".cut");
- }//}}}
-
- //{{{ 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 SourceView) {
SourceView sourceView = (SourceView)docView;
Modified: branches/sourceview2/src/sourceview/action/EditFindAction.java
===================================================================
--- branches/sourceview2/src/sourceview/action/EditFindAction.java 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/src/sourceview/action/EditFindAction.java 2006-09-05 15:46:47 UTC (rev 1233)
@@ -30,13 +30,13 @@
//{{{ jsXe classes
import net.sourceforge.jsxe.jsXe;
-import net.sourceforge.jsxe.LocalizedAction;
+import net.sourceforge.jsxe.action.ContextSpecificAction;
import net.sourceforge.jsxe.gui.TabbedView;
-import net.sourceforge.jsxe.gui.Messages;
import net.sourceforge.jsxe.gui.DocumentView;
//}}}
//{{{ AWT classes
+import java.awt.Component;
import java.awt.event.ActionEvent;
//}}}
@@ -48,20 +48,10 @@
* @version $Id$
*/
-public class EditFindAction extends LocalizedAction {
+public class EditFindAction implements ContextSpecificAction.ActionImplementation {
- //{{{ EditFindAction constructor
- public EditFindAction() {
- super(SourceViewPlugin.PLUGIN_NAME+".find");
- }//}}}
-
- //{{{ getLabel()
- public String getLabel() {
- return Messages.getMessage("common.find");
- }//}}}
-
//{{{ invoke()
- public void invoke(TabbedView view, ActionEvent evt) {
+ public void invoke(TabbedView view, Component comp, ActionEvent evt) {
DocumentView docView = view.getDocumentView();
if (docView instanceof SourceView) {
SourceView sourceView = (SourceView)docView;
Modified: branches/sourceview2/src/sourceview/action/EditFindNextAction.java
===================================================================
--- branches/sourceview2/src/sourceview/action/EditFindNextAction.java 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/src/sourceview/action/EditFindNextAction.java 2006-09-05 15:46:47 UTC (rev 1233)
@@ -30,13 +30,13 @@
//{{{ jsXe classes
import net.sourceforge.jsxe.jsXe;
-import net.sourceforge.jsxe.LocalizedAction;
+import net.sourceforge.jsxe.action.ContextSpecificAction;
import net.sourceforge.jsxe.gui.TabbedView;
-import net.sourceforge.jsxe.gui.Messages;
import net.sourceforge.jsxe.gui.DocumentView;
//}}}
//{{{ AWT classes
+import java.awt.Component;
import java.awt.event.ActionEvent;
//}}}
@@ -49,20 +49,10 @@
* @version $Id$
*/
-public class EditFindNextAction extends LocalizedAction {
+public class EditFindNextAction implements ContextSpecificAction.ActionImplementation {
- //{{{ EditFindNextAction constructor
- public EditFindNextAction() {
- super(SourceViewPlugin.PLUGIN_NAME+".findnext");
- }//}}}
-
- //{{{ getLabel()
- public String getLabel() {
- return Messages.getMessage("common.findnext");
- }//}}}
-
//{{{ invoke()
- public void invoke(TabbedView view, ActionEvent evt) {
+ public void invoke(TabbedView view, Component comp, ActionEvent evt) {
DocumentView docView = view.getDocumentView();
if (docView instanceof SourceView) {
SourceView sourceView = (SourceView)docView;
Modified: branches/sourceview2/src/sourceview/action/EditPasteAction.java
===================================================================
--- branches/sourceview2/src/sourceview/action/EditPasteAction.java 2006-09-02 19:23:16 UTC (rev 1232)
+++ branches/sourceview2/src/sourceview/action/EditPasteAction.java 2006-09-05 15:46:47 UTC (rev 1233)
@@ -30,14 +30,14 @@
//{{{ jsXe classes
import net.sourceforge.jsxe.jsXe;
-import net.sourceforge.jsxe.LocalizedAction;
import net.sourceforge.jsxe.gui.TabbedView;
-import net.sourceforge.jsxe.gui.Messages;
-import net.sourceforge.jsxe.gui.DocumentView;
+import net.sourceforge.jsxe.action.ContextSpecificAction;
import net.sourceforge.jsxe.util.Log;
+import net.sourceforge.jsxe.gui.DocumentView;
//}}}
//{{{ AWT classes
+import java.awt.Component;
import java.awt.event.ActionEvent;
//}}}
@@ -49,20 +49,10 @@
* @author Ian Lewis (<a href="mailto:Ian...@me...">Ian...@me...</a>)
* @version $Id$
*/
-public class EditPasteAction extends LocalizedAction {
+public class EditPasteAction implements ContextSpecificAction.ActionImplementation {
- //{{{ EditPasteAction constructor
- public EditPasteAction() {
- super(SourceViewPlugin.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 SourceView) {
SourceView sourceView = (SourceView)docView;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
