Author: rob.stryker(a)jboss.com Date: 2011-08-18 00:08:06 -0400 (Thu, 18 Aug 2011) New Revision: 34033 Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/ui/StrippedServerWizardFragment.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/ServerSourcePathComputerDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleFactory.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: https://issues.jboss.org/browse/JBIDE-9016 - Handling of code review Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-18 01:52:19 UTC (rev 34032) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-18 04:08:06 UTC (rev 34033) @@ -81,7 +81,7 @@ public static String CouldNotFindServer; public static String ServerRuntimeNotFound; public static String ServerRuntimeConfigNotFound; - public static String ServerHasNoRuntime; + public static String ServerHasNoRuntimeVM; public static String ServerNotFound; public static String CannotLoadServerPoller; public static String AddingJMXDeploymentFailed; @@ -95,6 +95,8 @@ public static String ErrorDisposingLocalJBoss7BehaviorDelegate; public static String JBoss7ServerState_noEnumForString; + public static String ServerStatePollerUnexpectedError; + public static String ServerArgsParseError; static { NLS.initializeMessages(BUNDLE_NAME, Messages.class); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-18 01:52:19 UTC (rev 34032) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-18 04:08:06 UTC (rev 34033) @@ -61,7 +61,7 @@ CouldNotFindServer=Could not find jboss server with id {0} ServerRuntimeNotFound=Runtime for server {0} cannot be found. ServerRuntimeConfigNotFound=Configuration for runtime {0} is not set. -ServerHasNoRuntime=Server {0} does not have a valid runtime environment +ServerHasNoRuntimeVM=Server {0} does not have a valid Virtual Machine. ServerNotFound=Server {0} not found. CannotLoadServerPoller=Error instantiating Server Poller {0} CannotSaveServersStartArgs=Could not save server start arguments for server {0}. @@ -73,3 +73,5 @@ ExtensionManager_could_not_load_publishers=Could not load publishers ErrorDisposingLocalJBoss7BehaviorDelegate=Could not dispose LocalJBoss7BehaviorDelegate JBoss7ServerState_noEnumForString="No JBoss7ServerState enum for string {0}" +ServerStatePollerUnexpectedError=The server state poller had an unexpected error. +ServerArgsParseError=Error parsing server arguments: {0} \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-08-18 01:52:19 UTC (rev 34032) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-08-18 04:08:06 UTC (rev 34033) @@ -1,7 +1,9 @@ package org.jboss.ide.eclipse.as.core.extensions.polling; import java.io.FileNotFoundException; +import java.io.IOException; import java.net.HttpURLConnection; +import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.util.ArrayList; @@ -80,8 +82,14 @@ return true; } catch( FileNotFoundException fnfe ) { return true; - } catch( Exception e) { - } + } catch (MalformedURLException e) { + // Should NEVER happen since hte URL's are hand-crafted, but whatever + Status s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, e.getMessage(), e); + JBossServerCorePlugin.getDefault().log(s); + } catch (IOException e) { + // Does not need to be logged + return false; + } return false; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2011-08-18 01:52:19 UTC (rev 34032) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2011-08-18 04:08:06 UTC (rev 34033) @@ -21,6 +21,7 @@ import org.eclipse.wst.server.core.model.IModuleResource; import org.eclipse.wst.server.core.util.ModuleFile; import org.eclipse.wst.server.core.util.ModuleFolder; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; public class ResourceModuleResourceUtil { public static IModuleResource createResource(IResource resource) { @@ -48,12 +49,22 @@ return folder; } + + /** + * Get a list of module resources in this container. + * If the container is closed or does not exist, return an empty array. + * + * @param parent The container to be searched + * @param forcedParentPath The parent's module-relative path + * @return A list of module resources + */ public static IModuleResource[] createChildrenResources(IContainer parent, IPath forcedParentPath) { ArrayList<IModuleResource> modChildren = new ArrayList<IModuleResource>(); IResource[] children = new IResource[]{}; try { children = parent.members(); } catch(CoreException ce) { + JBossServerCorePlugin.log(ce.getStatus()); } for( int i = 0; i < children.length; i++ ) { modChildren.add(createResource(children[i], forcedParentPath)); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-08-18 01:52:19 UTC (rev 34032) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-08-18 04:08:06 UTC (rev 34033) @@ -36,6 +36,7 @@ import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalStopLaunchConfigurator; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; @@ -316,14 +317,13 @@ public IStatus canChangeState(String launchMode) { try { - if( getServer() != null - && getServer().getRuntime() != null - && RuntimeUtils.checkedGetJBossServerRuntime(getServer()).getVM() != null ) + IJBossServerRuntime rt = RuntimeUtils.checkedGetJBossServerRuntime(getServer()); + if( rt != null && rt.getVM() != null ) return Status.OK_STATUS; } catch(CoreException e) { return e.getStatus(); } return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, - MessageFormat.format(Messages.ServerHasNoRuntime, getServer().getName())); + MessageFormat.format(Messages.ServerHasNoRuntimeVM, getServer().getName())); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-08-18 01:52:19 UTC (rev 34032) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-08-18 04:08:06 UTC (rev 34033) @@ -148,8 +148,10 @@ } stateStartedOrStopped = checkServerState(); } - } catch(PollingException e) { + } catch(Exception e) { abort = true; + Status s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, Messages.ServerStatePollerUnexpectedError, e); + ServerLogger.getDefault().log(server, s); } // we stopped. Did we abort? Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-08-18 01:52:19 UTC (rev 34032) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-08-18 04:08:06 UTC (rev 34033) @@ -97,11 +97,11 @@ return Status.OK_STATUS; } - private static IModuleFile createBlankModule() { + private static IModuleFile createBlankModule() throws CoreException { return new ModuleFile(getOrCreateBlankFile(), "", new Path("/")); //$NON-NLS-1$ //$NON-NLS-2$ } - private static File getOrCreateBlankFile() { + private static File getOrCreateBlankFile() throws CoreException { IPath p = JBossServerCorePlugin.getDefault().getStateLocation().append("BLANK_FILE"); //$NON-NLS-1$ if (!p.toFile().exists()) { try { @@ -110,7 +110,7 @@ out.close(); } } catch (IOException ioe) { - // TODO: implement error handling + throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, ioe.getMessage(), ioe)); } } return p.toFile(); @@ -172,8 +172,10 @@ IProgressMonitor monitor) throws CoreException { try { return removeFile(DEPLOYED, server, depPath, method, monitor); - } catch (Exception e) { - return Status.OK_STATUS; + } catch (CoreException e) { + // Not a critical error that should abort the publish. + // Simply return the status object + return e.getStatus(); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/ServerSourcePathComputerDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/ServerSourcePathComputerDelegate.java 2011-08-18 01:52:19 UTC (rev 34032) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/ServerSourcePathComputerDelegate.java 2011-08-18 04:08:06 UTC (rev 34033) @@ -27,6 +27,7 @@ import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerUtil; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; /** * SourcePathComputer for the GenericLaunchConfiguration. * @@ -94,8 +95,8 @@ javaProjectList.add(javaProject); } } - } catch (Exception e) { - // ignore + } catch (CoreException e) { + JBossServerCorePlugin.log(e.getStatus()); } } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2011-08-18 01:52:19 UTC (rev 34032) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2011-08-18 04:08:06 UTC (rev 34033) @@ -14,6 +14,12 @@ import java.util.HashMap; import java.util.Map; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.Messages; + public class ArgsUtil { public static final Integer NO_VALUE = new Integer(-1); @@ -99,6 +105,9 @@ } return retVal; } catch( Exception e ) { + Status status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + NLS.bind(Messages.ServerArgsParseError, s), e); + JBossServerCorePlugin.log(status); return new String[] { }; } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-08-18 01:52:19 UTC (rev 34032) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-08-18 04:08:06 UTC (rev 34033) @@ -425,7 +425,7 @@ </decorator> </extension> - <!-- JMX Stuff --> + <!-- JMX Stuff <extension point="org.jboss.tools.jmx.ui.providerUI"> <providerUI @@ -433,7 +433,7 @@ id="org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider" name="JBoss Server"> </providerUI> - </extension> + </extension>--> <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages"> <launchConfigurationTypeImage Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleFactory.java 2011-08-18 01:52:19 UTC (rev 34032) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleFactory.java 2011-08-18 04:08:06 UTC (rev 34033) @@ -51,6 +51,13 @@ return true; } } catch (CoreException e) { + /* + * Ignore. No matter what problem occurs here, + * if the project is closed, inaccessible, is not + * a faceted project, etc, it is not an error. The + * project simply cannot be handled by this factory. + */ + } return false; Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/ui/StrippedServerWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/ui/StrippedServerWizardFragment.java 2011-08-18 01:52:19 UTC (rev 34032) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/ui/StrippedServerWizardFragment.java 2011-08-18 04:08:06 UTC (rev 34033) @@ -1,293 +0,0 @@ -/** - * JBoss by Red Hat - * Copyright 2006-2009, Red Hat Middleware, LLC, and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ide.eclipse.as.ui.mbeans.project.ui; - -import java.io.File; -import java.io.IOException; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; -import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.DirectoryDialog; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerWorkingCopy; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.TaskModel; -import org.eclipse.wst.server.ui.wizard.IWizardHandle; -import org.eclipse.wst.server.ui.wizard.WizardFragment; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; -import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer; -import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; -import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; -import org.jboss.ide.eclipse.as.ui.Messages; - -/** - * - * @author Rob Stryker <rob.stryker(a)redhat.com&gt; - * - */ -public class StrippedServerWizardFragment extends WizardFragment { - - private IWizardHandle handle; - - private Label deployLabel, tmpDeployLabel, nameLabel; - private Text deployText, tmpDeployText, nameText; - private Button browse, tmpBrowse; - private String name, deployLoc, tmpDeployLoc; - - public StrippedServerWizardFragment() { - } - - public Composite createComposite(Composite parent, IWizardHandle handle) { - this.handle = handle; - Composite main = new Composite(parent, SWT.NONE); - main.setLayout(new FormLayout()); - - nameLabel = new Label(main, SWT.NONE); - nameText = new Text(main, SWT.BORDER); - nameLabel.setText(Messages.serverName); - - deployLabel = new Label(main, SWT.NONE); - deployText = new Text(main, SWT.BORDER); - browse = new Button(main, SWT.PUSH); - deployLabel.setText(Messages.swf_DeployDirectory); - browse.setText(Messages.browse); - - tmpDeployLabel = new Label(main, SWT.NONE); - tmpDeployText = new Text(main, SWT.BORDER); - tmpBrowse = new Button(main, SWT.PUSH); - tmpDeployLabel.setText(Messages.swf_TempDeployDirectory); - tmpBrowse.setText(Messages.browse); - - FormData namelData = new FormData(); - namelData.top = new FormAttachment(0, 5); - namelData.left = new FormAttachment(0, 5); - nameLabel.setLayoutData(namelData); - - FormData nametData = new FormData(); - nametData.top = new FormAttachment(0, 5); - nametData.left = new FormAttachment(deployLabel, 5); - nametData.right = new FormAttachment(100, -5); - nameText.setLayoutData(nametData); - - FormData lData = new FormData(); - lData.top = new FormAttachment(nameText, 5); - lData.left = new FormAttachment(0, 5); - deployLabel.setLayoutData(lData); - - FormData tData = new FormData(); - tData.top = new FormAttachment(nameText, 5); - tData.left = new FormAttachment(deployLabel, 5); - tData.right = new FormAttachment(browse, -5); - deployText.setLayoutData(tData); - - FormData bData = new FormData(); - bData.right = new FormAttachment(100, -5); - bData.top = new FormAttachment(nameText, 5); - browse.setLayoutData(bData); - - lData = new FormData(); - lData.top = new FormAttachment(deployText, 5); - lData.left = new FormAttachment(0, 5); - tmpDeployLabel.setLayoutData(lData); - - tData = new FormData(); - tData.top = new FormAttachment(deployText, 5); - tData.left = new FormAttachment(tmpDeployLabel, 5); - tData.right = new FormAttachment(tmpBrowse, -5); - tmpDeployText.setLayoutData(tData); - - bData = new FormData(); - bData.right = new FormAttachment(100, -5); - bData.top = new FormAttachment(deployText, 5); - tmpBrowse.setLayoutData(bData); - - - ModifyListener ml = new ModifyListener() { - public void modifyText(ModifyEvent e) { - textChanged(); - } - }; - - browse.addSelectionListener(new MySelectionListener(deployText)); - tmpBrowse.addSelectionListener(new MySelectionListener(tmpDeployText)); - - tmpDeployText.addModifyListener(ml); - deployText.addModifyListener(ml); - nameText.addModifyListener(ml); - nameText.setText(getDefaultNameText()); - handle.setImageDescriptor(JBossServerUISharedImages - .getImageDescriptor(JBossServerUISharedImages.WIZBAN_JBOSS_LOGO)); - return main; - } - - private class MySelectionListener implements SelectionListener { - private Text text; - public MySelectionListener(Text text) { - this.text = text; - } - public void widgetDefaultSelected(SelectionEvent e) { - } - - public void widgetSelected(SelectionEvent e) { - DirectoryDialog d = new DirectoryDialog(new Shell()); - d.setFilterPath(text.getText()); - String x = d.open(); - if (x != null) - text.setText(x); - } - } - - protected void textChanged() { - IStatus status = checkErrors(); - if (status.isOK()) { - deployLoc = deployText.getText(); - tmpDeployLoc = tmpDeployText.getText(); - name = nameText.getText(); - handle.setMessage("", IStatus.OK); //$NON-NLS-1$ - handle.update(); - } else { - handle.setMessage(status.getMessage(), IStatus.WARNING); - } - } - - protected IStatus checkErrors() { - if (findServer(nameText.getText()) != null) { - return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, - Messages.StrippedServerWizardFragment_NameInUseStatusMessage, null); - } - File f = new File(deployText.getText()); - if (!f.exists() || !f.isDirectory()) { - return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, - Messages.StrippedServerWizardFragment_DeployFolderDoesNotExistStatusMessage, null); - } - f = new File(tmpDeployText.getText()); - if (!f.exists() || !f.isDirectory()) { - return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, - Messages.StrippedServerWizardFragment_TemporaryDeployFolderDoesNotExistStatusMessage, null); - } - - // Check if a renameTo on these folders will fail - File tmp1, dep1; - tmp1 = dep1 = null; - boolean success = false; - try { - tmp1 = File.createTempFile(JBossServerUIPlugin.PLUGIN_ID, ".txt", new File(tmpDeployText.getText())); //$NON-NLS-1$ - dep1 = new Path(deployText.getText()).append(JBossServerUIPlugin.PLUGIN_ID + ".txt").toFile(); //$NON-NLS-1$ - success = tmp1.renameTo(dep1); - } catch(IOException ioe) { - } finally { - if( tmp1 != null && tmp1.exists()) - tmp1.delete(); - if( dep1 != null && dep1.exists()) - dep1.delete(); - if( !success ) - return new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, 0, - "Unable to rename files from your temporary folder to your deploy folder. Please verify both are on the same filesystem.", null); //$NON-NLS-1$ - } - - - return new Status(IStatus.OK, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, "", null); //$NON-NLS-1$ - } - - public void enter() { - handle.setTitle(Messages.sswf_Title); - IServer s = (IServer) getTaskModel().getObject(TaskModel.TASK_SERVER); - IServerWorkingCopy swc; - if (s instanceof IServerWorkingCopy) - swc = (IServerWorkingCopy) s; - else - swc = s.createWorkingCopy(); - - deployText.setText(swc.getAttribute(DeployableServer.DEPLOY_DIRECTORY, "")); //$NON-NLS-1$ - } - - public void exit() { - textChanged(); - IServer s = (IServer) getTaskModel().getObject(TaskModel.TASK_SERVER); - IServerWorkingCopy swc; - if (s instanceof IServerWorkingCopy) - swc = (IServerWorkingCopy) s; - else - swc = s.createWorkingCopy(); - - swc.setName(name); - swc.setAttribute(DeployableServer.DEPLOY_DIRECTORY, deployLoc); - String tempFolder = JBossServerCorePlugin.getServerStateLocation(s) - .append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString(); - swc.setAttribute(DeployableServer.TEMP_DEPLOY_DIRECTORY, tempFolder); - getTaskModel().putObject(TaskModel.TASK_SERVER, swc); - } - - public void performFinish(IProgressMonitor monitor) throws CoreException { - IServerWorkingCopy serverWC = (IServerWorkingCopy) getTaskModel().getObject(TaskModel.TASK_SERVER); - - try { - serverWC.setServerConfiguration(null); - serverWC.setName(name); - serverWC.setAttribute(DeployableServer.DEPLOY_DIRECTORY, deployLoc); - serverWC.setAttribute(DeployableServer.TEMP_DEPLOY_DIRECTORY, tmpDeployLoc); - getTaskModel().putObject(TaskModel.TASK_SERVER, serverWC); - } catch (Exception ce) { - } - } - - public boolean isComplete() { - return checkErrors().isOK(); - } - - public boolean hasComposite() { - return true; - } - - private String getDefaultNameText() { - Object o = getTaskModel().getObject(TaskModel.TASK_SERVER); - return ((IServerWorkingCopy) o).getName(); - } - - private IServer findServer(String name) { - IServer[] servers = ServerCore.getServers(); - for (int i = 0; i < servers.length; i++) { - IServer server = servers[i]; - if (name.equals(server.getName())) - return server; - } - return null; - } - -}