[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6278] trunk/sql12/plugins/graph/src/main/java/net /sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java

[<ger...@us...>]

Revision: 6278
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6278&view=rev
Author:   gerdwagner
Date:     2011-05-29 19:23:49 +0000 (Sun, 29 May 2011)

Log Message:
-----------
Query Builder clean up

Modified Paths:
--------------
    trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java

Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java	2011-05-29 11:45:01 UTC (rev 6277)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java	2011-05-29 19:23:49 UTC (rev 6278)
@@ -32,6 +32,7 @@
 
    private JPopupMenu _popUpAggregate;
    private JPopupMenu _popUpSorting;
+   private JPanel _pnlButtons;
 
    QueryColumnPanel(final GraphPlugin graphPlugin, String tableName, ColumnInfo columnInfo, DndCallback dndCallback, ISession session)
    {
@@ -42,9 +43,10 @@
       _graphPluginResources = new GraphPluginResources(graphPlugin);
       setBorder(BorderFactory.createEmptyBorder());
 
-      JPanel pnlButtons = new JPanel(new GridBagLayout());
-      pnlButtons.setBackground(GraphTextAreaFactory.TEXTAREA_BG);
+      _pnlButtons = new JPanel(new GridBagLayout());
 
+      _pnlButtons.setBackground(GraphTextAreaFactory.TEXTAREA_BG);
+
       GridBagConstraints gbc;
 
       int xPos = 0;
@@ -62,15 +64,19 @@
          }
       });
       gbc = new GridBagConstraints(xPos,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,0,0), 0,0);
-      pnlButtons.add(chkSelect, gbc);
+      _pnlButtons.add(chkSelect, gbc);
 
-      initAggregate(pnlButtons, ++xPos);
+      initAggregate(_pnlButtons, ++xPos);
 
-      initFilter(graphPlugin, pnlButtons, ++xPos);
+      initFilter(graphPlugin, _pnlButtons, ++xPos);
 
-      initSorting(pnlButtons, ++xPos);
+      initSorting(_pnlButtons, ++xPos);
 
-      add(pnlButtons, BorderLayout.WEST);
+      add(_pnlButtons, BorderLayout.WEST);
+
+
+
+
       txtColumn = new QueryColumnTextField(_columnInfo.toString(), dndCallback, _session);
       txtColumn.setEditable(false);
       txtColumn.setBackground(GraphTextAreaFactory.TEXTAREA_BG);
@@ -271,7 +277,8 @@
          }
       }
 
-      return maxSize + chkSelect.getWidth() + btnFilter.getWidth();
+      //return maxSize + chkSelect.getWidth() + btnFilter.getWidth();
+      return maxSize + _pnlButtons.getWidth();
    }
 
    public void addColumnMouseListener(MouseListener mouseListener)


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