Thread: [Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session MainPanel.java,
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Gerd W. <ger...@us...> - 2005-04-24 18:14:27
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17183/app/src/net/sourceforge/squirrel_sql/client/gui/session Modified Files: MainPanel.java SessionPanel.java Log Message: Bug fixes Index: SessionPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SessionPanel.java 23 Apr 2005 17:23:36 -0000 1.5 --- SessionPanel.java 24 Apr 2005 18:13:44 -0000 1.6 *************** *** 20,52 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - import java.awt.*; - import java.awt.event.ActionEvent; - import java.awt.event.ActionListener; - import java.beans.PropertyChangeEvent; - import java.beans.PropertyChangeListener; - import java.sql.SQLException; - import java.util.Vector; - - import javax.swing.Action; - import javax.swing.JComponent; - import javax.swing.JLabel; - import javax.swing.JPanel; - import javax.swing.JTabbedPane; - import javax.swing.event.TreeSelectionEvent; - import javax.swing.event.TreeSelectionListener; - import javax.swing.tree.TreePath; - - import net.sourceforge.squirrel_sql.fw.gui.GUIUtils; - import net.sourceforge.squirrel_sql.fw.gui.SQLCatalogsComboBox; - import net.sourceforge.squirrel_sql.fw.gui.StatusBar; - import net.sourceforge.squirrel_sql.fw.gui.ToolBar; - import net.sourceforge.squirrel_sql.fw.id.IIdentifier; - import net.sourceforge.squirrel_sql.fw.sql.SQLConnection; - import net.sourceforge.squirrel_sql.fw.util.StringManager; - import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; - import net.sourceforge.squirrel_sql.fw.util.StringUtilities; - import net.sourceforge.squirrel_sql.fw.util.log.ILogger; - import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; - import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.ActionCollection; --- 20,23 ---- *************** *** 54,71 **** import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; import net.sourceforge.squirrel_sql.client.session.ISession; - import net.sourceforge.squirrel_sql.client.session.action.CommitAction; import net.sourceforge.squirrel_sql.client.session.action.ExecuteSqlAction; import net.sourceforge.squirrel_sql.client.session.action.RefreshObjectTreeAction; - import net.sourceforge.squirrel_sql.client.session.action.RollbackAction; import net.sourceforge.squirrel_sql.client.session.action.SQLFilterAction; import net.sourceforge.squirrel_sql.client.session.action.SessionPropertiesAction; import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab; import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLPanel; ! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.IObjectTreeListener; ! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeAdapter; ! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeListenerEvent; ! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode; ! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreePanel; import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties; public class SessionPanel extends JPanel --- 25,59 ---- import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.action.ExecuteSqlAction; import net.sourceforge.squirrel_sql.client.session.action.RefreshObjectTreeAction; import net.sourceforge.squirrel_sql.client.session.action.SQLFilterAction; import net.sourceforge.squirrel_sql.client.session.action.SessionPropertiesAction; import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab; import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLPanel; ! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.*; import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties; + import net.sourceforge.squirrel_sql.fw.gui.GUIUtils; + import net.sourceforge.squirrel_sql.fw.gui.SQLCatalogsComboBox; + import net.sourceforge.squirrel_sql.fw.gui.StatusBar; + import net.sourceforge.squirrel_sql.fw.gui.ToolBar; + import net.sourceforge.squirrel_sql.fw.id.IIdentifier; + import net.sourceforge.squirrel_sql.fw.sql.SQLConnection; + import net.sourceforge.squirrel_sql.fw.util.StringManager; + import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; + import net.sourceforge.squirrel_sql.fw.util.StringUtilities; + import net.sourceforge.squirrel_sql.fw.util.log.ILogger; + import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; + + import javax.swing.*; + import javax.swing.event.TreeSelectionEvent; + import javax.swing.event.TreeSelectionListener; + import javax.swing.tree.TreePath; + import java.awt.*; + import java.awt.event.ActionEvent; + import java.awt.event.ActionListener; + import java.beans.PropertyChangeEvent; + import java.beans.PropertyChangeListener; + import java.sql.SQLException; + import java.util.Vector; public class SessionPanel extends JPanel *************** *** 506,514 **** add(actions.get(ExecuteSqlAction.class)); addSeparator(); ! add(actions.get(CommitAction.class)); ! add(actions.get(RollbackAction.class)); actions.get(ExecuteSqlAction.class).setEnabled(false); ! actions.get(CommitAction.class).setEnabled(false); ! actions.get(RollbackAction.class).setEnabled(false); addSeparator(); add(actions.get(SQLFilterAction.class)); --- 494,502 ---- add(actions.get(ExecuteSqlAction.class)); addSeparator(); ! // add(actions.get(CommitAction.class)); ! // add(actions.get(RollbackAction.class)); actions.get(ExecuteSqlAction.class).setEnabled(false); ! // actions.get(CommitAction.class).setEnabled(false); ! // actions.get(RollbackAction.class).setEnabled(false); addSeparator(); add(actions.get(SQLFilterAction.class)); Index: MainPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session/MainPanel.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MainPanel.java 23 Apr 2005 17:23:36 -0000 1.4 --- MainPanel.java 24 Apr 2005 18:13:44 -0000 1.5 *************** *** 20,53 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - import java.awt.BorderLayout; - import java.beans.PropertyChangeEvent; - import java.beans.PropertyChangeListener; - import java.util.ArrayList; - import java.util.Iterator; - import java.util.List; - import java.util.prefs.Preferences; - - import javax.swing.JPanel; - import javax.swing.JTabbedPane; - import javax.swing.event.ChangeEvent; - import javax.swing.event.ChangeListener; - - import net.sourceforge.squirrel_sql.fw.util.StringManager; - import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; - import net.sourceforge.squirrel_sql.fw.util.log.ILogger; - import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; - import net.sourceforge.squirrel_sql.client.action.ActionCollection; import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory; import net.sourceforge.squirrel_sql.client.session.ISession; ! import net.sourceforge.squirrel_sql.client.session.action.CommitAction; ! import net.sourceforge.squirrel_sql.client.session.action.ExecuteSqlAction; ! import net.sourceforge.squirrel_sql.client.session.action.GotoNextResultsTabAction; ! import net.sourceforge.squirrel_sql.client.session.action.GotoPreviousResultsTabAction; ! import net.sourceforge.squirrel_sql.client.session.action.RefreshObjectTreeAction; ! import net.sourceforge.squirrel_sql.client.session.action.RollbackAction; ! import net.sourceforge.squirrel_sql.client.session.action.SQLFilterAction; ! import net.sourceforge.squirrel_sql.client.session.action.EditWhereColsAction; ! import net.sourceforge.squirrel_sql.client.session.action.ShowNativeSQLAction; import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab; import net.sourceforge.squirrel_sql.client.session.mainpanel.ObjectTreeTab; --- 20,27 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import net.sourceforge.squirrel_sql.client.action.ActionCollection; import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory; import net.sourceforge.squirrel_sql.client.session.ISession; ! import net.sourceforge.squirrel_sql.client.session.action.*; import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab; import net.sourceforge.squirrel_sql.client.session.mainpanel.ObjectTreeTab; *************** *** 56,59 **** --- 30,48 ---- import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreePanel; import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties; + import net.sourceforge.squirrel_sql.fw.util.StringManager; + import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; + import net.sourceforge.squirrel_sql.fw.util.log.ILogger; + import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; + + import javax.swing.*; + import javax.swing.event.ChangeEvent; + import javax.swing.event.ChangeListener; + import java.awt.*; + import java.beans.PropertyChangeEvent; + import java.beans.PropertyChangeListener; + import java.util.ArrayList; + import java.util.Iterator; + import java.util.List; + import java.util.prefs.Preferences; /** * This tabbed panel is the main panel within the session window. *************** *** 295,301 **** actions.get(EditWhereColsAction.class).setEnabled(true); } ! final boolean isAutoCommit = _session.getProperties().getAutoCommit(); ! actions.get(CommitAction.class).setEnabled(!isAutoCommit); ! actions.get(RollbackAction.class).setEnabled(!isAutoCommit); } --- 284,290 ---- actions.get(EditWhereColsAction.class).setEnabled(true); } ! // final boolean isAutoCommit = _session.getProperties().getAutoCommit(); ! // actions.get(CommitAction.class).setEnabled(!isAutoCommit); ! // actions.get(RollbackAction.class).setEnabled(!isAutoCommit); } |