[jboss-cvs] jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views ...

[Max Rydahl Andersen]

  User: mandersen
  Date: 07/01/08 14:39:13

  Modified:    hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views  
                        QueryPageViewer.java QueryPageTabView.java
  Log:
  JBIDE-430 & HBX-847 Hibernate Console: Title on Query Results Tab Unworkable
  
  Revision  Changes    Path
  1.10      +5 -5      jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryPageViewer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: QueryPageViewer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryPageViewer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- QueryPageViewer.java	28 Nov 2006 17:05:15 -0000	1.9
  +++ QueryPageViewer.java	8 Jan 2007 19:39:13 -0000	1.10
  @@ -39,12 +39,12 @@
   import org.eclipse.jface.viewers.TableViewer;
   import org.eclipse.jface.viewers.Viewer;
   import org.eclipse.swt.SWT;
  +import org.eclipse.swt.custom.CTabItem;
   import org.eclipse.swt.graphics.Image;
   import org.eclipse.swt.layout.GridData;
   import org.eclipse.swt.layout.GridLayout;
   import org.eclipse.swt.widgets.Composite;
   import org.eclipse.swt.widgets.Menu;
  -import org.eclipse.swt.widgets.TabItem;
   import org.eclipse.swt.widgets.Table;
   import org.eclipse.swt.widgets.TableColumn;
   import org.hibernate.console.QueryPage;
  @@ -140,7 +140,7 @@
   
   	private final QueryPage queryPage;
   	private TableViewer tableViewer;
  -	private TabItem tabItem;
  +	private CTabItem tabItem;
   	private final QueryPageTabView qrView;
   	
   	public QueryPageViewer(QueryPageTabView qrView, QueryPage queryPage) {
  @@ -152,7 +152,7 @@
   		
   	}
   	
  -	protected TabItem getTabItem() {
  +	protected CTabItem getTabItem() {
   		return this.tabItem;
   	}
   	
  @@ -161,8 +161,8 @@
   	}
   	
   	protected void createControl() {
  -    	this.tabItem = new TabItem(this.qrView.tabs, SWT.NONE);
  -    	
  +    	this.tabItem = new CTabItem(this.qrView.tabs, SWT.NONE);
  +    	this.tabItem.setData( this.queryPage );
       	int index = this.qrView.tabs.getItems().length;    	
       	Composite composite = new Composite(this.qrView.tabs, SWT.NONE);
   		GridLayout layout = new GridLayout();
  
  
  
  1.12      +19 -4     jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryPageTabView.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: QueryPageTabView.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryPageTabView.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- QueryPageTabView.java	7 Jul 2006 13:51:09 -0000	1.11
  +++ QueryPageTabView.java	8 Jan 2007 19:39:13 -0000	1.12
  @@ -39,6 +39,11 @@
   import org.eclipse.jface.viewers.SelectionChangedEvent;
   import org.eclipse.jface.viewers.StructuredSelection;
   import org.eclipse.swt.SWT;
  +import org.eclipse.swt.custom.CTabFolder;
  +import org.eclipse.swt.custom.CTabFolder2Adapter;
  +import org.eclipse.swt.custom.CTabFolder2Listener;
  +import org.eclipse.swt.custom.CTabFolderEvent;
  +import org.eclipse.swt.custom.CTabItem;
   import org.eclipse.swt.events.SelectionAdapter;
   import org.eclipse.swt.events.SelectionEvent;
   import org.eclipse.swt.widgets.Composite;
  @@ -62,7 +67,7 @@
   	
   	public static final String ID = "org.hibernate.eclipse.console.views.QueryPageTabView";
   	
  -	protected TabFolder tabs = null;
  +	protected CTabFolder tabs = null;
   
   	private Set listeners = Collections.synchronizedSet(new HashSet() );
   	
  @@ -141,13 +146,23 @@
   	}
   	
   	public void createPartControl(Composite parent) {
  -		this.tabs = new TabFolder(parent, SWT.NONE);
  -		this.tabs.addSelectionListener(new SelectionAdapter() {
  +		tabs = new CTabFolder(parent, SWT.CLOSE | SWT.BOTTOM);
  +		tabs.setSimple( false );
  +		tabs.setUnselectedCloseVisible( false );
  +		
  +		tabs.addSelectionListener(new SelectionAdapter() {
   			public void widgetSelected(SelectionEvent event) {
   				fireSelectionChangedEvent();
   			}
   		});
  +		tabs.addCTabFolder2Listener( new CTabFolder2Adapter() {
  +		
  +			public void close(CTabFolderEvent event) {
  +				QueryPage qp = (QueryPage) event.item.getData();
  +				KnownConfigurations.getInstance().getQueryPageModel().remove( qp );				
  +			}
   		
  +		});
   		rebuild();
   		
   		initActions();
  @@ -220,7 +235,7 @@
   		} else {
   			int index = this.tabs.getSelectionIndex();
   			if (index >= 0) {
  -				TabItem item = this.tabs.getItem(index);
  +				CTabItem item = this.tabs.getItem(index);
   				for (Iterator i = this.pageViewers.iterator(); 
   				selection == null && i.hasNext();) {
   					QueryPageViewer viewer = (QueryPageViewer) i.next();