sqlshell-svn

[Sqlshell-svn] /devel/src/main/java/nl/improved/sqlclient: . charva

[SVN by r. <sv...@ca...>]

Author: roy
Date: 2008-10-13 15:30:59 +0200 (Mon, 13 Oct 2008)
New Revision: 317

Modified:
   src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java
   src/main/java/nl/improved/sqlclient/charva/CharvaSQLShellWindow.java
   src/main/java/nl/improved/sqlclient/charva/SQLShellComponent.java
Log:
fixed some exceptions
ignore mouse cursor for now..


Modified: src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java
===================================================================
--- src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java	2008-10-12 13:09:16 UTC (rev 316)
+++ src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java	2008-10-13 13:30:59 UTC (rev 317)
@@ -1575,12 +1575,13 @@
      */
     protected List<String> formatCommandLines(boolean showPrompt, String emptyLine, List<CharSequence> currentLines) {
         List<String> tmpList = new ArrayList<String>();
-        for (int i = 0; i < currentLines.size(); i++) {
+        List<CharSequence> pCurrentLines = new ArrayList<CharSequence>(currentLines);
+        for (int i = 0; i < pCurrentLines.size(); i++) {
             if (i == 0 && showPrompt) {
-                tmpList.add(Screen.PROMPT+"> "+currentLines.get(i));
+                tmpList.add(Screen.PROMPT+"> "+pCurrentLines.get(i));
             } else {
                 String nrI = Integer.toString(i+1);
-                tmpList.add(emptyLine.substring(0,Screen.PROMPT.length() - nrI.length()) + nrI+"> "+currentLines.get(i));
+                tmpList.add(emptyLine.substring(0,Screen.PROMPT.length() - nrI.length()) + nrI+"> "+pCurrentLines.get(i));
             }
         }
         return tmpList;

Modified: src/main/java/nl/improved/sqlclient/charva/CharvaSQLShellWindow.java
===================================================================
--- src/main/java/nl/improved/sqlclient/charva/CharvaSQLShellWindow.java	2008-10-12 13:09:16 UTC (rev 316)
+++ src/main/java/nl/improved/sqlclient/charva/CharvaSQLShellWindow.java	2008-10-13 13:30:59 UTC (rev 317)
@@ -12,6 +12,7 @@
 import charvax.swing.JMenuItem;
 import charvax.swing.JPopupMenu;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 import nl.improved.sqlclient.AbstractSQLShellWindow;
@@ -56,12 +57,12 @@
     public void paint(Screen screen) {
         int totalLineCount = 0;
         StringBuilder newText = new StringBuilder();
-        for (CharSequence seq: screen.getScreenBuffer()) {
+        for (CharSequence seq: new ArrayList<CharSequence>(screen.getScreenBuffer())) {
             newText.append(seq.toString());
             newText.append("\n");
             totalLineCount++;
         }
-        for (SQLCommand s : getUnprocessedCommands()) {
+        for (SQLCommand s : new ArrayList<SQLCommand>(getUnprocessedCommands())) {
             for (CharSequence seq: s.getLines()) {
                 newText.append(screen.getEmptyLine().substring(0, Screen.PROMPT.length()) + ">");
                 newText.append(seq.toString());

Modified: src/main/java/nl/improved/sqlclient/charva/SQLShellComponent.java
===================================================================
--- src/main/java/nl/improved/sqlclient/charva/SQLShellComponent.java	2008-10-12 13:09:16 UTC (rev 316)
+++ src/main/java/nl/improved/sqlclient/charva/SQLShellComponent.java	2008-10-13 13:30:59 UTC (rev 317)
@@ -9,6 +9,7 @@
 import charva.awt.Point;
 import charva.awt.Toolkit;
 import charva.awt.event.KeyEvent;
+import charva.awt.event.MouseEvent;
 import charvax.swing.JFrame;
 import charvax.swing.JTextArea;
 
@@ -26,6 +27,12 @@
         sqlshellWindow.keyTyped(arg0);
     }
 
+    @Override
+    public void processMouseEvent(MouseEvent arg0) {
+    }
+
+    
+
     public static void main(String[] args) {
         JFrame frame = new JFrame();
         SQLShellComponent component = new SQLShellComponent();

[Sqlshell-svn] /devel/src/main/java/nl/improved/sqlclient: . charva

[SVN by r. <sv...@ca...>]

Author: roy
Date: 2008-11-07 22:32:35 +0100 (Fri, 07 Nov 2008)
New Revision: 327

Modified:
   src/main/java/nl/improved/sqlclient/
   src/main/java/nl/improved/sqlclient/charva/SQLShellComponent.java
Log:
use insert text when middle mouse button pressed



Property changes on: src/main/java/nl/improved/sqlclient
___________________________________________________________________
Name: svn:ignore
   - .SQLPlusPlus.java.swp
.SQLPlus.java.swp
.DBConnector.java.swp
.SQLUtil.java.swp
.Point.java.swp
.SQLLineWrapper.java.swp
.SQLOutput.java.swp
.QueryExecutor.java.swp
.SQLShell.java.swp
.AbstractSQLShellWindow.java.swo
.AbstractSQLShellWindow.java.swp

   + .SQLPlusPlus.java.swp
.SQLPlus.java.swp
.DBConnector.java.swp
.SQLUtil.java.swp
.Point.java.swp
.SQLLineWrapper.java.swp
.SQLOutput.java.swp
.QueryExecutor.java.swp
.SQLShell.java.swp
.AbstractSQLShellWindow.java.swo
.AbstractSQLShellWindow.java.swp
.TabCompletionInfo.java.swp


Modified: src/main/java/nl/improved/sqlclient/charva/SQLShellComponent.java
===================================================================
--- src/main/java/nl/improved/sqlclient/charva/SQLShellComponent.java	2008-11-07 21:31:58 UTC (rev 326)
+++ src/main/java/nl/improved/sqlclient/charva/SQLShellComponent.java	2008-11-07 21:32:35 UTC (rev 327)
@@ -12,6 +12,12 @@
 import charva.awt.event.MouseEvent;
 import charvax.swing.JFrame;
 import charvax.swing.JTextArea;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
@@ -23,13 +29,36 @@
 
     public SQLShellComponent() {
         setEditable(false);
+        setEnabled(true);
     }
     @Override
-    public void processKeyEvent(KeyEvent arg0) {
+    public void processKeyEvent(KeyEvent evt) {
         //super.processKeyEvent(arg0);
-        sqlshellWindow.keyTyped(arg0);
+        sqlshellWindow.keyTyped(evt);
     }
 
+    @Override
+    public void processMouseEvent(MouseEvent evt) {
+        super.processMouseEvent(evt);
+        if (evt.getModifiers() == evt.MOUSE_PRESSED) {
+            if (evt.getButton() == MouseEvent.BUTTON2) {
+                Clipboard clipBoard = java.awt.Toolkit.getDefaultToolkit().getSystemClipboard();
+                try {
+                    String clipBoardContents = (String) clipBoard.getData(DataFlavor.stringFlavor);
+                    //sqlshellWindow.debug(clipBoardContents);
+                    sqlshellWindow.insertText(clipBoardContents);
+                    sqlshellWindow.repaintScreen();
+                } catch (UnsupportedFlavorException ex) {
+                    Logger.getLogger(SQLShellComponent.class.getName()).log(Level.SEVERE, null, ex);
+                } catch (IOException ex) {
+                    Logger.getLogger(SQLShellComponent.class.getName()).log(Level.SEVERE, null, ex);
+                }
+
+            }
+        }
+    }
+    
+
     public static void main(String[] args) {
         JFrame frame = new JFrame();
         SQLShellComponent component = new SQLShellComponent();