October 2009 - Nuiton-widgets-commits - mailman.cloud.codelutin.com

r229 - in trunk: . src/main/java/org/nuiton/widget/editor
by echatellier＠users.nuiton.org 16 Oct '09

16 Oct '09

Author: echatellier Date: 2009-10-16 18:47:03 +0200 (Fri, 16 Oct 2009) New Revision: 229 Modified: trunk/changelog.txt trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java trunk/src/main/java/org/nuiton/widget/editor/Editor.java trunk/src/main/java/org/nuiton/widget/editor/EditorInterface.java trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java Log: Add caret listener support on editors Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-10-15 12:27:39 UTC (rev 228) +++ trunk/changelog.txt 2009-10-16 16:47:03 UTC (rev 229) @@ -1,3 +1,7 @@ +ver-1.0.1 chatellier 2009xxxx + * Add caret listener support on editors + * Add cut, copy, paste support on editors + ver-0.14 chatellier 20090409 * improve AboutFrame * Fix SDoc background color on nimbus Modified: trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java 2009-10-15 12:27:39 UTC (rev 228) +++ trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java 2009-10-16 16:47:03 UTC (rev 229) @@ -45,6 +45,7 @@ import javax.swing.JEditorPane; import javax.swing.JPanel; import javax.swing.JScrollPane; +import javax.swing.event.CaretListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.text.Document; @@ -58,7 +59,6 @@ * behaviour: <li>undo/redo (Ctrl-z, Shift-Ctrl-z) <li>Scrollbar * * @author poussin - * */ public class DefaultEditor extends JPanel implements EditorInterface, DocumentListener { @@ -79,30 +79,39 @@ } /* - * (non-Javadoc) - * - * @see - * org.nuiton.widget.editor.EditorInterface#addDocumentListener(javax - * .swing.event.DocumentListener) + * @see org.nuiton.widget.editor.EditorInterface#addDocumentListener(javax.swing.event.DocumentListener) */ + @Override public void addDocumentListener(DocumentListener listener) { editor.getDocument().addDocumentListener(listener); } /* - * (non-Javadoc) - * - * @see - * org.nuiton.widget.editor.EditorInterface#removeDocumentListener(javax - * .swing.event.DocumentListener) + * @see org.nuiton.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) */ + @Override public void removeDocumentListener(DocumentListener listener) { editor.getDocument().removeDocumentListener(listener); } + /* - * (non-Javadoc) - * + * @see org.nuiton.widget.editor.EditorInterface#addCaretListener(javax.swing.event.CaretListener) + */ + @Override + public void addCaretListener(CaretListener listener) { + editor.addCaretListener(listener); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#removeCaretListener(javax.swing.event.CaretListener) + */ + @Override + public void removeCaretListener(CaretListener listener) { + editor.removeCaretListener(listener); + } + + /* * @see org.nuiton.widget.editor.EditorInterface#accept(java.io.File) */ public boolean accept(File file) { @@ -110,8 +119,6 @@ } /* - * (non-Javadoc) - * * @see org.nuiton.widget.editor.EditorInterface#isModified() */ public boolean isModified() { @@ -119,8 +126,6 @@ } /* - * (non-Javadoc) - * * @see org.nuiton.widget.Editor#open(java.io.File) */ public boolean open(File file) { @@ -148,8 +153,6 @@ } /* - * (non-Javadoc) - * * @see org.nuiton.widget.Editor#saveAs(java.io.File) */ public boolean saveAs(File file) { Modified: trunk/src/main/java/org/nuiton/widget/editor/Editor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/Editor.java 2009-10-15 12:27:39 UTC (rev 228) +++ trunk/src/main/java/org/nuiton/widget/editor/Editor.java 2009-10-16 16:47:03 UTC (rev 229) @@ -49,6 +49,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.KeyStroke; +import javax.swing.event.CaretListener; import javax.swing.event.DocumentListener; import javax.swing.text.TextAction; @@ -174,8 +175,11 @@ protected EditorInterface currentEditor = nullEditor; /** current opened file */ protected File openedFile = null; - /** All listener registered on this editor */ - protected Set<DocumentListener> listeners = new HashSet<DocumentListener>(); + /** All document listener registered on this editor */ + protected Set<DocumentListener> documentListeners = new HashSet<DocumentListener>(); + /** All caret listener registered on this editor */ + protected Set<CaretListener> caretListeners = new HashSet<CaretListener>(); + /** * If the edited file is modifier, before switch to other or close it, ask * the user if he want save the modification @@ -281,14 +285,20 @@ } // remove all listener on old editor - for (DocumentListener l : listeners) { + for (DocumentListener l : documentListeners) { this.currentEditor.removeDocumentListener(l); } + for (CaretListener l : caretListeners) { + this.currentEditor.removeCaretListener(l); + } this.currentEditor = editor; // and add all listener on new editor - for (DocumentListener l : listeners) { + for (DocumentListener l : documentListeners) { this.currentEditor.addDocumentListener(l); } + for (CaretListener l : caretListeners) { + this.currentEditor.addCaretListener(l); + } // put new editor as child add((Component) editor, BorderLayout.CENTER); @@ -470,8 +480,9 @@ /* * @see org.nuiton.widget.editor.EditorInterface#addDocumentListener(javax.swing.event.DocumentListener) */ + @Override public void addDocumentListener(DocumentListener listener) { - listeners.add(listener); + documentListeners.add(listener); getCurrentEditor().addDocumentListener(listener); } @@ -480,16 +491,28 @@ */ @Override public void removeDocumentListener(DocumentListener listener) { - listeners.remove(listener); + documentListeners.remove(listener); getCurrentEditor().removeDocumentListener(listener); } - // ///////////////////////////////////////////////////////////////////////// - // - // A C T I O N - // - // ///////////////////////////////////////////////////////////////////////// + /* + * @see org.nuiton.widget.editor.EditorInterface#addCaretListener(javax.swing.event.CaretListener) + */ + @Override + public void addCaretListener(CaretListener listener) { + caretListeners.add(listener); + getCurrentEditor().addCaretListener(listener); + } + /* + * @see org.nuiton.widget.editor.EditorInterface#removeCaretListener(javax.swing.event.CaretListener) + */ + @Override + public void removeCaretListener(CaretListener listener) { + caretListeners.remove(listener); + getCurrentEditor().removeCaretListener(listener); + } + static class SaveAction extends TextAction { /** serialVersionUID */ private static final long serialVersionUID = 4694356772539222176L; Modified: trunk/src/main/java/org/nuiton/widget/editor/EditorInterface.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/EditorInterface.java 2009-10-15 12:27:39 UTC (rev 228) +++ trunk/src/main/java/org/nuiton/widget/editor/EditorInterface.java 2009-10-16 16:47:03 UTC (rev 229) @@ -19,6 +19,7 @@ import java.io.File; +import javax.swing.event.CaretListener; import javax.swing.event.DocumentListener; /** @@ -51,6 +52,20 @@ public void removeDocumentListener(DocumentListener listener); /** + * Add caret listener. + * + * @param listener listener + */ + public void addCaretListener(CaretListener listener); + + /** + * Remove caret listener. + * + * @param listener listener + */ + public void removeCaretListener(CaretListener listener); + + /** * If return true, this editor support this file type. * Default implementation return {@code true}. * Modified: trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java 2009-10-15 12:27:39 UTC (rev 228) +++ trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java 2009-10-16 16:47:03 UTC (rev 229) @@ -27,6 +27,7 @@ import java.io.Reader; import javax.swing.JPanel; +import javax.swing.event.CaretListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; @@ -142,6 +143,30 @@ } /* + * @see org.nuiton.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) + */ + @Override + public void removeDocumentListener(DocumentListener listener) { + editor.getDocument().removeDocumentListener(listener); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#addCaretListener(javax.swing.event.CaretListener) + */ + @Override + public void addCaretListener(CaretListener listener) { + editor.addCaretListener(listener); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#removeCaretListener(javax.swing.event.CaretListener) + */ + @Override + public void removeCaretListener(CaretListener listener) { + editor.removeCaretListener(listener); + } + + /* * @see org.nuiton.widget.editor.EditorInterface#getText() */ @Override @@ -159,14 +184,6 @@ } /* - * @see org.nuiton.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) - */ - @Override - public void removeDocumentListener(DocumentListener listener) { - editor.getDocument().removeDocumentListener(listener); - } - - /* * @see org.nuiton.widget.editor.EditorInterface#saveAs(java.io.File) */ @Override Modified: trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java 2009-10-15 12:27:39 UTC (rev 228) +++ trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java 2009-10-16 16:47:03 UTC (rev 229) @@ -25,6 +25,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; +import javax.swing.event.CaretListener; import javax.swing.event.DocumentListener; /** @@ -63,6 +64,22 @@ } /* + * @see org.nuiton.widget.editor.EditorInterface#addCaretListener(javax.swing.event.CaretListener) + */ + @Override + public void addCaretListener(CaretListener listener) { + + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#removeCaretListener(javax.swing.event.CaretListener) + */ + @Override + public void removeCaretListener(CaretListener listener) { + + } + + /* * @see org.nuiton.widget.editor.EditorInterface#accept(java.io.File) */ @Override Modified: trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java 2009-10-15 12:27:39 UTC (rev 228) +++ trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java 2009-10-16 16:47:03 UTC (rev 229) @@ -30,6 +30,7 @@ import java.io.Writer; import javax.swing.JPanel; +import javax.swing.event.CaretListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; @@ -152,6 +153,30 @@ } /* + * @see org.nuiton.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) + */ + @Override + public void removeDocumentListener(DocumentListener listener) { + editor.getDocument().removeDocumentListener(listener); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#addCaretListener(javax.swing.event.CaretListener) + */ + @Override + public void addCaretListener(CaretListener listener) { + editor.addCaretListener(listener); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#removeCaretListener(javax.swing.event.CaretListener) + */ + @Override + public void removeCaretListener(CaretListener listener) { + editor.removeCaretListener(listener); + } + + /* * @see org.nuiton.widget.editor.EditorInterface#getText() */ @Override @@ -169,14 +194,6 @@ } /* - * @see org.nuiton.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) - */ - @Override - public void removeDocumentListener(DocumentListener listener) { - editor.getDocument().removeDocumentListener(listener); - } - - /* * @see org.nuiton.widget.editor.EditorInterface#saveAs(java.io.File) */ @Override

1 0

r228 - in trunk: . src/main/java/org/nuiton/widget src/main/java/org/nuiton/widget/editor src/main/resources/i18n src/site src/test/java/org/nuiton/widget src/test/java/org/nuiton/widget/editor
by echatellier＠users.nuiton.org 15 Oct '09

15 Oct '09

Author: echatellier Date: 2009-10-15 14:27:39 +0200 (Thu, 15 Oct 2009) New Revision: 228 Modified: trunk/ trunk/src/main/java/org/nuiton/widget/AboutFrame.java trunk/src/main/java/org/nuiton/widget/ApplicationMonitor.java trunk/src/main/java/org/nuiton/widget/MessageDialog.java trunk/src/main/java/org/nuiton/widget/StatusBar.java trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java trunk/src/main/java/org/nuiton/widget/editor/Editor.java trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java trunk/src/main/java/org/nuiton/widget/editor/SDocEditor.java trunk/src/main/java/org/nuiton/widget/package.html trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties trunk/src/site/site.xml trunk/src/test/java/org/nuiton/widget/XMLGridLayoutTest.java trunk/src/test/java/org/nuiton/widget/editor/EditorTest.java Log: Finish nuiton migration Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - maven.log target velocity.log .classpath .project .settings *.ipr *.iws *.iml + maven.log target velocity.log .classpath .project .settings *.ipr *.iws *.iml bin Modified: trunk/src/main/java/org/nuiton/widget/AboutFrame.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/AboutFrame.java 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/java/org/nuiton/widget/AboutFrame.java 2009-10-15 12:27:39 UTC (rev 228) @@ -139,12 +139,12 @@ // first panel Component firstTab = getAboutTab(); - tabPanel.add(_("lutinwidget.aboutframe.about"), firstTab); + tabPanel.add(_("nuitonwidgets.aboutframe.about"), firstTab); // second panel if (licenseText != null) { Component secondTab = getLicenseTab(); - tabPanel.add(_("lutinwidget.aboutframe.license"), secondTab); + tabPanel.add(_("nuitonwidgets.aboutframe.license"), secondTab); } c.setConstraints(0, 1, 1, 1, 1, 1, Contraintes.BOTH, @@ -152,7 +152,7 @@ add(tabPanel, c); // ok button - JButton okButton = new JButton(_("lutinwidget.aboutframe.ok")); + JButton okButton = new JButton(_("nuitonwidgets.aboutframe.ok")); okButton.setActionCommand("ok"); okButton.addActionListener(this); c.setConstraints(0, 2, 1, 1, 1, 0, Contraintes.NONE, Contraintes.EAST, Modified: trunk/src/main/java/org/nuiton/widget/ApplicationMonitor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/ApplicationMonitor.java 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/java/org/nuiton/widget/ApplicationMonitor.java 2009-10-15 12:27:39 UTC (rev 228) @@ -140,21 +140,21 @@ public void sendConsoleContentByMail() { try { - send(smtpServer, to, from, _("lutinwidget.monitor.mail.subject"), - _("lutinwidget.monitor.mail.stream.all") + "\n" + send(smtpServer, to, from, _("nuitonwidgets.monitor.mail.subject"), + _("nuitonwidgets.monitor.mail.stream.all") + "\n" + getAllStreamsTextArea().getText() + "\n\n\n" - + _("lutinwidget.monitor.mail.stream.output") + + _("nuitonwidgets.monitor.mail.stream.output") + "\n" + getOutputStreamTextArea().getText() + "\n\n\n" - + _("lutinwidget.monitor.mail.stream.error") + "\n" + + _("nuitonwidgets.monitor.mail.stream.error") + "\n" + getErrorStreamTextArea().getText() + "\n\n\n" - + _("lutinwidget.monitor.mail.stream.log") + " " + + _("nuitonwidgets.monitor.mail.stream.log") + " " + loggingSystem + " :\n" + getLogStreamTextArea().getText()); - getStatusBar().setStatus(_("lutinwidget.monitor.mail.report", to)); + getStatusBar().setStatus(_("nuitonwidgets.monitor.mail.report", to)); } catch (MessagingException eee) { getStatusBar().setStatus( - _("lutinwidget.monitor.mail.failed", smtpServer)); + _("nuitonwidgets.monitor.mail.failed", smtpServer)); } } @@ -398,7 +398,7 @@ .createTitledBorder( javax.swing.BorderFactory .createEtchedBorder(javax.swing.border.EtchedBorder.RAISED), - _("lutinwidget.monitor.title"), + _("nuitonwidgets.monitor.title"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Dialog", java.awt.Font.BOLD, @@ -476,7 +476,7 @@ protected JButton getResetButton() { if (resetButton == null) { resetButton = new JButton(); - resetButton.setText(_("lutinwidget.monitor.button.reset")); + resetButton.setText(_("nuitonwidgets.monitor.button.reset")); resetButton.setIcon(IconFactory.getIcon(IconFactory.RESET)); resetButton.addActionListener(new java.awt.event.ActionListener() { @Override @@ -496,7 +496,7 @@ protected JButton getSendByEmailButton() { if (sendByEmailButton == null) { sendByEmailButton = new JButton(); - sendByEmailButton.setText(_("lutinwidget.monitor.button.mail")); + sendByEmailButton.setText(_("nuitonwidgets.monitor.button.mail")); sendByEmailButton.setIcon(IconFactory.getIcon(IconFactory.MAIL)); sendByEmailButton.addActionListener(new java.awt.event.ActionListener() { @Override @@ -516,18 +516,18 @@ protected JTabbedPane getJTabbedPane() { if (jTabbedPane == null) { jTabbedPane = new JTabbedPane(); - jTabbedPane.addTab(_("lutinwidget.monitor.stream.all"), null, + jTabbedPane.addTab(_("nuitonwidgets.monitor.stream.all"), null, getJPanel2bis(), null); - jTabbedPane.addTab(_("lutinwidget.monitor.stream.output"), null, + jTabbedPane.addTab(_("nuitonwidgets.monitor.stream.output"), null, getJPanel2(), null); - jTabbedPane.addTab(_("lutinwidget.monitor.stream.error"), null, + jTabbedPane.addTab(_("nuitonwidgets.monitor.stream.error"), null, getJPanel3(), null); - jTabbedPane.addTab(_("lutinwidget.monitor.stream.log"), null, + jTabbedPane.addTab(_("nuitonwidgets.monitor.stream.log"), null, getJPanel4(), null); - jTabbedPane.addTab(_("lutinwidget.monitor.information.system"), + jTabbedPane.addTab(_("nuitonwidgets.monitor.information.system"), null, getJPanel5(), null); jTabbedPane.addTab( - _("lutinwidget.monitor.information.application"), null, + _("nuitonwidgets.monitor.information.application"), null, getJPanel6(), null); } return jTabbedPane; Modified: trunk/src/main/java/org/nuiton/widget/MessageDialog.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/MessageDialog.java 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/java/org/nuiton/widget/MessageDialog.java 2009-10-15 12:27:39 UTC (rev 228) @@ -61,7 +61,7 @@ * annuler est utilisé, ou qu'il y a une erreur retourne null. */ static public String getFile() { - return getFile(I18n._("lutinwidget.message.file")); + return getFile(I18n._("nuitonwidgets.message.file")); } static public String getFile(String buttonText) { @@ -82,7 +82,7 @@ } } catch (Exception e) { java.util.logging.Logger.getLogger( - "org.codelutin.widget.MessageDialog.getFile").severe( + "org.nuiton.widget.MessageDialog.getFile").severe( "Erreur:"); } return null; @@ -96,7 +96,7 @@ try { JFileChooser chooser = new JFileChooser(currentDirectory); chooser.setDialogType(JFileChooser.CUSTOM_DIALOG); - chooser.setApproveButtonText(I18n._("lutinwidget.message.folder")); + chooser.setApproveButtonText(I18n._("nuitonwidgets.message.folder")); chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); int returnVal = chooser.showDialog(null, null); if (returnVal == JFileChooser.APPROVE_OPTION) { @@ -112,7 +112,7 @@ } } catch (Exception e) { java.util.logging.Logger.getLogger( - "org.codelutin.widget.MessageDialog.getDirectory").severe( + "org.nuiton.widget.MessageDialog.getDirectory").severe( "Erreur:"); } return null; Modified: trunk/src/main/java/org/nuiton/widget/StatusBar.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/StatusBar.java 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/java/org/nuiton/widget/StatusBar.java 2009-10-15 12:27:39 UTC (rev 228) @@ -394,7 +394,7 @@ (int) ((float) width * fraction), height); // No i18n string was : // String str = usedMemory / 1024 + "/" + totalMemory / 1024 + "Mb"; - String str = _("lutinwidget.message.statusbar.memory", usedMemory / 1024, totalMemory / 1024); + String str = _("nuitonwidgets.message.statusbar.memory", usedMemory / 1024, totalMemory / 1024); FontRenderContext frc = new FontRenderContext(null, false, false); Rectangle2D bounds = g.getFont().getStringBounds(str, frc); Graphics g2 = g.create(); Modified: trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java 2009-10-15 12:27:39 UTC (rev 228) @@ -82,7 +82,7 @@ * (non-Javadoc) * * @see - * org.codelutin.widget.editor.EditorInterface#addDocumentListener(javax + * org.nuiton.widget.editor.EditorInterface#addDocumentListener(javax * .swing.event.DocumentListener) */ public void addDocumentListener(DocumentListener listener) { @@ -93,7 +93,7 @@ * (non-Javadoc) * * @see - * org.codelutin.widget.editor.EditorInterface#removeDocumentListener(javax + * org.nuiton.widget.editor.EditorInterface#removeDocumentListener(javax * .swing.event.DocumentListener) */ public void removeDocumentListener(DocumentListener listener) { @@ -103,7 +103,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.widget.editor.EditorInterface#accept(java.io.File) + * @see org.nuiton.widget.editor.EditorInterface#accept(java.io.File) */ public boolean accept(File file) { return true; @@ -112,7 +112,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.widget.editor.EditorInterface#isModified() + * @see org.nuiton.widget.editor.EditorInterface#isModified() */ public boolean isModified() { return isModified; @@ -121,7 +121,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.widget.Editor#open(java.io.File) + * @see org.nuiton.widget.Editor#open(java.io.File) */ public boolean open(File file) { try { @@ -150,7 +150,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.widget.Editor#saveAs(java.io.File) + * @see org.nuiton.widget.Editor#saveAs(java.io.File) */ public boolean saveAs(File file) { try { @@ -170,7 +170,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.widget.editor.EditorInterface#getText() + * @see org.nuiton.widget.editor.EditorInterface#getText() */ public String getText() { String result = editor.getText(); @@ -178,7 +178,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#setText(java.lang.String) + * @see org.nuiton.widget.editor.EditorInterface#setText(java.lang.String) */ public void setText(String text) { editor.setText(text); Modified: trunk/src/main/java/org/nuiton/widget/editor/Editor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/Editor.java 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/java/org/nuiton/widget/editor/Editor.java 2009-10-15 12:27:39 UTC (rev 228) @@ -339,7 +339,7 @@ boolean result = true; if (isAskIfNotSaved() && getCurrentEditor().isModified()) { int val = JOptionPane.showConfirmDialog(this, - _("lutinwidget.editor.saveorcancel")); + _("nuitonwidgets.editor.saveorcancel")); switch (val) { case JOptionPane.YES_OPTION: save(); @@ -427,7 +427,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.widget.editor.EditorInterface#getText() + * @see org.nuiton.widget.editor.EditorInterface#getText() */ public String getText() { String result = getCurrentEditor().getText(); @@ -437,7 +437,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.widget.editor.EditorInterface#getText() + * @see org.nuiton.widget.editor.EditorInterface#getText() */ public void setText(String text) { getCurrentEditor().setText(text); @@ -468,7 +468,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#addDocumentListener(javax.swing.event.DocumentListener) + * @see org.nuiton.widget.editor.EditorInterface#addDocumentListener(javax.swing.event.DocumentListener) */ public void addDocumentListener(DocumentListener listener) { listeners.add(listener); @@ -476,7 +476,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) + * @see org.nuiton.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) */ @Override public void removeDocumentListener(DocumentListener listener) { Modified: trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java 2009-10-15 12:27:39 UTC (rev 228) @@ -74,7 +74,7 @@ } /* - * @see org.codelutin.widget.editor.DefaultEditor#open(java.io.File) + * @see org.nuiton.widget.editor.DefaultEditor#open(java.io.File) */ @Override public boolean open(File file) { @@ -134,7 +134,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#addDocumentListener(javax.swing.event.DocumentListener) + * @see org.nuiton.widget.editor.EditorInterface#addDocumentListener(javax.swing.event.DocumentListener) */ @Override public void addDocumentListener(DocumentListener listener) { @@ -142,7 +142,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#getText() + * @see org.nuiton.widget.editor.EditorInterface#getText() */ @Override public String getText() { @@ -151,7 +151,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#isModified() + * @see org.nuiton.widget.editor.EditorInterface#isModified() */ @Override public boolean isModified() { @@ -159,7 +159,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) + * @see org.nuiton.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) */ @Override public void removeDocumentListener(DocumentListener listener) { @@ -167,7 +167,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#saveAs(java.io.File) + * @see org.nuiton.widget.editor.EditorInterface#saveAs(java.io.File) */ @Override public boolean saveAs(File file) { @@ -184,7 +184,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#setText(java.lang.String) + * @see org.nuiton.widget.editor.EditorInterface#setText(java.lang.String) */ @Override public void setText(String text) { Modified: trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java 2009-10-15 12:27:39 UTC (rev 228) @@ -43,27 +43,27 @@ public NullEditor() { setLayout(new BorderLayout()); - JLabel noFileLabel = new JLabel(_("lutinwidget.message.nofile"), JLabel.CENTER); + JLabel noFileLabel = new JLabel(_("nuitonwidgets.message.nofile"), JLabel.CENTER); noFileLabel.setFont(noFileLabel.getFont().deriveFont(Font.ITALIC)); add(noFileLabel, BorderLayout.CENTER); } /* - * @see org.codelutin.widget.editor.EditorInterface#addDocumentListener(javax.swing.event.DocumentListener) + * @see org.nuiton.widget.editor.EditorInterface#addDocumentListener(javax.swing.event.DocumentListener) */ @Override public void addDocumentListener(DocumentListener listener) { } /* - * @see org.codelutin.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) + * @see org.nuiton.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) */ @Override public void removeDocumentListener(DocumentListener listener) { } /* - * @see org.codelutin.widget.editor.EditorInterface#accept(java.io.File) + * @see org.nuiton.widget.editor.EditorInterface#accept(java.io.File) */ @Override public boolean accept(File file) { @@ -105,7 +105,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#getText() + * @see org.nuiton.widget.editor.EditorInterface#getText() */ @Override public String getText() { @@ -114,7 +114,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#setText(java.lang.String) + * @see org.nuiton.widget.editor.EditorInterface#setText(java.lang.String) */ @Override public void setText(String text) { Modified: trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java 2009-10-15 12:27:39 UTC (rev 228) @@ -80,7 +80,7 @@ } /* - * @see org.codelutin.widget.editor.DefaultEditor#open(java.io.File) + * @see org.nuiton.widget.editor.DefaultEditor#open(java.io.File) */ @Override public boolean open(File file) { @@ -144,7 +144,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#addDocumentListener(javax.swing.event.DocumentListener) + * @see org.nuiton.widget.editor.EditorInterface#addDocumentListener(javax.swing.event.DocumentListener) */ @Override public void addDocumentListener(DocumentListener listener) { @@ -152,7 +152,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#getText() + * @see org.nuiton.widget.editor.EditorInterface#getText() */ @Override public String getText() { @@ -161,7 +161,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#isModified() + * @see org.nuiton.widget.editor.EditorInterface#isModified() */ @Override public boolean isModified() { @@ -169,7 +169,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) + * @see org.nuiton.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) */ @Override public void removeDocumentListener(DocumentListener listener) { @@ -177,7 +177,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#saveAs(java.io.File) + * @see org.nuiton.widget.editor.EditorInterface#saveAs(java.io.File) */ @Override public boolean saveAs(File file) { @@ -208,7 +208,7 @@ } /* - * @see org.codelutin.widget.editor.EditorInterface#setText(java.lang.String) + * @see org.nuiton.widget.editor.EditorInterface#setText(java.lang.String) */ @Override public void setText(String text) { Modified: trunk/src/main/java/org/nuiton/widget/editor/SDocEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/SDocEditor.java 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/java/org/nuiton/widget/editor/SDocEditor.java 2009-10-15 12:27:39 UTC (rev 228) @@ -69,7 +69,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.widget.editor.DefaultEditor#accept(java.io.File) + * @see org.nuiton.widget.editor.DefaultEditor#accept(java.io.File) */ @Override public boolean accept(File file) { @@ -83,7 +83,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.widget.editor.DefaultEditor#open(java.io.File) + * @see org.nuiton.widget.editor.DefaultEditor#open(java.io.File) */ @Override public boolean open(File file) { Modified: trunk/src/main/java/org/nuiton/widget/package.html =================================================================== --- trunk/src/main/java/org/nuiton/widget/package.html 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/java/org/nuiton/widget/package.html 2009-10-15 12:27:39 UTC (rev 228) @@ -1,7 +1,5 @@ <html> <body> -<h1>lutinwidget</h1> - -description du package. + <h1>Nuiton-Widgets</h1> </body> </html> Modified: trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties 2009-10-15 12:27:39 UTC (rev 228) @@ -1,24 +1,24 @@ -lutinwidget.aboutframe.about=About -lutinwidget.aboutframe.license=License -lutinwidget.aboutframe.ok=OK -lutinwidget.editor.saveorcancel=Do you want to save current opened file ? -lutinwidget.message.file=File -lutinwidget.message.folder=Folder -lutinwidget.message.nofile=No file -lutinwidget.message.statusbar.memory=%d/%dMb -lutinwidget.monitor.button.mail=Send by email -lutinwidget.monitor.button.reset=Reset -lutinwidget.monitor.information.application=Application information -lutinwidget.monitor.information.system=System information -lutinwidget.monitor.mail.failed=Can't send report by mail. Is your mail server up ? (I'm trying to contact the < %s > smtp server) -lutinwidget.monitor.mail.report=A report has been sent to %s -lutinwidget.monitor.mail.stream.all=All streams \: -lutinwidget.monitor.mail.stream.error=Standard Error \: -lutinwidget.monitor.mail.stream.log=Logging system -lutinwidget.monitor.mail.stream.output=Standard Output \: -lutinwidget.monitor.mail.subject=Report from logging console -lutinwidget.monitor.stream.all=All streams -lutinwidget.monitor.stream.error=Error stream -lutinwidget.monitor.stream.log=Log stream -lutinwidget.monitor.stream.output=Output stream -lutinwidget.monitor.title=Application console +nuitonwidgets.aboutframe.about=About +nuitonwidgets.aboutframe.license=License +nuitonwidgets.aboutframe.ok=OK +nuitonwidgets.editor.saveorcancel=Do you want to save current opened file ? +nuitonwidgets.message.file=File +nuitonwidgets.message.folder=Folder +nuitonwidgets.message.nofile=No file +nuitonwidgets.message.statusbar.memory=%d/%dMb +nuitonwidgets.monitor.button.mail=Send by email +nuitonwidgets.monitor.button.reset=Reset +nuitonwidgets.monitor.information.application=Application information +nuitonwidgets.monitor.information.system=System information +nuitonwidgets.monitor.mail.failed=Can't send report by mail. Is your mail server up ? (I'm trying to contact the < %s > smtp server) +nuitonwidgets.monitor.mail.report=A report has been sent to %s +nuitonwidgets.monitor.mail.stream.all=All streams \: +nuitonwidgets.monitor.mail.stream.error=Standard Error \: +nuitonwidgets.monitor.mail.stream.log=Logging system +nuitonwidgets.monitor.mail.stream.output=Standard Output \: +nuitonwidgets.monitor.mail.subject=Report from logging console +nuitonwidgets.monitor.stream.all=All streams +nuitonwidgets.monitor.stream.error=Error stream +nuitonwidgets.monitor.stream.log=Log stream +nuitonwidgets.monitor.stream.output=Output stream +nuitonwidgets.monitor.title=Application console Modified: trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties 2009-10-15 12:27:39 UTC (rev 228) @@ -1,24 +1,24 @@ -lutinwidget.aboutframe.about=\u00C0 propos -lutinwidget.aboutframe.license=Licence -lutinwidget.aboutframe.ok=OK -lutinwidget.editor.saveorcancel=Voulez vous sauver le fichier modifi\u00E9 ? -lutinwidget.message.file=Fichier -lutinwidget.message.folder=R\u00E9pertoire -lutinwidget.message.nofile=Aucun fichier -lutinwidget.message.statusbar.memory=%d/%dMo -lutinwidget.monitor.button.mail=Envoyer par courriel -lutinwidget.monitor.button.reset=Reset -lutinwidget.monitor.information.application=Information sur l'application -lutinwidget.monitor.information.system=Information syst\u00E8me -lutinwidget.monitor.mail.failed=Impossible d'envoyer le rapport par courriel. Le serveur smtp fonctionne ? (J'essai de contacter < %s > smtp server) -lutinwidget.monitor.mail.report=Le rapport a \u00E9t\u00E9 envoy\u00E9 \u00E0 %s -lutinwidget.monitor.mail.stream.all=Tous les flux \: -lutinwidget.monitor.mail.stream.error=Sortie d'erreur \: -lutinwidget.monitor.mail.stream.log=Log syst\u00E8me -lutinwidget.monitor.mail.stream.output=Sortie standard \: -lutinwidget.monitor.mail.subject=Rapport de la console -lutinwidget.monitor.stream.all=Toutes les sorties -lutinwidget.monitor.stream.error=Sortie d'erreur -lutinwidget.monitor.stream.log=Logs -lutinwidget.monitor.stream.output=Sortie standard -lutinwidget.monitor.title=Moniteur de l'application +nuitonwidgets.aboutframe.about=\u00C0 propos +nuitonwidgets.aboutframe.license=Licence +nuitonwidgets.aboutframe.ok=OK +nuitonwidgets.editor.saveorcancel=Voulez vous sauver le fichier modifi\u00E9 ? +nuitonwidgets.message.file=Fichier +nuitonwidgets.message.folder=R\u00E9pertoire +nuitonwidgets.message.nofile=Aucun fichier +nuitonwidgets.message.statusbar.memory=%d/%dMo +nuitonwidgets.monitor.button.mail=Envoyer par courriel +nuitonwidgets.monitor.button.reset=Reset +nuitonwidgets.monitor.information.application=Information sur l'application +nuitonwidgets.monitor.information.system=Information syst\u00E8me +nuitonwidgets.monitor.mail.failed=Impossible d'envoyer le rapport par courriel. Le serveur smtp fonctionne ? (J'essai de contacter < %s > smtp server) +nuitonwidgets.monitor.mail.report=Le rapport a \u00E9t\u00E9 envoy\u00E9 \u00E0 %s +nuitonwidgets.monitor.mail.stream.all=Tous les flux \: +nuitonwidgets.monitor.mail.stream.error=Sortie d'erreur \: +nuitonwidgets.monitor.mail.stream.log=Log syst\u00E8me +nuitonwidgets.monitor.mail.stream.output=Sortie standard \: +nuitonwidgets.monitor.mail.subject=Rapport de la console +nuitonwidgets.monitor.stream.all=Toutes les sorties +nuitonwidgets.monitor.stream.error=Sortie d'erreur +nuitonwidgets.monitor.stream.log=Logs +nuitonwidgets.monitor.stream.output=Sortie standard +nuitonwidgets.monitor.title=Moniteur de l'application Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/site/site.xml 2009-10-15 12:27:39 UTC (rev 228) @@ -7,12 +7,9 @@ </bannerLeft> <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" - img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="images/restructuredtext-logo.png"/> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> </poweredBy> <body> @@ -22,18 +19,9 @@ </breadcrumbs>  - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - <menu name="Developpeur"> <item name="Todo" href="Todo.html"/> </menu> Modified: trunk/src/test/java/org/nuiton/widget/XMLGridLayoutTest.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/XMLGridLayoutTest.java 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/test/java/org/nuiton/widget/XMLGridLayoutTest.java 2009-10-15 12:27:39 UTC (rev 228) @@ -61,7 +61,7 @@ public void testFile() throws Exception { // JPanel panel = new JPanel(new - // XMLGridLayout("org/codelutin/widget/XMLGridLayoutTest.xgl")); + // XMLGridLayout("org.nuiton.widget/XMLGridLayoutTest.xgl")); // panel.add("button1", new JButton("Button1")); // panel.add("button2", new JButton("Button2")); // panel.add("button3", new JButton("Button3")); Modified: trunk/src/test/java/org/nuiton/widget/editor/EditorTest.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/editor/EditorTest.java 2009-10-15 12:16:19 UTC (rev 227) +++ trunk/src/test/java/org/nuiton/widget/editor/EditorTest.java 2009-10-15 12:27:39 UTC (rev 228) @@ -58,7 +58,7 @@ frame.getContentPane().add(editor); frame.setBounds(10, 10, 300, 300); - File file = File.createTempFile("LutinEditorTest", ".java"); + File file = File.createTempFile("NuitonEditorTest", ".java"); FileUtil.writeString(file, "public class toto {\nint titi;\n a\nmmmmmmmmmma\n}"); file.deleteOnExit();

1 0

r227 - trunk/src/main/java/org/nuiton/widget/editor
by echatellier＠users.nuiton.org 15 Oct '09

15 Oct '09

Author: echatellier Date: 2009-10-15 14:16:19 +0200 (Thu, 15 Oct 2009) New Revision: 227 Modified: trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java trunk/src/main/java/org/nuiton/widget/editor/Editor.java trunk/src/main/java/org/nuiton/widget/editor/EditorInterface.java trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java Log: Add copy,cut,paste on all editors Modified: trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java 2009-10-11 11:27:29 UTC (rev 226) +++ trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java 2009-10-15 12:16:19 UTC (rev 227) @@ -178,43 +178,56 @@ } /* - * (non-Javadoc) - * - * @see - * org.codelutin.widget.editor.EditorInterface#setText(java.lang.String) + * @see org.codelutin.widget.editor.EditorInterface#setText(java.lang.String) */ public void setText(String text) { editor.setText(text); } /* - * (non-Javadoc) - * - * @seejavax.swing.event.DocumentListener#insertUpdate(javax.swing.event. - * DocumentEvent) + * @seejavax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent) */ public void insertUpdate(DocumentEvent e) { isModified = true; } /* - * (non-Javadoc) - * - * @seejavax.swing.event.DocumentListener#removeUpdate(javax.swing.event. - * DocumentEvent) + * @seejavax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent) */ + @Override public void removeUpdate(DocumentEvent e) { isModified = true; } /* - * (non-Javadoc) - * - * @seejavax.swing.event.DocumentListener#changedUpdate(javax.swing.event. - * DocumentEvent) + * @seejavax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent) */ + @Override public void changedUpdate(DocumentEvent e) { isModified = true; } + /* + * @see org.nuiton.widget.editor.EditorInterface#copy() + */ + @Override + public void copy() { + editor.copy(); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#cut() + */ + @Override + public void cut() { + editor.cut(); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#paste() + */ + @Override + public void paste() { + editor.paste(); + } } Modified: trunk/src/main/java/org/nuiton/widget/editor/Editor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/Editor.java 2009-10-11 11:27:29 UTC (rev 226) +++ trunk/src/main/java/org/nuiton/widget/editor/Editor.java 2009-10-15 12:16:19 UTC (rev 227) @@ -367,12 +367,6 @@ return result; } - // ///////////////////////////////////////////////////////////////////////// - // - // EditorInterface method implementation - // - // ///////////////////////////////////////////////////////////////////////// - /** * if return true, this editor support this file type. Default implantation * return true @@ -450,24 +444,41 @@ } /* - * (non-Javadoc) - * - * @see - * org.codelutin.widget.editor.EditorInterface#addDocumentListener(javax - * .swing.event.DocumentListener) + * @see org.nuiton.widget.editor.EditorInterface#copy() */ + @Override + public void copy() { + currentEditor.copy(); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#cut() + */ + @Override + public void cut() { + currentEditor.cut(); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#paste() + */ + @Override + public void paste() { + currentEditor.paste(); + } + + /* + * @see org.codelutin.widget.editor.EditorInterface#addDocumentListener(javax.swing.event.DocumentListener) + */ public void addDocumentListener(DocumentListener listener) { listeners.add(listener); getCurrentEditor().addDocumentListener(listener); } /* - * (non-Javadoc) - * - * @see - * org.codelutin.widget.editor.EditorInterface#removeDocumentListener(javax - * .swing.event.DocumentListener) + * @see org.codelutin.widget.editor.EditorInterface#removeDocumentListener(javax.swing.event.DocumentListener) */ + @Override public void removeDocumentListener(DocumentListener listener) { listeners.remove(listener); getCurrentEditor().removeDocumentListener(listener); @@ -508,5 +519,4 @@ } } } - } Modified: trunk/src/main/java/org/nuiton/widget/editor/EditorInterface.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/EditorInterface.java 2009-10-11 11:27:29 UTC (rev 226) +++ trunk/src/main/java/org/nuiton/widget/editor/EditorInterface.java 2009-10-15 12:16:19 UTC (rev 227) @@ -1,5 +1,5 @@ /* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin + * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -15,18 +15,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -/* * - * EditorInterface.java - * - * Created: 6 août 2006 12:54:19 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package org.nuiton.widget.editor; import java.io.File; @@ -34,39 +22,47 @@ import javax.swing.event.DocumentListener; /** + * EditorInterface. + * * @author poussin * + * Created: 6 août 2006 12:54:19 + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ - public interface EditorInterface { /** - * Add listener + * Add document listener. * - * @param listener + * @param listener listener */ public void addDocumentListener(DocumentListener listener); /** - * Remove listener + * Remove document listener. * - * @param listener + * @param listener listener */ public void removeDocumentListener(DocumentListener listener); /** - * if return true, this editor support this file type. Default implantation - * return true + * If return true, this editor support this file type. + * Default implementation return {@code true}. * - * @param file - * @return if return true, this editor support this file type. + * @param file file to test + * @return if return {@code true}, this editor support this file type. */ public boolean accept(File file); /** - * indicate if current opened file has been modified + * Indicate if current opened file has been modified. * - * @return true if currend file is modified + * @return {@code true} if current file is modified */ public boolean isModified(); @@ -79,7 +75,7 @@ public boolean open(File file); /** - * Replace the current edited file by file passed in argument + * Replace the current edited file by file passed in argument. * * @param file the file to open * @return true if file has been saved and reopen with new name @@ -87,16 +83,31 @@ public boolean saveAs(File file); /** - * Return the current content text of the editor as String + * Return the current content text of the editor as {@link String}. * - * @return Return the current content text of the editor as String + * @return return the current content text of the editor as {@link String} */ public String getText(); /** - * Set all text with text in argument + * Set all text with text in argument. * * @param text test to set */ public void setText(String text); + + /** + * Cut current editor selection into system clipboard. + */ + public void cut(); + + /** + * Copy current current selection into system clipboard. + */ + public void copy(); + + /** + * Paste current clicboard content into editor at caret position. + */ + public void paste(); } Modified: trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java 2009-10-11 11:27:29 UTC (rev 226) +++ trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java 2009-10-15 12:16:19 UTC (rev 227) @@ -214,4 +214,28 @@ public void removeUpdate(DocumentEvent e) { isModified = true; } + + /* + * @see org.nuiton.widget.editor.EditorInterface#copy() + */ + @Override + public void copy() { + editor.copy(); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#cut() + */ + @Override + public void cut() { + editor.cut(); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#paste() + */ + @Override + public void paste() { + editor.paste(); + } } Modified: trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java 2009-10-11 11:27:29 UTC (rev 226) +++ trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java 2009-10-15 12:16:19 UTC (rev 227) @@ -120,4 +120,27 @@ public void setText(String text) { } + /* + * @see org.nuiton.widget.editor.EditorInterface#copy() + */ + @Override + public void copy() { + + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#cut() + */ + @Override + public void cut() { + + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#paste() + */ + @Override + public void paste() { + + } } Modified: trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java 2009-10-11 11:27:29 UTC (rev 226) +++ trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java 2009-10-15 12:16:19 UTC (rev 227) @@ -63,7 +63,7 @@ public RSyntaxEditor() { editor = new RSyntaxTextArea(); - + RTextScrollPane sp = new RTextScrollPane(editor); setLayout(new BorderLayout()); add(sp, BorderLayout.CENTER); @@ -238,4 +238,28 @@ public void removeUpdate(DocumentEvent e) { isModified = true; } + + /* + * @see org.nuiton.widget.editor.EditorInterface#copy() + */ + @Override + public void copy() { + editor.copy(); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#cut() + */ + @Override + public void cut() { + editor.cut(); + } + + /* + * @see org.nuiton.widget.editor.EditorInterface#paste() + */ + @Override + public void paste() { + editor.paste(); + } }

1 0

r226 - trunk
by tchemit＠users.nuiton.org 11 Oct '09

11 Oct '09

Author: tchemit Date: 2009-10-11 13:27:29 +0200 (Sun, 11 Oct 2009) New Revision: 226 Modified: trunk/pom.xml Log: - use jrst.Version - use redmine.releaseFiles to collect files to send to redmine - bump junit, i18n and processor versions Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 17:00:52 UTC (rev 225) +++ trunk/pom.xml 2009-10-11 11:27:29 UTC (rev 226) @@ -91,6 +91,11 @@ <packaging>jar</packaging> + <properties> +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + </properties> + <build> <defaultGoal>install</defaultGoal> @@ -100,7 +105,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> <executions> <execution> <goals> @@ -121,7 +126,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> + <version>${jrst.version}</version> </dependency> </dependencies> </plugin>

1 0

r225 - trunk
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 19:00:52 +0200 (Sat, 10 Oct 2009) New Revision: 225 Modified: trunk/pom.xml Log: utilisation de mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-29 16:55:14 UTC (rev 224) +++ trunk/pom.xml 2009-10-10 17:00:52 UTC (rev 225) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>nuiton-widgets</artifactId>

1 0