[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties SessionProperties.java,1.20,1.21 SessionPropertiesSheet.java,1.14,1.15

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

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9983/app/src/net/sourceforge/squirrel_sql/client/session/properties

Modified Files:
	SessionProperties.java SessionPropertiesSheet.java 
Log Message:
Oliver Jehle's patch for Object Tree Filter, some enhancements

Index: SessionPropertiesSheet.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties/SessionPropertiesSheet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SessionPropertiesSheet.java	12 Jul 2005 03:30:48 -0000	1.14
--- SessionPropertiesSheet.java	25 Sep 2005 06:57:06 -0000	1.15
***************
*** 47,58 ****
  public class SessionPropertiesSheet extends BaseSessionInternalFrame
  {
! 	/**
! 	 * This interface defines locale specific strings. This should be
! 	 * replaced with a property file.
! 	 */
! 	private interface i18n
! 	{
! 		String TITLE = "- Session Properties";
! 	}
  
  	/** Logger for this class. */
--- 47,58 ----
  public class SessionPropertiesSheet extends BaseSessionInternalFrame
  {
!    /**
!     * This interface defines locale specific strings. This should be
!     * replaced with a property file.
!     */
!    private interface i18n
!    {
!       String TITLE = "- Session Properties";
!    }
  
  	/** Logger for this class. */
***************
*** 62,66 ****
  	private final List _panels = new ArrayList();
  
! 	/** Frame title. */
  	private JLabel _titleLbl = new JLabel();
  
--- 62,68 ----
  	private final List _panels = new ArrayList();
  
!    private JTabbedPane _tabbedPane;
! 
!    /** Frame title. */
  	private JLabel _titleLbl = new JLabel();
  
***************
*** 102,106 ****
  	}
  
! 	/**
  	 * Set title of this frame. Ensure that the title label
  	 * matches the frame title.
--- 104,127 ----
  	}
  
!    public void selectTabByTitle(String tabNameToSelect)
!    {
!       if(null == tabNameToSelect)
!       {
!          return;
!       }
! 
!       int tabCount = _tabbedPane.getTabCount();
! 
!       for (int i = 0; i < tabCount; i++)
!       {
!          if(tabNameToSelect.equals(_tabbedPane.getTitleAt(i)))
!          {
!             _tabbedPane.setSelectedIndex(i);
!          }
!       }
!    }
! 
! 
!    /**
  	 * Set title of this frame. Ensure that the title label
  	 * matches the frame title.
***************
*** 184,188 ****
  
  		// Add all panels to the tabbed panel.
! 		JTabbedPane tabPane = UIFactory.getInstance().createTabbedPane();
  		for (Iterator it = _panels.iterator(); it.hasNext();)
  		{
--- 205,209 ----
  
  		// Add all panels to the tabbed panel.
! 		_tabbedPane = UIFactory.getInstance().createTabbedPane();
  		for (Iterator it = _panels.iterator(); it.hasNext();)
  		{
***************
*** 193,197 ****
  			sp.setBorder(BorderFactory.createEmptyBorder());
  			sp.setPreferredSize(new Dimension(450, 400));
! 			tabPane.addTab(pnlTitle, null, sp, hint);
  		}
  
--- 214,218 ----
  			sp.setBorder(BorderFactory.createEmptyBorder());
  			sp.setPreferredSize(new Dimension(450, 400));
! 			_tabbedPane.addTab(pnlTitle, null, sp, hint);
  		}
  
***************
*** 213,217 ****
  		++gbc.gridy;
  		gbc.weighty = 1;
! 		contentPane.add(tabPane, gbc);
  
  		++gbc.gridy;
--- 234,238 ----
  		++gbc.gridy;
  		gbc.weighty = 1;
! 		contentPane.add(_tabbedPane, gbc);
  
  		++gbc.gridy;

Index: SessionProperties.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/properties/SessionProperties.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** SessionProperties.java	25 Sep 2005 02:56:14 -0000	1.20
--- SessionProperties.java	25 Sep 2005 06:57:06 -0000	1.21
***************
*** 870,874 ****
  
  	public synchronized void setObjectFilter(String data) {
! 		final String oldValue = data;
  		_objectFilter = data;
  		getPropertyChangeReporter().firePropertyChange(IPropertyNames.OBJECT_FILTER, oldValue, _objectFilter);
--- 870,874 ----
  
  	public synchronized void setObjectFilter(String data) {
! 		final String oldValue = _objectFilter;
  		_objectFilter = data;
  		getPropertyChangeReporter().firePropertyChange(IPropertyNames.OBJECT_FILTER, oldValue, _objectFilter);