Author: rob.stryker(a)jboss.com Date: 2007-05-04 19:27:44 -0400 (Fri, 04 May 2007) New Revision: 2004 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PublishAction.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java Log: Removed non-essential system print statements. Fixed bug in edit fileset wizard. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java 2007-05-04 23:27:41 UTC (rev 2003) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java 2007-05-04 23:27:44 UTC (rev 2004) @@ -48,12 +48,11 @@ private Hyperlink twiddleTutorialLink; - public TwiddleDialog(Shell parentShell, IStructuredSelection selection) { + public TwiddleDialog(Shell parentShell, Object selection) { super(parentShell); setShellStyle(getShellStyle() | SWT.RESIZE); - Object o = selection.getFirstElement(); - if( o instanceof IServer ) { - server = (IServer)o; + if( selection instanceof IServer ) { + server = (IServer)selection; entity = ServerProcessModel.getDefault().getModel(server.getId()); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2007-05-04 23:27:41 UTC (rev 2003) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2007-05-04 23:27:44 UTC (rev 2004) @@ -753,7 +753,6 @@ } } xpathCache.put(xpath, list); - System.out.println("added to cache"); return (XPathTreeItem2[]) list.toArray(new XPathTreeItem2[list.size()]); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PublishAction.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PublishAction.java 2007-05-04 23:27:41 UTC (rev 2003) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PublishAction.java 2007-05-04 23:27:44 UTC (rev 2004) @@ -72,9 +72,9 @@ this.pack = pack; } public boolean performFinish() { - System.out.println("servers: " + getServers()); - System.out.println("autodeploy: " + getAutoDeploy()); - System.out.println("always publish to these: " + getAlwaysPublish()); +// System.out.println("servers: " + getServers()); +// System.out.println("autodeploy: " + getAutoDeploy()); +// System.out.println("always publish to these: " + getAlwaysPublish()); pack.setProperty(ArchivesBuildListener.DEPLOY_SERVERS, getServers()); pack.setProperty(ArchivesBuildListener.DEPLOY_AFTER_BUILD, getAutoDeploy()); return true; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java 2007-05-04 23:27:41 UTC (rev 2003) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java 2007-05-04 23:27:44 UTC (rev 2004) @@ -35,6 +35,7 @@ import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer; import org.jboss.ide.eclipse.as.core.server.JBossServer; import org.jboss.ide.eclipse.as.core.server.JBossServerBehavior; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; import org.jboss.ide.eclipse.as.ui.Messages; import org.jboss.ide.eclipse.as.ui.dialogs.TwiddleDialog; @@ -131,7 +132,7 @@ final IStructuredSelection selected = ((IStructuredSelection)tableViewer.getSelection()); Display.getDefault().asyncExec(new Runnable() { public void run() { - TwiddleDialog dialog = new TwiddleDialog(tableViewer.getTree().getShell(), selected); + TwiddleDialog dialog = new TwiddleDialog(tableViewer.getTree().getShell(), selected.getFirstElement()); dialog.open(); } } ); @@ -141,54 +142,6 @@ twiddleAction.setText(Messages.TwiddleServerAction); twiddleAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.TWIDDLE_IMAGE)); - -// cloneServerAction = new Action() { -// public void run() { -// Object selected = getSelectedElement(); -// if( selected != null && selected instanceof JBossServer ) { -// final JBossServer server = (JBossServer)selected; -// -// // Show a wizard -// final ServerCloneWizard wizard = new ServerCloneWizard(server); -// WizardDialog dlg = new WizardDialog(Display.getDefault().getActiveShell(), wizard); -// int ret = dlg.open(); -// if( ret == Window.OK ) { -// -// -// IRunnableWithProgress op = new IRunnableWithProgress() { -// -// public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { -// try { -// int filesWork = wizard.getSelectedFiles().length; -// int totalWork = filesWork + 1 + 50; -// monitor.beginTask("Cloning Server", totalWork); -// -// // clone the directories -// File[] files = wizard.getSelectedFiles(); -// String config = wizard.getConfig(); -// ServerCloneUtil.directoriesClone(files, config, server, new SubProgressMonitor(monitor, filesWork+1)); -// -// // clone the wst server -// ServerCloneUtil.wstServerClone(server, wizard.getName(), wizard.getConfig(), -// new SubProgressMonitor(monitor, 50)); -// -// monitor.done(); -// } catch( Exception e ) { -// e.printStackTrace(); -// } -// } -// -// }; -// try { -// new ProgressMonitorDialog(Display.getDefault().getActiveShell()).run(true, true, op); -// } catch( Exception e) { -// e.printStackTrace(); -// } -// } -// } -// } -// }; -// cloneServerAction.setText(Messages.CloneServerAction); } @@ -211,10 +164,11 @@ menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); if( getSelectedServer() != null ) { - boolean twiddleEnabled = getSelectedServer().getServerState() == IServer.STATE_STARTED; + boolean twiddleEnabled = getSelectedServer().getServerState() == IServer.STATE_STARTED + && ServerConverter.getJBossServer(getSelectedServer()) != null; boolean editLaunchEnabled = (JBossServerBehavior)getSelectedServer().loadAdapter(JBossServerBehavior.class, new NullProgressMonitor()) != null; twiddleAction.setEnabled(twiddleEnabled); - editLaunchConfigAction.setEnabled(editLaunchEnabled); + editLaunchConfigAction.setEnabled(true); } else { twiddleAction.setEnabled(false); editLaunchConfigAction.setEnabled(false); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java 2007-05-04 23:27:41 UTC (rev 2003) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java 2007-05-04 23:27:44 UTC (rev 2004) @@ -59,7 +59,7 @@ protected Action[] actions; protected MenuManager restartMenu; - protected Action newServerAction, twiddleAction; + protected Action newServerAction; /** * ServersView constructor comment. @@ -287,20 +287,6 @@ }; newServerAction.setText("New Server"); newServerAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.GENERIC_SERVER_IMAGE)); - - twiddleAction = new Action() { - public void run() { - Display.getDefault().asyncExec(new Runnable() { - public void run() { - TwiddleDialog dialog = new TwiddleDialog(tableViewer.getTree().getShell(), - (IStructuredSelection)tableViewer.getSelection()); - dialog.open(); - } - } ); - } - }; - twiddleAction.setText("Twiddle Server"); - twiddleAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.TWIDDLE_IMAGE)); } protected void fillContextMenu(Shell shell, IMenuManager menu) {