Thread: [Davinspector-svn] SF.net SVN: davinspector: [126] trunk/DAVInspector (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 126
          http://davinspector.svn.sourceforge.net/davinspector/?rev=126&view=rev
Author:   wuest
Date:     2008-04-17 09:35:23 -0700 (Thu, 17 Apr 2008)

Log Message:
-----------
Added "select all" option to the popup menu of the raw pane.
Copy & Paste now working correct.

Modified Paths:
--------------
    trunk/DAVInspector/resource/TextBundle.properties
    trunk/DAVInspector/resource/TextBundle_de_DE.properties
    trunk/DAVInspector/src/de/dlr/davinspector/ui/JRawTextPane.java

Modified: trunk/DAVInspector/resource/TextBundle.properties
===================================================================

--- trunk/DAVInspector/resource/TextBundle.properties	2008-04-17 14:45:46 UTC (rev 125)
+++ trunk/DAVInspector/resource/TextBundle.properties	2008-04-17 16:35:23 UTC (rev 126)
@@ -35,6 +35,8 @@
 ac_cut_description=Cut
 ac_copy=Copy
 ac_copy_description=Copy
+ac_select_all=Select all
+ac_select_all_description=Select all
 ac_saveas=Save as ...
 ac_saveas_description=Save text in a file
 #save as dialog file chooser

Modified: trunk/DAVInspector/resource/TextBundle_de_DE.properties
===================================================================
--- trunk/DAVInspector/resource/TextBundle_de_DE.properties	2008-04-17 14:45:46 UTC (rev 125)
+++ trunk/DAVInspector/resource/TextBundle_de_DE.properties	2008-04-17 16:35:23 UTC (rev 126)
@@ -35,6 +35,8 @@
 ac_cut_description=Text ausschneiden und in die Zwischenablage einf\xFCgen
 ac_copy=Kopieren
 ac_copy_description=Text in die Zwischenablage einf\xFCgen
+ac_select_all=Alles ausw\xE4hlen
+ac_select_all_description=Alles ausw\xE4hlen
 ac_saveas=Speichern unter ...
 ac_saveas_description=Text in einer Datei speichern
 #save as dialog file chooser

Modified: trunk/DAVInspector/src/de/dlr/davinspector/ui/JRawTextPane.java
===================================================================
--- trunk/DAVInspector/src/de/dlr/davinspector/ui/JRawTextPane.java	2008-04-17 14:45:46 UTC (rev 125)
+++ trunk/DAVInspector/src/de/dlr/davinspector/ui/JRawTextPane.java	2008-04-17 16:35:23 UTC (rev 126)
@@ -97,28 +97,17 @@
         
         public void actionPerformed(ActionEvent e) {
             // paste
-            int pos = getCaretPosition();
-            int start = getSelectionStart();
-            int end = getSelectionEnd();        
-            
             Transferable content = myClipboard.getContents(this);
             if (content != null) {
                 try {
                     String s = (String) content.getTransferData(DataFlavor.stringFlavor);
-                    if ((start >= 0) && (end >= 0) && (start < end)) {
-                        // some text is selected, overwrite with clip board 
-                        setText(getText(0, start) + s + getText(end, getText().length() - end)); 
-                    } else {
-                        // no text selected, insert clip board at cursor
-                        setText(getText(0, pos) + s + getText(pos, getText().length() - pos)); 
+                    if (s.length() > 0) {
+                        replaceSelection(s);
                     }
-                    // TODO: place the cursor at the end of the edited text
                 } catch (IOException ioe) {
                     myLogger.error(ioe.getMessage(), ioe);
                 } catch (UnsupportedFlavorException usfe) {
                     myLogger.error(usfe.getMessage(), usfe);
-                } catch (BadLocationException ble) {
-                    myLogger.error(ble.getMessage(), ble);
                 }
             }
         }
@@ -138,11 +127,11 @@
         public void actionPerformed(ActionEvent e) {
             // copy
             int start = getSelectionStart();
-            int end = getSelectionEnd();        
+            int end = getSelectionEnd();   
+            
             try {
                 StringSelection content = new StringSelection(getText(start, end - start));            
                 myClipboard.setContents(content, myRawTextPane);
-                setText(getText(0, start) + getText(end, getText().length() - end)); 
             } catch (IllegalStateException ise) {
                 myLogger.error(ise.getMessage(), ise);
             } catch (BadLocationException ble) {
@@ -164,11 +153,13 @@
         
         public void actionPerformed(ActionEvent e) {
             // cut
-            int start = getSelectionStart();
-            int end = getSelectionEnd();
+            int cutStart = getSelectionStart();
+            int cutEnd = getSelectionEnd();
+            
             try {
-                StringSelection content = new StringSelection(getText(start, end - start));
-                myClipboard.setContents(content, myRawTextPane); 
+                StringSelection content = new StringSelection(getText(cutStart, cutEnd - cutStart));
+                myClipboard.setContents(content, myRawTextPane);
+                replaceSelection("");
             } catch (IllegalStateException ise) {
                 myLogger.error(ise.getMessage(), ise);
             } catch (BadLocationException ble) {
@@ -227,6 +218,26 @@
     };
 
     /**
+     * Action: Select all. 
+     */
+    private Action selectAllAction = new AbstractAction() {
+        static final long serialVersionUID = 1L;
+        {
+            putValue(Action.NAME, Internationalization.getTranslation("ac_select_all"));
+            putValue(Action.SHORT_DESCRIPTION, Internationalization.getTranslation("ac_select_all_description"));
+        }
+        
+        public void actionPerformed(ActionEvent e) {
+            // select all
+            try {
+                selectAll();
+            } catch (IllegalStateException ise) {
+                myLogger.error(ise.getMessage(), ise);
+            }
+        }
+    };
+    
+    /**
      * Constructor of JRawTextPane.
      * 
      * @param direction Direction the text pane is used for displaying content (client or server).
@@ -247,6 +258,7 @@
         myJPopupMenu.add(new JMenuItem(cutAction));
         myJPopupMenu.add(new JMenuItem(copyAction));
         myJPopupMenu.add(new JMenuItem(pasteAction));
+        myJPopupMenu.add(new JMenuItem(selectAllAction));
         myJPopupMenu.add(new JMenuItem(saveAsAction));    
     }
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Davinspector-svn] SF.net SVN: davinspector: [126] trunk/DAVInspector (Page 2)

davinspector-svn