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

[Robert Stryker]

  User: rawb    
  Date: 06/12/22 18:26:35

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server   
                        ServerTableViewer.java JBossServerTableViewer.java
                        JBossServerView.java
  Log:
  Added deploy-only server (cannot start or stop)
  Other associated changes. 
  
  Revision  Changes    Path
  1.6       +3 -1      jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerTableViewer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerTableViewer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerTableViewer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ServerTableViewer.java	14 Dec 2006 19:34:44 -0000	1.5
  +++ ServerTableViewer.java	22 Dec 2006 23:26:35 -0000	1.6
  @@ -69,9 +69,11 @@
   	protected class ServerTableLabelProvider2 extends ServerTableLabelProvider {
   		private int myCount = 0;
   		protected Image getStateImage(IServerType serverType, int state, String mode) {
  +			if( serverType.getId().equals("org.jboss.ide.eclipse.as.systemCopyServer")) return null;
   			return UIDecoratorManager.getUIDecorator(serverType).getStateImage(state, mode, myCount);
   		}
   		protected String getStateLabel(IServerType serverType, int state, String mode) {
  +			if( serverType.getId().equals("org.jboss.ide.eclipse.as.systemCopyServer")) return "N/A";
   			return UIDecoratorManager.getUIDecorator(serverType).getStateLabel(state, mode, myCount);
   		}
   		protected void animate() {
  @@ -84,7 +86,7 @@
   	
   	public class TrimmedServerContentProvider implements IStructuredContentProvider, ITreeContentProvider {
   		public Object[] getElements(Object element) {
  -			return JBossServerCore.getIServerJBossServers();
  +			return JBossServerCore.getDeployableServersAsIServers();
   		}
   
   		public void inputChanged(Viewer theViewer, Object oldInput, Object newInput) {
  
  
  
  1.5       +13 -3     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerTableViewer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossServerTableViewer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerTableViewer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- JBossServerTableViewer.java	14 Dec 2006 19:34:44 -0000	1.4
  +++ JBossServerTableViewer.java	22 Dec 2006 23:26:35 -0000	1.5
  @@ -45,7 +45,7 @@
   public class JBossServerTableViewer extends TreeViewer {
   
   	protected TableViewerPropertySheet propertySheet;
  -	protected Action disableCategoryAction, refreshAction;
  +	protected Action disableCategoryAction, refreshAction, refreshFullAction;
   	protected boolean suppressingRefresh = false;
   	public JBossServerTableViewer(Tree tree) {
   		super(tree);
  @@ -100,6 +100,13 @@
   			}
   		};
   		refreshAction.setText("Refresh Item");
  +		
  +		refreshFullAction = new Action() {
  +			public void run() {
  +				refresh(null);
  +			}
  +		};
  +		refreshFullAction.setText("Refresh Full Tree");
   	}
   	
   	public static class ContentWrapper {
  @@ -279,6 +286,7 @@
   	protected void fillJBContextMenu(Shell shell, IMenuManager menu) {
   		Object selected = getSelectedElement();
   		menu.add(refreshAction);
  +		menu.add(refreshFullAction);
   		if( selected instanceof ServerViewProvider ) {
   			menu.add(disableCategoryAction);
   		}
  @@ -413,8 +421,10 @@
   
   	// for testing
   	public void refresh(final Object element) {
  -		System.out.println("here: " + element);
  +		if(!suppressingRefresh) {
   		super.refresh(element);
  +		} else {
  +		}
   	}
   	
   
  
  
  
  1.6       +2 -18     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/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/server/JBossServerView.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- JBossServerView.java	14 Dec 2006 19:34:44 -0000	1.5
  +++ JBossServerView.java	22 Dec 2006 23:26:35 -0000	1.6
  @@ -54,11 +54,7 @@
   	protected Tree jbTreeTable;
   	
   	
  -	protected Action  refreshViewerAction, editLaunchConfigAction, twiddleAction, cloneServerAction;
  -
  -	
  -	private boolean suppressingRefresh = false;
  -	
  +	protected Action editLaunchConfigAction, twiddleAction, cloneServerAction;
   	
   	public static JBossServerView instance;
   	public static JBossServerView getDefault() {
  @@ -104,19 +100,6 @@
   	
   	
   	public void createActions() {
  -		refreshViewerAction = new Action() {
  -			public void run() {
  -				Display.getDefault().asyncExec(new Runnable() {
  -					public void run() {
  -						getJBViewer().refresh(null);
  -					} 
  -				});
  -			}
  -			
  -		};
  -		refreshViewerAction.setText(Messages.RefreshViewerAction);
  -		
  -		
   		editLaunchConfigAction = new Action() {
   			public void run() {
   				Display.getDefault().asyncExec(new Runnable() { 
  @@ -264,6 +247,7 @@
   				if( server != jbViewer.getInput()) {
   					jbViewer.setInput(server); 
   				} else {
  +					jbViewer.refresh();
   //					Object[] expanded = jbViewer.getExpandedElements();
   //					jbViewer.setInput(server);
   //					jbViewer.setExpandedElements(expanded);