[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/09/28 18:18:02

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views  
                        JBossServerTableViewer.java JBossServerView.java
  Log:
  Added an action to modify the launch config directly, changed messages, removed unused elements in plugin.xml, and other small changes
  
  Revision  Changes    Path
  1.19      +31 -2     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/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/JBossServerTableViewer.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- JBossServerTableViewer.java	21 Sep 2006 19:52:43 -0000	1.18
  +++ JBossServerTableViewer.java	28 Sep 2006 22:18:02 -0000	1.19
  @@ -27,8 +27,11 @@
   import java.util.ArrayList;
   import java.util.Properties;
   
  +import org.eclipse.core.runtime.CoreException;
   import org.eclipse.core.runtime.IProgressMonitor;
   import org.eclipse.core.runtime.SubProgressMonitor;
  +import org.eclipse.debug.core.ILaunchConfiguration;
  +import org.eclipse.debug.ui.DebugUITools;
   import org.eclipse.jface.action.Action;
   import org.eclipse.jface.action.IMenuManager;
   import org.eclipse.jface.action.Separator;
  @@ -56,7 +59,9 @@
   import org.eclipse.wst.server.core.IServer;
   import org.eclipse.wst.server.core.IServerLifecycleListener;
   import org.eclipse.wst.server.core.ServerCore;
  +import org.eclipse.wst.server.core.internal.Server;
   import org.eclipse.wst.server.ui.ServerUICore;
  +import org.eclipse.wst.server.ui.internal.Trace;
   import org.jboss.ide.eclipse.as.core.JBossServerCore;
   import org.jboss.ide.eclipse.as.core.server.JBossServer;
   import org.jboss.ide.eclipse.as.core.util.ASDebug;
  @@ -75,7 +80,8 @@
   
   	protected TableViewerPropertySheet propertySheet;
   	
  -	protected Action disableCategoryAction, refreshViewerAction, twiddleAction, cloneServerAction;
  +	protected Action disableCategoryAction, refreshViewerAction, 
  +					editLaunchConfigAction, twiddleAction, cloneServerAction;
   
   	public JBossServerTableViewer(Tree tree) {
   		super(tree);
  @@ -133,6 +139,29 @@
   		};
   		disableCategoryAction.setText(Messages.DisableCategoryAction);
   		
  +		editLaunchConfigAction = new Action() {
  +			public void run() {
  +				Display.getDefault().asyncExec(new Runnable() { 
  +					public void run() {
  +						try {
  +							final Object selected = getSelectedElement();
  +							IServer s;
  +							if( selected instanceof JBossServer ) {
  +								s = ((JBossServer)selected).getServer();
  +								ILaunchConfiguration launchConfig = ((Server) s).getLaunchConfiguration(true, null);
  +								// TODO: use correct launch group
  +								DebugUITools.openLaunchConfigurationPropertiesDialog(new Shell(), launchConfig, "org.eclipse.debug.ui.launchGroup.run");
  +							}
  +						} catch (CoreException ce) {
  +							Trace.trace(Trace.SEVERE, "Could not create launch configuration", ce);
  +						}
  +
  +					}
  +				});
  +			}
  +		};
  +		editLaunchConfigAction.setText(Messages.EditLaunchConfigurationAction);
  +		editLaunchConfigAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.IMG_JBOSS_CONFIGURATION));
   		
   		twiddleAction = new Action() {
   			public void run() {
  @@ -381,7 +410,7 @@
   		if( selected instanceof JBossServer) {
   			boolean started =((JBossServer)selected).getServer().getServerState() == IServer.STATE_STARTED; 
   			twiddleAction.setEnabled(started);
  -			
  +			menu.add(editLaunchConfigAction);
   			menu.add(twiddleAction);
   			menu.add(cloneServerAction);
   			menu.add(new Separator());
  
  
  
  1.8       +1 -1      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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- JBossServerView.java	27 Jul 2006 06:34:01 -0000	1.7
  +++ JBossServerView.java	28 Sep 2006 22:18:02 -0000	1.8
  @@ -183,7 +183,7 @@
   
   				if( selection == null ) return;
   				
  -				if( server != jbViewer.getInput())
  +				//if( server != jbViewer.getInput())
   					jbViewer.setInput(server);
   			}