JBoss Tools SVN: r44047 - in trunk: examples/plugins/org.jboss.tools.project.examples/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-09-26 11:11:57 -0400 (Wed, 26 Sep 2012)
New Revision: 44047
Removed:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/AbstractRefreshJob.java
trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java
Log:
JBIDE-12737 - Duplicate ECF transport classes
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/AbstractRefreshJob.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/AbstractRefreshJob.java 2012-09-26 15:04:09 UTC (rev 44046)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/AbstractRefreshJob.java 2012-09-26 15:11:57 UTC (rev 44047)
@@ -22,7 +22,7 @@
import org.jboss.tools.central.JBossCentralActivator;
import org.jboss.tools.central.model.FeedsEntry;
import org.jboss.tools.project.examples.ProjectExamplesActivator;
-import org.jboss.tools.project.examples.filetransfer.ECFExamplesTransport;
+import org.jboss.tools.runtime.core.util.ECFTransport;
import com.sun.syndication.feed.synd.SyndContent;
import com.sun.syndication.feed.synd.SyndEntry;
@@ -183,14 +183,14 @@
File tempFile = File.createTempFile("news", ".xml");
tempFile.deleteOnExit();
OutputStream destination = new FileOutputStream(tempFile);
- IStatus status = ECFExamplesTransport.getInstance().download(
+ IStatus status = ECFTransport.getInstance().download(
cacheFile.getName(), urlString, destination, monitor);
URL url = getURL();
if (monitor.isCanceled()) {
return getValidEntries(monitor);
}
if (status.isOK() && url != null) {
- cacheModified = ECFExamplesTransport.getInstance().getLastModified(url);
+ cacheModified = ECFTransport.getInstance().getLastModified(url);
ProjectExamplesActivator.copyFile(tempFile, cacheFile);
tempFile.delete();
if (monitor.isCanceled()) {
@@ -250,7 +250,7 @@
}
long urlModified;
try {
- urlModified = ECFExamplesTransport.getInstance().getLastModified(
+ urlModified = ECFTransport.getInstance().getLastModified(
url);
} catch (CoreException e) {
exception = e;
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2012-09-26 15:04:09 UTC (rev 44046)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2012-09-26 15:11:57 UTC (rev 44047)
@@ -33,7 +33,7 @@
org.eclipse.equinox.p2.operations,
org.eclipse.jst.server.core,
org.eclipse.core.filesystem;bundle-version="1.3.100",
- org.jboss.tools.runtime.core,
+ org.jboss.tools.runtime.core;visibility:=reexport,
org.jboss.tools.runtime.ui,
org.eclipse.mylyn.commons.core;bundle-version="3.6.0",
org.eclipse.mylyn.discovery.ui;bundle-version="3.6.0",
@@ -48,7 +48,6 @@
org.jboss.tools.project.examples.configurators,
org.jboss.tools.project.examples.dialog,
org.jboss.tools.project.examples.dialog.xpl,
- org.jboss.tools.project.examples.filetransfer,
org.jboss.tools.project.examples.fixes,
org.jboss.tools.project.examples.model,
org.jboss.tools.project.examples.preferences,
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-09-26 15:04:09 UTC (rev 44046)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-09-26 15:11:57 UTC (rev 44047)
@@ -63,7 +63,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.tools.project.examples.Messages;
import org.jboss.tools.project.examples.ProjectExamplesActivator;
-import org.jboss.tools.project.examples.filetransfer.ECFExamplesTransport;
+import org.jboss.tools.runtime.core.util.ECFTransport;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -771,7 +771,7 @@
long urlModified = -1;
file = getFile(url);
try {
- urlModified = ECFExamplesTransport.getInstance()
+ urlModified = ECFTransport.getInstance()
.getLastModified(url);
} catch (CoreException e) {
if (file.exists()) {
@@ -823,8 +823,8 @@
return file;
}
- private static ECFExamplesTransport getTransport() {
- return ECFExamplesTransport.getInstance();
+ private static ECFTransport getTransport() {
+ return ECFTransport.getInstance();
}
public static Document getDocument() throws ParserConfigurationException {
12 years, 3 months
JBoss Tools SVN: r44046 - trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-26 11:04:09 -0400 (Wed, 26 Sep 2012)
New Revision: 44046
Modified:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java
Log:
Changed removing of runtimes to use API instead of bot.
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java 2012-09-26 14:55:10 UTC (rev 44045)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java 2012-09-26 15:04:09 UTC (rev 44046)
@@ -10,6 +10,8 @@
import org.jboss.tools.runtime.as.ui.bot.test.dialog.preferences.SearchingForRuntimesDialog;
import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime;
import org.jboss.tools.runtime.as.ui.bot.test.matcher.RuntimeMatcher;
+import org.jboss.tools.runtime.core.model.RuntimePath;
+import org.jboss.tools.runtime.ui.RuntimeUIActivator;
import org.junit.After;
import org.junit.Test;
@@ -31,10 +33,11 @@
@Test
public void detectRuntime(){
searchingForRuntimesDialog = addPath(RuntimeProperties.getInstance().getRuntimePath(getPathID()));
-
+
List<Runtime> runtimes = searchingForRuntimesDialog.getRuntimes();
-
+
assertThat(runtimes.size(), is(getExpectedRuntimes().size()));
+
for (Runtime runtime : getExpectedRuntimes()){
assertThat(runtimes, hasItem(new RuntimeMatcher(runtime)));
}
@@ -43,7 +46,13 @@
@After
public void closePreferences(){
searchingForRuntimesDialog.ok();
- runtimeDetectionPreferences.removeAllPaths();
+// runtimeDetectionPreferences.removeAllPaths();
runtimeDetectionPreferences.ok();
+
+ // this call to API is due to wrongly functioning of Remove button. Once it is fixed
+ // it should be changed back to removing via SWTBot
+ for (RuntimePath path : RuntimeUIActivator.getDefault().getModel().getRuntimePaths()){
+ RuntimeUIActivator.getDefault().getModel().removeRuntimePath(path);
+ }
}
}
12 years, 3 months
JBoss Tools SVN: r44045 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-26 10:55:10 -0400 (Wed, 26 Sep 2012)
New Revision: 44045
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/StableTestsSuite.java
Log:
Added Seam tests
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/StableTestsSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/StableTestsSuite.java 2012-09-26 14:48:48 UTC (rev 44044)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/StableTestsSuite.java 2012-09-26 14:55:10 UTC (rev 44045)
@@ -6,6 +6,16 @@
import org.jboss.tools.portlet.ui.bot.test.core.HotJavaPortletDeploymentGatein;
import org.jboss.tools.portlet.ui.bot.test.core.LoadJavaPortletInBrowserJBPortal;
import org.jboss.tools.portlet.ui.bot.test.core.RunJavaPortletOnServer;
+import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletGatein;
+import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletJBPortal;
+import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject;
+import org.jboss.tools.portlet.ui.bot.test.jsf.HotJSFPortletDeploymentGatein;
+import org.jboss.tools.portlet.ui.bot.test.jsf.LoadJSFPortletInBrowserJBPortal;
+import org.jboss.tools.portlet.ui.bot.test.jsf.RunJSFPortletOnServer;
+import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletGatein;
+import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletJBPortal;
+import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject;
+import org.jboss.tools.portlet.ui.bot.test.seam.RunSeamPortletOnServer;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -18,6 +28,16 @@
RunJavaPortletOnServer.class,
LoadJavaPortletInBrowserJBPortal.class,
HotJavaPortletDeploymentGatein.class,
+ CreateJSFPortletProject.class,
+ CreateJSFPortletJBPortal.class,
+ CreateJSFPortletGatein.class,
+ RunJSFPortletOnServer.class,
+ LoadJSFPortletInBrowserJBPortal.class,
+ HotJSFPortletDeploymentGatein.class,
+ CreateSeamPortletProject.class,
+ CreateSeamPortletJBPortal.class,
+ CreateSeamPortletGatein.class,
+ RunSeamPortletOnServer.class
})
public class StableTestsSuite {
12 years, 3 months
JBoss Tools SVN: r44044 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-26 10:48:48 -0400 (Wed, 26 Sep 2012)
New Revision: 44044
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/DriverUtility.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/JBossASHandler.java
Log:
JBIDE-12733 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/DriverUtility.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/DriverUtility.java 2012-09-26 14:08:06 UTC (rev 44043)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/DriverUtility.java 2012-09-26 14:48:48 UTC (rev 44044)
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.datatools.connectivity.ConnectionProfileConstants;
import org.eclipse.datatools.connectivity.ConnectionProfileException;
@@ -34,6 +35,7 @@
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.osgi.framework.Bundle;
public class DriverUtility implements IJBossRuntimePluginConstants {
public static final HashMap<String,String> SERVER_DRIVER_LOCATION = new HashMap<String, String>();
@@ -55,7 +57,14 @@
* @throws ConnectionProfileException
* @return driver instance
*/
- public void createDriver(String jbossASLocation, IServerType serverType) throws ConnectionProfileException {
+ public void createDriver(String jbossASLocation, IServerType serverType) throws DriverUtilityException {
+ try {
+ createDriver2(jbossASLocation, serverType);
+ } catch( ConnectionProfileException cfe ) {
+ throw new DriverUtilityException(cfe);
+ }
+ }
+ private void createDriver2(String jbossASLocation, IServerType serverType) throws ConnectionProfileException {
if(ProfileManager.getInstance().getProfileByName(DEFAULT_DS) != null) {
// Don't create the driver a few times
return;
@@ -205,4 +214,10 @@
return false;
}
+ public class DriverUtilityException extends Exception {
+ public DriverUtilityException(Exception e) {
+ super(e);
+ }
+ }
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/JBossASHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/JBossASHandler.java 2012-09-26 14:08:06 UTC (rev 44043)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/JBossASHandler.java 2012-09-26 14:48:48 UTC (rev 44044)
@@ -23,7 +23,6 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.datatools.connectivity.ConnectionProfileException;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IRuntimeType;
import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
@@ -34,6 +33,7 @@
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
+import org.jboss.ide.eclipse.as.core.runtime.DriverUtility.DriverUtilityException;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
import org.jboss.ide.eclipse.as.core.server.bean.ServerBean;
@@ -176,15 +176,24 @@
if (runtime != null) {
createServer(progressMonitor, runtime, serverType, name);
}
-
- new DriverUtility().createDriver(asLocation.getAbsolutePath(), serverType);
+
+ if( isDtpPresent())
+ new DriverUtility().createDriver(asLocation.getAbsolutePath(), serverType);
} catch (CoreException e) {
JBossServerCorePlugin.log(IStatus.ERROR, Messages.JBossRuntimeStartup_Cannot_create_new_JBoss_Server,e);
- } catch (ConnectionProfileException e) {
+ } catch (DriverUtilityException e) {
JBossServerCorePlugin.log(IStatus.ERROR, Messages.JBossRuntimeStartup_Cannott_create_new_DTP_Connection_Profile,e);
}
}
+ private static boolean isDtpPresent() {
+ String bundle1 = "org.eclipse.datatools.connectivity"; //$NON-NLS-1$
+ String bundle2 = "org.eclipse.datatools.connectivity.db.generic"; //$NON-NLS-1$
+ Bundle b1 = Platform.getBundle(bundle1);
+ Bundle b2 = Platform.getBundle(bundle2);
+ return b1 != null && b2 != null;
+ }
+
/**
* Creates new JBoss AS Runtime
* @param jbossASLocation location of JBoss AS
12 years, 3 months
JBoss Tools SVN: r44043 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-09-26 10:08:06 -0400 (Wed, 26 Sep 2012)
New Revision: 44043
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
JBIDE-12719
NPE when move mouse over EL from file from jar.
NPE is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2012-09-26 13:50:42 UTC (rev 44042)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2012-09-26 14:08:06 UTC (rev 44043)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -922,7 +922,7 @@
nameSpace = new NameSpace(
CustomTagLibManager.FACELETS_HTML_TAG_LIB_URI, "", //$NON-NLS-1$
TagLibraryManager.getLibraries(
- context.getResource().getProject(),
+ project,
CustomTagLibManager.FACELETS_HTML_TAG_LIB_URI));
context.addNameSpace(region, nameSpace);
}
12 years, 3 months
JBoss Tools SVN: r44042 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-26 09:50:42 -0400 (Wed, 26 Sep 2012)
New Revision: 44042
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java
Log:
[JBIDE-12718] added username to wizard page title
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java 2012-09-26 13:49:55 UTC (rev 44041)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java 2012-09-26 13:50:42 UTC (rev 44042)
@@ -55,7 +55,7 @@
private NewSSHKeyWizardPageModel pageModel;
public NewSSHKeyWizardPage(UserDelegate user, IWizard wizard) {
- super("Add new SSH key", "Add a new SSH key to your OpenShift account",
+ super("Add new SSH key", "Add a new SSH key to your OpenShift user " + user.getUsername(),
"NewSSHKeysPage", wizard);
this.pageModel = new NewSSHKeyWizardPageModel(user);
}
12 years, 3 months
JBoss Tools SVN: r44041 - branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-26 09:49:55 -0400 (Wed, 26 Sep 2012)
New Revision: 44041
Modified:
branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java
Log:
[JBIDE-12718] added username to wizard page title
Modified: branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java
===================================================================
--- branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java 2012-09-26 13:48:42 UTC (rev 44040)
+++ branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java 2012-09-26 13:49:55 UTC (rev 44041)
@@ -55,7 +55,7 @@
private NewSSHKeyWizardPageModel pageModel;
public NewSSHKeyWizardPage(UserDelegate user, IWizard wizard) {
- super("Add new SSH key", "Add a new SSH key to your OpenShift account",
+ super("Add new SSH key", "Add a new SSH key to your OpenShift user " + user.getUsername(),
"NewSSHKeysPage", wizard);
this.pageModel = new NewSSHKeyWizardPageModel(user);
}
12 years, 3 months
JBoss Tools SVN: r44040 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-26 09:48:42 -0400 (Wed, 26 Sep 2012)
New Revision: 44040
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/StartServer.java
Log:
fix for server starting in bot.ext in Juno env
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/StartServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/StartServer.java 2012-09-26 13:46:32 UTC (rev 44039)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/StartServer.java 2012-09-26 13:48:42 UTC (rev 44040)
@@ -1,8 +1,12 @@
package org.jboss.tools.ui.bot.ext.config.requirement;
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import java.util.List;
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarToggleButton;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.view.ConsoleView;
/**
* Starts server (as dependent requirement has {@link AddServer}
@@ -31,15 +35,25 @@
SWTTestExt.configuredState.getServer().isRunning = true;
// force console view not to steal focus when something happens on server
try {
- SWTBotView consoleView = SWTTestExt.console.show();
- consoleView
- .toolbarToggleButton(
- IDELabel.ConsoleView.BUTTON_SHOW_WHEN_STDOUT_CHANGES_TOOLTIP)
- .deselect();
- consoleView
- .toolbarToggleButton(
- IDELabel.ConsoleView.BUTTON_SHOW_WHEN_STDERR_CHANGES_TOOLTIP)
- .deselect();
+ ConsoleView consoleView = new ConsoleView();
+ consoleView.show();
+ List<SWTBotToolbarButton> buttons = consoleView.getToolbarButtons();
+ for (SWTBotToolbarButton button : buttons) {
+ if (button.getToolTipText().
+ equals(IDELabel.ConsoleView.BUTTON_SHOW_WHEN_STDOUT_CHANGES_TOOLTIP)) {
+ SWTBotToolbarToggleButton toggleButton = (SWTBotToolbarToggleButton) button;
+ toggleButton.deselect();
+ break;
+ }
+ }
+ for (SWTBotToolbarButton button : buttons) {
+ if (button.getToolTipText().
+ equals(IDELabel.ConsoleView.BUTTON_SHOW_WHEN_STDERR_CHANGES_TOOLTIP)) {
+ SWTBotToolbarToggleButton toggleButton = (SWTBotToolbarToggleButton) button;
+ toggleButton.deselect();
+ break;
+ }
+ }
} catch (Exception ex) {
}
}
12 years, 3 months
JBoss Tools SVN: r44039 - in branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh: databinding and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-26 09:46:32 -0400 (Wed, 26 Sep 2012)
New Revision: 44039
Modified:
branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPage.java
branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyValidator.java
Log:
[JBIDE-12715] forcing revalidation when getting back from ssh2 preferences
Modified: branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPage.java
===================================================================
--- branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPage.java 2012-09-26 13:46:21 UTC (rev 44038)
+++ branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPage.java 2012-09-26 13:46:32 UTC (rev 44039)
@@ -12,7 +12,6 @@
import org.eclipse.core.databinding.Binding;
import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.ValidationStatusProvider;
import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.runtime.IStatus;
@@ -110,7 +109,7 @@
GridDataFactory.fillDefaults()
.align(SWT.FILL, SWT.CENTER).applyTo(browseButton);
- ValidationStatusProvider sshPublicKeyValidator = new SSHPublicKeyValidator(publicKeyObservable, pageModel);
+ SSHPublicKeyValidator sshPublicKeyValidator = new SSHPublicKeyValidator(publicKeyObservable, pageModel);
dbc.addValidationStatusProvider(sshPublicKeyValidator);
ControlDecorationSupport.create(
sshPublicKeyValidator, SWT.LEFT | SWT.TOP, null, new RequiredControlDecorationUpdater());
@@ -120,7 +119,7 @@
.setText("Please make sure that your private key for this public key is listed in the\n<a>SSH2 Preferences</a>");
GridDataFactory.fillDefaults()
.align(SWT.FILL, SWT.CENTER).applyTo(sshPrefsLink);
- sshPrefsLink.addSelectionListener(onSshPrefs(dbc));
+ sshPrefsLink.addSelectionListener(onSshPrefs(sshPublicKeyValidator));
}
@@ -141,14 +140,17 @@
};
}
- private SelectionAdapter onSshPrefs(final DataBindingContext dbc) {
+ private SelectionAdapter onSshPrefs(final SSHPublicKeyValidator sshPublicKeyValidator) {
return new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
SSHUtils.openPreferencesPage(getShell());
// trigger revalidation after prefs were changed
- dbc.updateTargets();
+ // we should be able to listen to prefs changes in jsch, but
+ // obviously they dont fire change event when changing private
+ // keys
+ sshPublicKeyValidator.forceRevalidate();
}
};
}
Modified: branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyValidator.java
===================================================================
--- branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyValidator.java 2012-09-26 13:46:21 UTC (rev 44038)
+++ branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyValidator.java 2012-09-26 13:46:32 UTC (rev 44039)
@@ -81,5 +81,13 @@
return false;
}
}
+
+ /**
+ * Workaround since JSchUIPlugin seems not to fire property change events if
+ * you change the private keys. Need to force revalidation manually.
+ */
+ public void forceRevalidate() {
+ revalidate();
+ }
}
12 years, 3 months
JBoss Tools SVN: r44038 - branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-09-26 09:46:21 -0400 (Wed, 26 Sep 2012)
New Revision: 44038
Modified:
branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java
Log:
JBIDE-12723 Bump seam version to 2.3.0.Final
Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java
===================================================================
--- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2012-09-26 13:46:18 UTC (rev 44037)
+++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2012-09-26 13:46:21 UTC (rev 44038)
@@ -161,7 +161,7 @@
} else if ("2.2".equals(seamFacetVersion.getVersionString())) { //$NON-NLS-1$
seamVersion.setText("2.2.2.Final"); //$NON-NLS-1$
} else if ("2.3".equals(seamFacetVersion.getVersionString())) { //$NON-NLS-1$
- seamVersion.setText("2.3.0.CR1"); //$NON-NLS-1$
+ seamVersion.setText("2.3.0.Final"); //$NON-NLS-1$
}
Button removeWTPContainers = new Button(composite,SWT.CHECK);
removeWTPContainers.setText(Messages.MavenFacetInstallPage_Remove_WTP_Classpath_containers);
12 years, 3 months