JBoss Tools SVN: r8242 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server: internal and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-05-20 16:31:30 -0400 (Tue, 20 May 2008)
New Revision: 8242
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerPollingAttributes.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
Log:
JBIDE-2239 - working with changed timeout structure
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerPollingAttributes.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerPollingAttributes.java 2008-05-20 19:46:17 UTC (rev 8241)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerPollingAttributes.java 2008-05-20 20:31:30 UTC (rev 8242)
@@ -26,15 +26,8 @@
* @author Rob Stryker
*/
public interface IServerPollingAttributes {
- public static final String START_TIMEOUT = "org.jboss.ide.eclipse.as.core.server.attributes.startTimeout";
- public static final String STOP_TIMEOUT = "org.jboss.ide.eclipse.as.core.server.attributes.stopTimeout";
-
- public static final String TIMEOUT_BEHAVIOR = "org.jboss.ide.eclipse.as.core.server.attributes.timeoutBehavior";
public static final String STARTUP_POLLER_KEY = "org.jboss.ide.eclipse.as.core.server.attributes.startupPollerKey";
public static final String SHUTDOWN_POLLER_KEY = "org.jboss.ide.eclipse.as.core.server.attributes.shutdownPollerKey";
public static final String DEFAULT_STARTUP_POLLER = "org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller";
public static final String DEFAULT_SHUTDOWN_POLLER = "org.jboss.ide.eclipse.as.core.runtime.server.processTerminatedPoller";
- public static final boolean TIMEOUT_ABORT = true;
- public static final boolean TIMEOUT_IGNORE = false;
-
}
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 2008-05-20 19:46:17 UTC (rev 8241)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2008-05-20 20:31:30 UTC (rev 8242)
@@ -116,7 +116,7 @@
if( poller == null ) {
alertEventLogStarting();
alertPollerNotFound();
- alertBehavior(getTimeoutBehavior(), false);
+ alertBehavior(!expectedState, false);
return;
}
@@ -178,6 +178,7 @@
try {
currentState = poller.getState();
poller.cleanup();
+ alertBehavior(currentState, finalAlert);
} catch( PollingException pe) {
// abort and put the message in event log
poller.cancel(IServerStatePoller.CANCEL);
@@ -191,12 +192,19 @@
} else {
// we timed out. get response from preferences
poller.cancel(IServerStatePoller.TIMEOUT_REACHED);
- currentState = getTimeoutBehavior();
+ int behavior = poller.getTimeoutBehavior();
poller.cleanup();
alertEventLogTimeout();
- finalAlert = false;
+ if( behavior != IServerStatePoller.TIMEOUT_BEHAVIOR_IGNORE) {
+ // xnor;
+ // if behavior is to succeed and we're expected to go up, we're up
+ // if behavior is to fail and we're expecting to be down, we're up (failed to shutdown)
+ // all other cases, we're down.
+ currentState = (expectedState == (behavior == IServerStatePoller.TIMEOUT_BEHAVIOR_SUCCEED));
+ finalAlert = false;
+ alertBehavior(currentState, finalAlert);
+ }
}
- alertBehavior(currentState, finalAlert);
}
}
@@ -222,18 +230,6 @@
}
}
- protected boolean getTimeoutBehavior() {
- // timeout has been reached, so let the user's preferences override
- JBossServer jbs = ((JBossServer)getServer().loadAdapter(JBossServer.class, null));
- ServerAttributeHelper helper = (ServerAttributeHelper)jbs.getAttributeHelper();
-
- boolean behavior = helper.getAttribute(IServerPollingAttributes.TIMEOUT_BEHAVIOR, IServerPollingAttributes.TIMEOUT_IGNORE);
- if( behavior == IServerPollingAttributes.TIMEOUT_ABORT )
- return !expectedState;
-
- return expectedState;
- }
-
protected IServer getServer() {
return behavior.getServer();
}
17 years, 11 months
JBoss Tools SVN: r8241 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-05-20 15:46:17 -0400 (Tue, 20 May 2008)
New Revision: 8241
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
Log:
JBIDE-2239 - working with changed timeout structure
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java 2008-05-20 18:32:01 UTC (rev 8240)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java 2008-05-20 19:46:17 UTC (rev 8241)
@@ -272,4 +272,8 @@
public IServer getServer() {
return server;
}
+
+ public int getTimeoutBehavior() {
+ return TIMEOUT_BEHAVIOR_IGNORE;
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2008-05-20 18:32:01 UTC (rev 8240)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2008-05-20 19:46:17 UTC (rev 8241)
@@ -84,5 +84,9 @@
this.type = type;
}
+ public int getTimeoutBehavior() {
+ return TIMEOUT_BEHAVIOR_IGNORE;
+ }
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java 2008-05-20 18:32:01 UTC (rev 8240)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java 2008-05-20 19:46:17 UTC (rev 8241)
@@ -52,7 +52,7 @@
public void beginPolling(IServer server, boolean expectedState, PollThread pt) {
this.expectedState = expectedState;
this.server = server;
- this.endTime = new Date().getTime() + getTimeout() - 2000;
+ this.endTime = new Date().getTime() + getTimeout();
}
public IServer getServer() {
@@ -76,17 +76,10 @@
}
public int getTimeout() {
- int timeout;
- JBossServer jbs = ((JBossServer)server.loadAdapter(JBossServer.class, null));
- ServerAttributeHelper helper = (ServerAttributeHelper)jbs.getAttributeHelper();
- if( expectedState == IServerStatePoller.SERVER_UP) {
- int def = ((ServerType)server.getServerType()).getStartTimeout();
- timeout = helper.getAttribute(IServerPollingAttributes.START_TIMEOUT, def);
- } else {
- int def = ((ServerType)server.getServerType()).getStopTimeout();
- timeout = helper.getAttribute(IServerPollingAttributes.STOP_TIMEOUT, def);
- }
- return timeout;
+ if( expectedState == IServerStatePoller.SERVER_UP)
+ return (getServer().getStartTimeout()-3) * 1000;
+ else
+ return (getServer().getStopTimeout()-3) * 1000;
}
public boolean supportsShutdown() {
@@ -112,5 +105,12 @@
this.type = type;
}
+ public int getTimeoutBehavior() {
+ if( expectedState == IServerStatePoller.SERVER_UP)
+ return TIMEOUT_BEHAVIOR_SUCCEED;
+ else
+ return TIMEOUT_BEHAVIOR_IGNORE;
+ }
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2008-05-20 18:32:01 UTC (rev 8240)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2008-05-20 19:46:17 UTC (rev 8241)
@@ -43,13 +43,27 @@
public static final int SUCCESS = 2;
public static final int FAILED = 3;
+ /**
+ * Force a successful state change if we timeout
+ */
+ public static final int TIMEOUT_BEHAVIOR_SUCCEED = 0;
+
+ /**
+ * Ignore the timeout and let the wst tools handle the timeout
+ */
+ public static final int TIMEOUT_BEHAVIOR_IGNORE = 1;
+
+ /**
+ * Force a failure upon timeout
+ */
+ public static final int TIMEOUT_BEHAVIOR_FAIL = 2;
+
public ServerStatePollerType getPollerType();
public void setPollerType(ServerStatePollerType type);
public void beginPolling(IServer server, boolean expectedState, PollThread pt); // expected to launch own thread
public IServer getServer();
public boolean isComplete() throws PollingException, RequiresInfoException;
public boolean getState() throws PollingException, RequiresInfoException;
-
public void cleanup(); // clean up any resources / processes. Will ALWAYS be called
public List<String> getRequiredProperties();
public void failureHandled(Properties properties);
@@ -59,6 +73,12 @@
* @param type CANCEL or TIMEOUT_REACHED
*/
public void cancel(int type);
+
+ /**
+ * Returns a TIMEOUT_BEHAVIOR_XXX constant
+ * @return
+ */
+ public int getTimeoutBehavior();
public class PollingException extends Exception {
private static final long serialVersionUID = -7830978018908940551L;
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 2008-05-20 18:32:01 UTC (rev 8240)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2008-05-20 19:46:17 UTC (rev 8241)
@@ -103,20 +103,11 @@
abortMessage = message;
}
-
- // Getting the timeouts. First from plugin.xml as default, or from user settings.
public int getTimeout() {
- int timeout;
- JBossServer jbs = ((JBossServer)getServer().loadAdapter(JBossServer.class, null));
- ServerAttributeHelper helper = (ServerAttributeHelper)jbs.getAttributeHelper();
- if( expectedState == IServerStatePoller.SERVER_UP) {
- int def = ((ServerType)getServer().getServerType()).getStartTimeout();
- timeout = helper.getAttribute(IServerPollingAttributes.START_TIMEOUT, def);
- } else {
- int def = ((ServerType)getServer().getServerType()).getStopTimeout();
- timeout = helper.getAttribute(IServerPollingAttributes.STOP_TIMEOUT, def);
- }
- return timeout;
+ if( expectedState == IServerStatePoller.SERVER_UP)
+ return (getServer().getStartTimeout()-2) * 1000;
+ else
+ return (getServer().getStopTimeout()-2) * 1000;
}
17 years, 11 months
JBoss Tools SVN: r8240 - branches/jbosstools-2.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-05-20 14:32:01 -0400 (Tue, 20 May 2008)
New Revision: 8240
Modified:
branches/jbosstools-2.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2226 NPE if user openon non-existent "image" attribute link of h:commandButton.
Issue is fixed
Modified: branches/jbosstools-2.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java
===================================================================
--- branches/jbosstools-2.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java 2008-05-20 18:28:59 UTC (rev 8239)
+++ branches/jbosstools-2.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java 2008-05-20 18:32:01 UTC (rev 8240)
@@ -34,7 +34,7 @@
protected void doHyperlink(IRegion region) {
String fileName = getFilePath(region);
IFile fileToOpen = getFileToOpen(fileName);
- if (fileToOpen.exists()) {
+ if (fileToOpen != null && fileToOpen.exists()) {
IWorkbenchPage workbenchPage = JSFExtensionsPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
try {
IDE.openEditor(workbenchPage,fileToOpen,true);
17 years, 11 months
JBoss Tools SVN: r8239 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-05-20 14:28:59 -0400 (Tue, 20 May 2008)
New Revision: 8239
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2226 NPE if user openon non-existent "image" attribute link of h:commandButton.
Issue is fixed
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java 2008-05-20 18:08:42 UTC (rev 8238)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java 2008-05-20 18:28:59 UTC (rev 8239)
@@ -34,7 +34,7 @@
protected void doHyperlink(IRegion region) {
String fileName = getFilePath(region);
IFile fileToOpen = getFileToOpen(fileName);
- if (fileToOpen.exists()) {
+ if (fileToOpen != null && fileToOpen.exists()) {
IWorkbenchPage workbenchPage = JSFExtensionsPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
try {
IDE.openEditor(workbenchPage,fileToOpen,true);
@@ -52,9 +52,8 @@
return getDocument().get(region.getOffset(), region.getLength());
} catch (BadLocationException x) {
JSFExtensionsPlugin.log("", x);
- return null;
- } finally {
}
+ return null;
}
private IFile getFileToOpen(String fileName) {
17 years, 11 months
JBoss Tools SVN: r8238 - in trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-05-20 14:08:42 -0400 (Tue, 20 May 2008)
New Revision: 8238
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2004 Create JUnit tests for New Seam Action/Form/Conversation/Entity wizards. It should invoke seam-gen and check results of its work.
Test Cases are created for the Seam 2.0
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2008-05-20 18:08:08 UTC (rev 8237)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2008-05-20 18:08:42 UTC (rev 8238)
@@ -25,6 +25,8 @@
import org.jboss.tools.seam.ui.test.wizard.OpenSeamComponentDialogTest;
import org.jboss.tools.seam.ui.test.wizard.Seam12EARNewOperationTest;
import org.jboss.tools.seam.ui.test.wizard.Seam12WARNewOperationTest;
+import org.jboss.tools.seam.ui.test.wizard.Seam20EARNewOperationTest;
+import org.jboss.tools.seam.ui.test.wizard.Seam20WARNewOperationTest;
import org.jboss.tools.seam.ui.test.wizard.SeamFormNewWizardTest;
import org.jboss.tools.seam.ui.test.wizard.SeamProjectNewWizardTest;
import org.jboss.tools.test.util.ProjectImportTestSetup;
@@ -38,7 +40,6 @@
public static Test suite() {
TestSuite suite = new TestSuite("Seam UI tests");
-
suite.addTestSuite(OpenSeamComponentDialogTest.class);
suite.addTest(SeamComponentsViewAllTests.suite());
suite.addTestSuite(SeamProjectNewWizardTest.class);
@@ -53,11 +54,19 @@
suite.addTest(new ProjectImportTestSetup(new TestSuite(Seam12EARNewOperationTest.class),
"org.jboss.tools.seam.ui.test",
new String[]{"projects/seam_ear", "projects/seam_ear-ejb", "projects/seam_ear-test"},
- new String[]{"seam_ear-war", "seam_ear-ejb", "seam_ear-test"}));
+ new String[]{"seam_ear", "seam_ear-ejb", "seam_ear-test"}));
suite.addTest(new ProjectImportTestSetup(new TestSuite(Seam12WARNewOperationTest.class),
"org.jboss.tools.seam.ui.test",
new String[]{"projects/seam_war", "projects/seam_war-test"},
- new String[]{"seam_war-war", "seam_war-test"}));
+ new String[]{"seam_war", "seam_war-test"}));
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(Seam20EARNewOperationTest.class),
+ "org.jboss.tools.seam.ui.test",
+ new String[]{"projects/seam_ear", "projects/seam_ear-ejb", "projects/seam_ear-test"},
+ new String[]{"seam_ear", "seam_ear-ejb", "seam_ear-test"}));
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(Seam20WARNewOperationTest.class),
+ "org.jboss.tools.seam.ui.test",
+ new String[]{"projects/seam_war", "projects/seam_war-test"},
+ new String[]{"seam_war", "seam_war-test"}));
return suite;
}
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java 2008-05-20 18:08:08 UTC (rev 8237)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java 2008-05-20 18:08:42 UTC (rev 8238)
@@ -63,7 +63,8 @@
protected static final String SEAM_1_2_HOME = "jbosstools.test.seam.1.2.1.eap.home";
protected static final String SEAM_2_0_HOME = "jbosstools.test.seam.2.0.0.home";
- protected static final String SEAM_HOME_DEFAULT = "F:/jbdevstudio-ga/jboss-eap/seam";
+ protected static final String SEAM_1_2_HOME_DEFAULT = "F:/jbdevstudio-ga/jboss-eap/seam";
+ protected static final String SEAM_2_0_HOME_DEFAULT = "E:/Java/JBoss/Seam/jboss-seam-2.0.1.GA";
private static final String SEAM_ACTION_COMPONENT_NAME = "TestAction";
private static final String SEAM_FORM_COMPONENT_NAME = "TestForm";
@@ -143,9 +144,9 @@
protected File getSeamHomeFolder(String seamRTName) {
if (SEAM_1_2.equals(seamRTName)) {
- return new File(System.getProperty(SEAM_1_2_HOME, SEAM_HOME_DEFAULT));
+ return new File(System.getProperty(SEAM_1_2_HOME, SEAM_1_2_HOME_DEFAULT));
} else if (SEAM_2_0.equals(seamRTName)) {
- return new File(System.getProperty(SEAM_2_0_HOME, SEAM_HOME_DEFAULT));
+ return new File(System.getProperty(SEAM_2_0_HOME, SEAM_2_0_HOME_DEFAULT));
}
return null;
}
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java 2008-05-20 18:08:08 UTC (rev 8237)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java 2008-05-20 18:08:42 UTC (rev 8238)
@@ -13,6 +13,6 @@
public class Seam20EARNewOperationTest extends Seam12EARNewOperationTest {
@Override
void setUpSeamProjects() {
- setUpSeamProject(earProject, AbstractSeamNewOperationTest.SEAM_1_2);
+ setUpSeamProject(earProject, AbstractSeamNewOperationTest.SEAM_2_0);
}
}
17 years, 11 months
JBoss Tools SVN: r8237 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
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);
}
}
17 years, 11 months
JBoss Tools SVN: r8236 - tags/jbosstools-2.1.0.GA.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-05-20 13:08:35 -0400 (Tue, 20 May 2008)
New Revision: 8236
Added:
tags/jbosstools-2.1.0.GA/vpe/
Log:
tagging jbosstools-2.1.0.GA
Copied: tags/jbosstools-2.1.0.GA/vpe (from rev 8235, branches/jbosstools-2.1.x/vpe)
17 years, 11 months
JBoss Tools SVN: r8235 - tags/jbosstools-2.1.0.GA.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-05-20 13:08:31 -0400 (Tue, 20 May 2008)
New Revision: 8235
Added:
tags/jbosstools-2.1.0.GA/tests/
Log:
tagging jbosstools-2.1.0.GA
Copied: tags/jbosstools-2.1.0.GA/tests (from rev 8234, branches/jbosstools-2.1.x/tests)
17 years, 11 months
JBoss Tools SVN: r8234 - tags/jbosstools-2.1.0.GA.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-05-20 13:08:27 -0400 (Tue, 20 May 2008)
New Revision: 8234
Added:
tags/jbosstools-2.1.0.GA/struts/
Log:
tagging jbosstools-2.1.0.GA
Copied: tags/jbosstools-2.1.0.GA/struts (from rev 8233, branches/jbosstools-2.1.x/struts)
17 years, 11 months
JBoss Tools SVN: r8233 - tags/jbosstools-2.1.0.GA.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-05-20 13:08:23 -0400 (Tue, 20 May 2008)
New Revision: 8233
Added:
tags/jbosstools-2.1.0.GA/seam/
Log:
tagging jbosstools-2.1.0.GA
Copied: tags/jbosstools-2.1.0.GA/seam (from rev 8232, branches/jbosstools-2.1.x/seam)
17 years, 11 months