Author: rob.stryker(a)jboss.com Date: 2008-05-20 14:08:08 -0400 (Tue, 20 May 2008) New Revision: 8237 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java Log: JBIDE-2235 - also trying to fix undo-ability for most options. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-05-20 17:08:35 UTC (rev 8236) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-05-20 18:08:08 UTC (rev 8237) @@ -185,22 +185,16 @@ } private String getDeployDir() { - if( server instanceof ServerWorkingCopy ) { - return ((ServerWorkingCopy)server).getAttribute(IDeployableServer.DEPLOY_DIRECTORY, ""); - } - return ""; + return helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, ""); } private String getTempDeployDir() { - if( server instanceof ServerWorkingCopy ) { - return ((ServerWorkingCopy)server).getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, - ServerPlugin.getInstance().getStateLocation().toFile().getAbsolutePath()); - } - return ""; + String defaultt = ServerPlugin.getInstance().getStateLocation().toFile().getAbsolutePath(); + return helper.getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, defaultt); } public IStatus[] getSaveStatus() { String error = ""; - List status = new ArrayList(); + List<Status> status = new ArrayList<Status>(); if(!new Path(deployText.getText()).toFile().exists()) { String msg = "The deploy directory \"" + deployText.getText() + "\" does not exist."; status.add(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, msg)); @@ -214,7 +208,7 @@ } setErrorMessage(error.equals("") ? null : error); - return status.size() == 0 ? null : (IStatus[]) status.toArray(new IStatus[status.size()]); + return status.size() == 0 ? null : status.toArray(new IStatus[status.size()]); } @@ -235,8 +229,10 @@ helper.setAttribute(DeployableServer.DEPLOY_DIRECTORY, newDir); } public void undo() { + text.removeModifyListener(listener); helper.setAttribute(DeployableServer.DEPLOY_DIRECTORY, oldDir); text.setText(oldDir); + text.addModifyListener(listener); } }