[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views ...

[Robert Stryker]

  User: rawb    
  Date: 06/10/06 14:20:09

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views 
                        JBossServerView.java
  Log:
  added hashcode / equals for jboss server, ensured jst.appclient was a supported facet
  
  Revision  Changes    Path
  1.9       +18 -2     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/JBossServerView.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossServerView.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/JBossServerView.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- JBossServerView.java	28 Sep 2006 22:18:02 -0000	1.8
  +++ JBossServerView.java	6 Oct 2006 18:20:09 -0000	1.9
  @@ -21,6 +21,9 @@
    */
   package org.jboss.ide.eclipse.as.ui.views;
   
  +import java.util.ArrayList;
  +import java.util.Arrays;
  +
   import org.eclipse.jface.action.IMenuListener;
   import org.eclipse.jface.action.IMenuManager;
   import org.eclipse.jface.action.MenuManager;
  @@ -40,6 +43,7 @@
   import org.eclipse.swt.widgets.Menu;
   import org.eclipse.swt.widgets.Shell;
   import org.eclipse.swt.widgets.Tree;
  +import org.eclipse.swt.widgets.TreeItem;
   import org.eclipse.ui.IMemento;
   import org.eclipse.ui.IViewSite;
   import org.eclipse.ui.PartInitException;
  @@ -49,7 +53,6 @@
   import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer;
   import org.eclipse.wst.server.ui.internal.view.servers.ServersView;
   import org.jboss.ide.eclipse.as.core.JBossServerCore;
  -import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin.ServerViewProvider;
   
   
   public class JBossServerView extends ServersView {
  @@ -183,8 +186,21 @@
   
   				if( selection == null ) return;
   				
  -				//if( server != jbViewer.getInput())
  +				if( server != jbViewer.getInput()) {
  +					jbViewer.setInput(server);
  +					jbViewer.expandToLevel(2);
  +				} else {
  +					// This is entirely too cludgy but it works
  +					Object[] expanded = jbViewer.getExpandedElements();
  +					TreeItem[] items = jbViewer.getTree().getItems();
   					jbViewer.setInput(server);
  +					jbViewer.expandToLevel(2);
  +					Object[] alsoExpanded = jbViewer.getExpandedElements();
  +					ArrayList tmp = new ArrayList();
  +					tmp.addAll(Arrays.asList(expanded));
  +					tmp.addAll(Arrays.asList(alsoExpanded));
  +					jbViewer.setExpandedElements(tmp.toArray());
  +				}
   			} 
   			
   		});