From b2800799cbae8debf44804d01a6f8a39a9792794 Mon Sep 17 00:00:00 2001
From: Chrriis <chrriis@gmail.com>
Date: Thu, 8 Mar 2012 14:00:57 +0000
Subject: [PATCH] [#1177] Add SQL Console module to jOOQ - bug fix in SQL
 editor and minor UI improvements.

---
 .../java/org/jooq/debug/console/Console.java  |  16 +++++++++++++---
 .../org/jooq/debug/console/EditorPane.java    |   3 ++-
 .../jooq/debug/console/resources/Close16.png  | Bin 3696 -> 0 bytes
 .../{CloseGray16.png => TabCloseActive14.png} | Bin 3680 -> 3080 bytes
 .../console/resources/TabCloseInactive14.png  | Bin 0 -> 1113 bytes
 5 files changed, 15 insertions(+), 4 deletions(-)
 delete mode 100644 jOOQ-console/src/main/resources/org/jooq/debug/console/resources/Close16.png
 rename jOOQ-console/src/main/resources/org/jooq/debug/console/resources/{CloseGray16.png => TabCloseActive14.png} (72%)
 create mode 100644 jOOQ-console/src/main/resources/org/jooq/debug/console/resources/TabCloseInactive14.png

diff --git a/jOOQ-console/src/main/java/org/jooq/debug/console/Console.java b/jOOQ-console/src/main/java/org/jooq/debug/console/Console.java
index 2492bd60be..2a15f098e7 100644
--- a/jOOQ-console/src/main/java/org/jooq/debug/console/Console.java
+++ b/jOOQ-console/src/main/java/org/jooq/debug/console/Console.java
@@ -38,6 +38,7 @@ package org.jooq.debug.console;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.Desktop;
@@ -403,7 +404,8 @@ public class Console extends JFrame {
         final JPanel tabComponent = new JPanel(new BorderLayout());
         tabComponent.setOpaque(false);
         tabComponent.add(new JLabel(title), BorderLayout.CENTER);
-        final JLabel closeLabel = new JLabel(new ImageIcon(getClass().getResource("/org/jooq/debug/console/resources/CloseGray16.png")));
+        final JLabel closeLabel = new JLabel(new ImageIcon(getClass().getResource("/org/jooq/debug/console/resources/TabCloseInactive14.png")));
+        closeLabel.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
         closeLabel.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseReleased(MouseEvent e) {
@@ -428,12 +430,20 @@ public class Console extends JFrame {
             @Override
             public void mouseEntered(MouseEvent e) {
                 if(editorTabbedPane.getTabCount() > 2) {
-                    closeLabel.setIcon(new ImageIcon(getClass().getResource("/org/jooq/debug/console/resources/Close16.png")));
+                    closeLabel.setIcon(new ImageIcon(getClass().getResource("/org/jooq/debug/console/resources/TabCloseActive14.png")));
                 }
             }
             @Override
             public void mouseExited(MouseEvent e) {
-                closeLabel.setIcon(new ImageIcon(getClass().getResource("/org/jooq/debug/console/resources/CloseGray16.png")));
+                closeLabel.setIcon(new ImageIcon(getClass().getResource("/org/jooq/debug/console/resources/TabCloseInactive14.png")));
+            }
+        });
+        editorTabbedPane.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                int selectedIndex = editorTabbedPane.getSelectedIndex();
+                Component tabComponent2 = editorTabbedPane.getTabComponentAt(selectedIndex);
+                closeLabel.setVisible(tabComponent2 == tabComponent && editorTabbedPane.getTabCount() > 2);
             }
         });
         tabComponent.add(closeLabel, BorderLayout.EAST);
diff --git a/jOOQ-console/src/main/java/org/jooq/debug/console/EditorPane.java b/jOOQ-console/src/main/java/org/jooq/debug/console/EditorPane.java
index db49803411..a08911ed35 100644
--- a/jOOQ-console/src/main/java/org/jooq/debug/console/EditorPane.java
+++ b/jOOQ-console/src/main/java/org/jooq/debug/console/EditorPane.java
@@ -215,7 +215,7 @@ public class EditorPane extends JPanel {
                         }
                         break;
                     case KeyEvent.VK_F5:
-                        if(startButton.isEnabled()) {
+                        if(startButton.isVisible()) {
                             evaluateInternal();
                         }
                         break;
@@ -564,6 +564,7 @@ public class EditorPane extends JPanel {
                 public void run() {
                     startButton.setVisible(true);
                     stopButton.setVisible(false);
+                    stopButton.setToolTipText(null);
                 }
             });
             if(!isDBEditable) {
diff --git a/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/Close16.png b/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/Close16.png
deleted file mode 100644
index 41d4d9bc96b7a2dc40a1343e3ed63bd24065079a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3696
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

diff --git a/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/CloseGray16.png b/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/TabCloseActive14.png
similarity index 72%
rename from jOOQ-console/src/main/resources/org/jooq/debug/console/resources/CloseGray16.png
rename to jOOQ-console/src/main/resources/org/jooq/debug/console/resources/TabCloseActive14.png
index 01f65c52d9f9c80d57c42f7785684624ef1a2b24..00c16c43d910e706229acf7c152a20014abade16 100644
GIT binary patch
delta 358
zcmV-s0h#{b9EcbpiBL{Q4GJ0x0000DNk~Le0000E0000E2nGNE03S##(Xk<}3V#73
zNkl<Zc-pj*!Ab&Q6h@B&iG>h2GsP&;LL7wo-HA{S;VaEQPvsLhE1`|!VjxgK2PuUt
zN>jXTv<9sfM&I&&_i*8GGa|w<F*q`R2Sdx1eyuK{<w|I|I=vKHu1@#+7lUy!$5RTj
zh94HI8XzoIHCe;=lwzFB0Rn(bT7S;=lJ6-+G>9=yPuRSz@UC5=ZWkc9eT?-1xP#5h
zGvBexygVi3&mEG7d#01uPv~1YrDlWaYym+2;tGK2Y(c5n_}%KL)xj*}0C=7Z0Wb?W
zMy<}zU}(9T)y8-1GSMJr_`V<-#5i^tRvSNU+t?SQRE;R^!Eznk^zJe&*E>NJ_fV<^
z@CAzqB0}4&NMF^ZZC0dhR`hPZ?R2^qkwdHh{&F7!0Ndh}?*MudMgRZ+07*qoM6N<$
Ef-o1FZvX%Q

delta 963
zcmeB>cp#(L8Q|y6%O%Cdz`(%k>ERLtqy<2jgBeI_=<)||R9weZ&&&|u6XLpm|Ni;&
z=QlJo#K*_~|NkGTfKH&EPWIrkX4HOMAwwVWK^6WwHEXSa-exTc@(Tv$g8vM^xA6r7
z1>!ti978H@_4GUPF&lCmc{Abv{u!-uLQ$c6r!=>^ed4%NbN<nK1#5l334s$OMLBa6
zy12T!q!~mWXv|A1^_tK6;;=@bgYe>##tV1nA1<lf#=9emaW3D-B$4|+Bx>K8GJI)}
UR=?t;<OT|IPgg&ebxsLQ0LqU}GXMYp

diff --git a/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/TabCloseInactive14.png b/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/TabCloseInactive14.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fcb259b85fac9918577a91252d47b4a88e1f5a4
GIT binary patch
literal 1113
zcmV-f1g86mP)<h;3K|Lk000e1NJLTq000gE000gM1ONa4wL#@t00009a7bBm000XU
z000XU0RWnu7ytkR7->U8P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-muNV4mRU;^fLC
zz`#&YR8r&~<QN$d8KuB}o`H>lnSp_Ufq@}0xwybFAi#%#fq@|}KQEO56)-X|e7nZL
z$iTqBa9P*U#mSX{G{Bl%P*lRez;J+pfx##xwK$o9f#C}S14DXwNkIt%17i#W1A|CX
zc0maP17iUL1A|C*NRTrF17iyV0~1e4YDEbH0|SF|enDkXW_m`6f}y3QrGjHhep0GJ
zaAk2xYHqQDXI^rCQ9*uDVo7QW0|Nup4h9AW240u^5(W3f%sd4n162kpgNVo|1qcff
zJ_s=cNG>fZg9jx8g8+j9g8_pBLjXe}Lp{R+hNBE`7{wV~7)u#fFy3PlV+vxLz;uCG
zm^qSpA@ds+OO_6nTdaDlt*rOhEZL^9ePa)2-_4=K(Z%tFGm-NGmm}8}ZcXk5JW@PU
zd4+f<@d@)y<Co!IETAK>L(o<5icqT158+-B6_LH7;i6x}CW#w~Uy-Pgl#@Irl`kzV
zeL|*8R$ca%T%Wv){2zs_iiJvgN^h0dsuZZ2sQy$tsNSU!s;Q*;LF<6_B%M@UD?LHI
zSNcZ`78uqV#TeU~$eS{ozBIdFzSClf<pirb>s*^S+dw;4dus<{M;#|MXC)T}S9v!D
zcV!QCPhBq)ZyO(X-(bH4|NMaZz==UigLj2o41F2S6d@OB6%`R(5i>J(Puzn9wnW{e
zu;hl6HK{k#IWjCVGqdJqU(99Cv(K+6*i`tgSi2;vbXD1#3jNBGs$DgVwO(~o>mN4i
zHPtkqZIx>)Y(Ls5-Br|mx>vQYvH$Kwn@O`L|D75??eGkZnf<fA&q<hjdcOIBrHe!s
zw=Vg%EOYt2l_9H6uW?zsZ@uM)ZJSIsZ`o?HZTk+Zo%?sY?m4?JZ2yCUIfs58X+I`@
ze8oxYQ|HbkpZ#@y(nak{N3SGa{daxNO`BVH@6_K@zJKCj-ea*R`=4dL5P5m<b^crV
zcNac1eKP(0>g$5<;Xeg_o%+-I&+-3%01W^SH2RkDT>t<81ZP1_K>z@;j(q!3lK=n!
zAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fdMgRZ+t4TybRCwB)
z(7_6VKoEf8f0yVO6cLI~5M*6_vMv%ki);_)QK~mcJ&1?S<#td6gD%eXW8j}rp8unn
ziwgkf18T6T064(})TFB4v?T{HPT(ra#FSt`^+8TLbL7sFH+u@SO=U#LWM@KNta#Gc
zi%fzN8ek2yB)_#e8#FDjC7)s@or$<n@gN$~26Up$i5nk#R-G+~2UZ?%KBOA&%tV`z
fid3oDzx@sX|ARV~CM%V@00000NkvXXu0mjf7T?vv

literal 0
HcmV?d00001