JBoss Tools SVN: r35985 - workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-10-25 12:02:06 -0400 (Tue, 25 Oct 2011)
New Revision: 35985
Modified:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- a page which shows current user-agent header is set as the home page
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java 2011-10-25 16:02:05 UTC (rev 35984)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java 2011-10-25 16:02:06 UTC (rev 35985)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.browsersim;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@@ -154,7 +156,7 @@
setDevice(DevicesManager.getInstance().getDevices().get(0));
}
shell.open();
- browser.setUrl("file:///C:/doc/prj/JavaScript/user-agent.html");
+ browser.setUrl("http://www.w3schools.com/js/tryit_view.asp?filename=try_nav_useragent");
while (!shell.isDisposed()) {
if (!display.readAndDispatch())
@@ -205,11 +207,11 @@
}
});
- final Image imageBack = new Image(display, getResourceAsStream("/resources/icons/nav_backward.gif"));
- final Image imageForward = new Image(display, getResourceAsStream("/resources/icons/nav_forward.gif"));
- final Image imageStop = new Image(display, getResourceAsStream("/resources/icons/nav_stop.gif"));
- final Image imageRefresh = new Image(display, getResourceAsStream("/resources/icons/nav_refresh.gif"));
- final Image imageGo = new Image(display, getResourceAsStream("/resources/icons/nav_go.gif"));
+ final Image imageBack = new Image(display, getResourceAsStream("resources/icons/nav_backward.gif"));
+ final Image imageForward = new Image(display, getResourceAsStream("resources/icons/nav_forward.gif"));
+ final Image imageStop = new Image(display, getResourceAsStream("resources/icons/nav_stop.gif"));
+ final Image imageRefresh = new Image(display, getResourceAsStream("resources/icons/nav_refresh.gif"));
+ final Image imageGo = new Image(display, getResourceAsStream("resources/icons/nav_go.gif"));
itemBack.setImage(imageBack);
itemForward.setImage(imageForward);
@@ -233,6 +235,14 @@
}
private InputStream getResourceAsStream(String name) {
+ if (true) {
+ try {
+ return new FileInputStream(name);
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
return this.getClass().getResourceAsStream(name);
}
13 years, 2 months
JBoss Tools SVN: r35984 - branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-25 12:02:05 -0400 (Tue, 25 Oct 2011)
New Revision: 35984
Modified:
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
Log:
[JBIDE-10031] only checking 'create server adapter' if a compatible server adapter was found
Modified: branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-25 15:59:20 UTC (rev 35983)
+++ branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-25 16:02:05 UTC (rev 35984)
@@ -516,7 +516,7 @@
boolean canCreateServer = serverTypeToCreate != null;
serverAdapterCheckbox.setEnabled(canCreateServer);
// serverAdapterCheckbox.setSelection(canCreateServer);
- serverAdapterCheckboxObservable.setValue(true);
+ serverAdapterCheckboxObservable.setValue(canCreateServer);
enableServerWidgets(canCreateServer);
refreshValidRuntimes();
model.getParentModel().setProperty(AdapterWizardPageModel.SERVER_TYPE, serverTypeToCreate);
13 years, 2 months
JBoss Tools SVN: r35983 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-25 11:59:20 -0400 (Tue, 25 Oct 2011)
New Revision: 35983
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
Log:
[JBIDE-10031] only checking 'create server adapter' if a compatible server adapter was found
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-25 15:58:59 UTC (rev 35982)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-25 15:59:20 UTC (rev 35983)
@@ -518,8 +518,7 @@
serverTypeToCreate = getServerTypeToCreate();
boolean canCreateServer = serverTypeToCreate != null;
serverAdapterCheckbox.setEnabled(canCreateServer);
- // serverAdapterCheckbox.setSelection(canCreateServer);
- serverAdapterCheckboxObservable.setValue(true);
+ serverAdapterCheckboxObservable.setValue(canCreateServer);
enableServerWidgets(canCreateServer);
refreshValidRuntimes();
model.getParentModel().setProperty(AdapterWizardPageModel.SERVER_TYPE, serverTypeToCreate);
13 years, 2 months
JBoss Tools SVN: r35982 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-25 11:58:59 -0400 (Tue, 25 Oct 2011)
New Revision: 35982
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
Log:
[JBIDE-10031] only checking 'create server adapter' if a compatible server adapter was found
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-25 15:37:05 UTC (rev 35981)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-25 15:58:59 UTC (rev 35982)
@@ -519,7 +519,7 @@
boolean canCreateServer = serverTypeToCreate != null;
serverAdapterCheckbox.setEnabled(canCreateServer);
// serverAdapterCheckbox.setSelection(canCreateServer);
- serverAdapterCheckboxObservable.setValue(true);
+ serverAdapterCheckboxObservable.setValue(canCreateServer);
enableServerWidgets(canCreateServer);
refreshValidRuntimes();
model.getParentModel().setProperty(AdapterWizardPageModel.SERVER_TYPE, serverTypeToCreate);
13 years, 2 months
JBoss Tools SVN: r35981 - in trunk/documentation/whatsnew: as and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-10-25 11:37:05 -0400 (Tue, 25 Oct 2011)
New Revision: 35981
Added:
trunk/documentation/whatsnew/core/core-news-3.3.0.M4.html
trunk/documentation/whatsnew/core/images/install-JDT-ext.png
trunk/documentation/whatsnew/core/images/materialize-lib-complete.png
trunk/documentation/whatsnew/core/images/materialize-lib-context-menu.png
trunk/documentation/whatsnew/core/images/materialize-lib-dialog.png
Modified:
trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html
trunk/documentation/whatsnew/forge/forge-news-3.3.0.M4.html
trunk/documentation/whatsnew/index.html
Log:
JBIDE-9972 : added N&N for commons/jst/core component (focusing on the Materialize Classpath Libary feature).
Also fixed some N&N nav issues
corrected the AS7 N&N about web fragments support
Modified: trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html 2011-10-25 12:02:37 UTC (rev 35980)
+++ trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html 2011-10-25 15:37:05 UTC (rev 35981)
@@ -21,8 +21,7 @@
<h1>JBoss AS Tools 3.3.0.M4 What's New</h1>
- <p align="right"><a href="../index.html">< Main Index</a> <a href="../gwt/gwt-news-1.0.2.M4.html">GWT Tools ></a></p>
-
+ <p align="right"><a href="../index.html">< Main Index</a> <a href="../openshift/openshift-news-2.3.0.M4.html">OpenShift Tools></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
@@ -47,8 +46,8 @@
<p><b>Support for Web Fragments</b></p>
</td>
<td valign="top" width="90%">
- <p>We added support for web fragments in M4. Web fragment project are now deployed as
- exploded jars to JBoss AS6 and AS7.</p>
+ <p>We added support for web fragments in M4. Web fragment projects are now deployed as
+ jar files to JBoss AS6 and AS7.</p>
<p><small><a href="https://issues.jboss.org/browse/JBIDE-9836">Related Jira</a></small></p>
</td>
</tr>
Added: trunk/documentation/whatsnew/core/core-news-3.3.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/core/core-news-3.3.0.M4.html (rev 0)
+++ trunk/documentation/whatsnew/core/core-news-3.3.0.M4.html 2011-10-25 15:37:05 UTC (rev 35981)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Core/Common 3.3.0.M4 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>Core/Common 3.3.0.M4 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a>
+<a href="../jst/jst-news-3.3.0.M4.html">JST/JSF 3.3.0.M4 ></a>
+</p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>General</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam1e" id="itemname1"></a><b>Materializing Classpath Library</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>
+ An experimental new feature allows JBoss Tools users to Materialize Classpath Libraries. A Classpath Library is a virtual container added to the classpath, referencing jars in a portable way (avoiding direct absolute path references from the project).
+ Materialization means jars listed in any Classpath Library can be copied under a project folder and referenced directly under the project classpath, instead of using said Classpath Library.
+ The source Classpath Library is then removed from said classpath.
+ </p>
+
+ <p>This feature can be useful if you want to compile/run a project without Maven (or Ivy or any other dependency management tool that exists), for example.</p>
+ <p>In order to use this new feature, you need to install the JBoss Tools JDT Extensions feature : </p>
+ <img src="images/install-JDT-ext.png" />
+
+ <p>
+ To use it, right-click on a Classpath Library from one of your Java projects (In the Project Explorer view for example, go under Java Resources > Libraries)
+ and select the "Materialize Library..." menu :
+ </p>
+ <img src="images/materialize-lib-context-menu.png" />
+
+
+ <p>This will open a new dialog window in which you can choose the destination folder into which will be copied the selected jars :</p>
+ <img src="images/materialize-lib-dialog.png" />
+ <p><ul><li>Clicking on the source column should show you the complete path of the original location (the cell is not editable).</li>
+ <li>Clicking on the "Copy as" column should allow you to rename the copied file in it's destination folder.</li>
+ </ul>
+ <i><b>Unfortunately the columns are not clickable under Windows. The <a href="https://issues.jboss.org/browse/JBIDE-10015">bug</a> was discovered too late and could not be fixed in time for the JBoss Tools 3.3.0 M4 release. This should be fixed shortly after that release, and made available via the <a href="http://download.jboss.org/jbosstools/builds/nightly/trunk/latest/all/repo/">nightly build update site</a></b></i>
+ </p>
+ <p>Once materialized, jars are copied and referenced directly in the classpath, the Classpath Library is removed. </p>
+ <img src="images/materialize-lib-complete.png" />
+ <p>in the case of Maven-powered projects, the Maven nature is removed, thus disabling the Maven builder. If you want to enable the Maven nature back on, just right-click on your project and select <i>Configure > Convert to Maven Project</i>
+
+ </p>
+ <p>Feedback on this feature are very welcome. You can follow existing related issues using this <a href="https://issues.jboss.org/secure/IssueNavigator.jspa?reset=true&jqlQuery=l...">link</a>. Please use the "materialize_library" label when submitting new issues.</p>
+<p></p>
+
+ <p><small>Related Jira : <a href="https://issues.jboss.org/browse/JBIDE-8972">JBIDE-8972</a></small></p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
Added: trunk/documentation/whatsnew/core/images/install-JDT-ext.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/core/images/install-JDT-ext.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/core/images/materialize-lib-complete.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/core/images/materialize-lib-complete.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/core/images/materialize-lib-context-menu.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/core/images/materialize-lib-context-menu.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/core/images/materialize-lib-dialog.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/core/images/materialize-lib-dialog.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/forge/forge-news-3.3.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/forge/forge-news-3.3.0.M4.html 2011-10-25 12:02:37 UTC (rev 35980)
+++ trunk/documentation/whatsnew/forge/forge-news-3.3.0.M4.html 2011-10-25 15:37:05 UTC (rev 35981)
@@ -24,7 +24,7 @@
<h1>Forge Tools 3.3.0.M4 What's New</h1>
<p align="right"><a href="../index.html">< Main Index</a> <a
- href="../maven/maven-news-3.3.0.M3.html">Maven Tools ></a></p>
+ href="../as/as-news-3.3.0.M4.html">JBoss AS Server Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2011-10-25 12:02:37 UTC (rev 35980)
+++ trunk/documentation/whatsnew/index.html 2011-10-25 15:37:05 UTC (rev 35981)
@@ -36,12 +36,13 @@
<td valign="top" align="left">
<p align="right"><b>3.3.0.M4</b>
<td valign="top">
+ <p><a href="core/core-news-3.3.0.M4.html">Core/General 3.3.0.M4</a></p>
<p><a href="jst/jst-news-3.3.0.M4.html">JST/JSF 3.3.0.M4</a></p>
<p><a href="vpe/vpe-news-3.3.0.M4.html">Visual Page Editor 3.3.0.M4</a></p>
<p><a href="cdi/cdi-news-3.3.0.M4.html">CDI/Seam 3 Tools</a></p>
<p><a href="forge/forge-news-3.3.0.M4.html">Forge Tools</a></p>
<p><a href="as/as-news-3.3.0.M4.html">JBoss AS Server Tools</a></p>
- <p><a href="openshift/openshift-news-2.3.0.M4.html">Openshift Application Wizard 2.3.0.M4</a></p>
+ <p><a href="openshift/openshift-news-2.3.0.M4.html">OpenShift Tools</a></p>
</td>
</tr>
<tr>
13 years, 2 months
JBoss Tools SVN: r35980 - trunk/documentation/whatsnew/as.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-25 08:02:37 -0400 (Tue, 25 Oct 2011)
New Revision: 35980
Modified:
trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html
Log:
astools n&n english fixed
Modified: trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html 2011-10-25 11:27:48 UTC (rev 35979)
+++ trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html 2011-10-25 12:02:37 UTC (rev 35980)
@@ -81,7 +81,7 @@
<td valign="top" width="90%">
<p>JBoss AS7 offers an impressive OSGI runtime. We therefore added the capability to deploy osgi projects to an
AS7 instance in prior versions of JBoss tools. We still had minor bugs when deploying those projects.
- We fixed those bugs and now offer a flawless behaviour.</p>
+ We fixed those bugs and now offer flawless behaviour.</p>
<p><small><a href="https://issues.jboss.org/browse/JBIDE-9709">Related Jira</a> <a href="https://issues.jboss.org/browse/JBIDE-9711">Related Jira</a></small></p>
</td>
</tr>
@@ -91,10 +91,10 @@
<p><b>Run on Server now waits</b></p>
</td>
<td valign="top" width="90%">
- <p>If you want to check your application running on the app server you'd have to start it's deployment
- and pick <b>Run As/Run on Server</b> afterwards. In many cases your browser then showed a 404 "Not Found" since the browser
- did not wait until the deployment was successfully executed. We fixed that and
- now show the browser only when the server completed its duties.</p>
+ <p>If you want to check your application running on the app server, you'd have to start it's deployment
+ and pick <b>Run As/Run on Server</b> afterwards. In many cases your browser then showed a 404 "Not Found". The reason for this was that the browser
+ did not wait until the deployment was successfully started. This has been fixed, and
+ now the browser is only shown when the server has completed its duties.</p>
<p><small><a href="https://issues.jboss.org/browse/JBIDE-10030">Related Jira</a></small></p>
</td>
</tr>
13 years, 2 months
JBoss Tools SVN: r35979 - trunk/documentation/whatsnew/as.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-25 07:27:48 -0400 (Tue, 25 Oct 2011)
New Revision: 35979
Modified:
trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html
Log:
[JBIDE-10011] created N&N for AS
Modified: trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html 2011-10-25 11:27:06 UTC (rev 35978)
+++ trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html 2011-10-25 11:27:48 UTC (rev 35979)
@@ -95,7 +95,7 @@
and pick <b>Run As/Run on Server</b> afterwards. In many cases your browser then showed a 404 "Not Found" since the browser
did not wait until the deployment was successfully executed. We fixed that and
now show the browser only when the server completed its duties.</p>
- <p><small><a href="https://issues.jboss.org/browse/JBIDE-10030">Related Jira</a> <a href="https://issues.jboss.org/browse/JBIDE-9711">Related Jira</a></small></p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-10030">Related Jira</a></small></p>
</td>
</tr>
13 years, 2 months
JBoss Tools SVN: r35978 - trunk/documentation/whatsnew/as.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-25 07:27:06 -0400 (Tue, 25 Oct 2011)
New Revision: 35978
Modified:
trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html
Log:
[JBIDE-10011] created N&N for AS
Modified: trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html 2011-10-25 10:01:38 UTC (rev 35977)
+++ trunk/documentation/whatsnew/as/as-news-3.3.0.M4.html 2011-10-25 11:27:06 UTC (rev 35978)
@@ -86,6 +86,18 @@
</td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td valign="top" align="right">
+ <p><b>Run on Server now waits</b></p>
+ </td>
+ <td valign="top" width="90%">
+ <p>If you want to check your application running on the app server you'd have to start it's deployment
+ and pick <b>Run As/Run on Server</b> afterwards. In many cases your browser then showed a 404 "Not Found" since the browser
+ did not wait until the deployment was successfully executed. We fixed that and
+ now show the browser only when the server completed its duties.</p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-10030">Related Jira</a> <a href="https://issues.jboss.org/browse/JBIDE-9711">Related Jira</a></small></p>
+ </td>
+ </tr>
</table>
13 years, 2 months
JBoss Tools SVN: r35977 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-25 06:01:38 -0400 (Tue, 25 Oct 2011)
New Revision: 35977
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java
Log:
[JBIDE-10012] corrected page activation notifications
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java 2011-10-25 10:00:50 UTC (rev 35976)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java 2011-10-25 10:01:38 UTC (rev 35977)
@@ -20,6 +20,7 @@
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardContainer;
+import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
@@ -32,6 +33,10 @@
*/
public abstract class AbstractOpenShiftWizardPage extends WizardPage {
+ protected enum WizardProgressDirection {
+ BACKWARD, FORWARD
+ }
+
private DataBindingContext dbc;
protected AbstractOpenShiftWizardPage(String title, String description, String pageName, IWizard wizard) {
@@ -80,29 +85,46 @@
@Override
public void handlePageChanging(PageChangingEvent event) {
if (event.getTargetPage() == AbstractOpenShiftWizardPage.this) {
- onPageWillGetActivated(event, dbc);
- } else {
- onPageWillGetDeactivated(event, dbc);
+ onPageWillGetActivated(getActivationDirection(event), event, dbc);
+ } else if (event.getCurrentPage() == AbstractOpenShiftWizardPage.this){
+ onPageWillGetDeactivated(getDeactivationDirection(event), event, dbc);
}
}
+
});
}
}
- protected DataBindingContext getDatabindingContext() {
- return dbc;
+ private WizardProgressDirection getActivationDirection(PageChangingEvent event) {
+ IWizardPage previousPage = getPreviousPage();
+ if (previousPage == null
+ || previousPage.equals(event.getCurrentPage())) {
+ return WizardProgressDirection.BACKWARD;
+ } else {
+ return WizardProgressDirection.FORWARD;
+ }
}
+ private WizardProgressDirection getDeactivationDirection(PageChangingEvent event) {
+ IWizardPage previousPage = getPreviousPage();
+ if (previousPage == null
+ || previousPage.equals(event.getTargetPage())) {
+ return WizardProgressDirection.BACKWARD;
+ } else {
+ return WizardProgressDirection.FORWARD;
+ }
+ }
+
protected void onPageActivated(DataBindingContext dbc) {
}
protected void onPageDeactivated(DataBindingContext dbc) {
}
- protected void onPageWillGetActivated(PageChangingEvent event, DataBindingContext dbc) {
+ protected void onPageWillGetActivated(WizardProgressDirection direction, PageChangingEvent event, DataBindingContext dbc) {
}
- protected void onPageWillGetDeactivated(PageChangingEvent event, DataBindingContext dbc) {
+ protected void onPageWillGetDeactivated(WizardProgressDirection direction, PageChangingEvent event, DataBindingContext dbc) {
}
protected abstract void doCreateControls(Composite parent, DataBindingContext dbc);
@@ -110,5 +132,4 @@
protected DataBindingContext getDataBindingContext() {
return dbc;
}
-
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-25 10:00:50 UTC (rev 35976)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-25 10:01:38 UTC (rev 35977)
@@ -323,7 +323,7 @@
Label domainLabel = new Label(c, SWT.NONE);
domainLabel.setText("Host");
domainValueLabel = new Label(c, SWT.NONE);
- DataBindingContext dbc = getDatabindingContext();
+ DataBindingContext dbc = getDataBindingContext();
ValueBindingBuilder
.bind(WidgetProperties.text().observe(domainValueLabel))
.notUpdating(BeanProperties.value(AdapterWizardPageModel.PROPERTY_APPLICATION_URL).observe(model))
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-25 10:00:50 UTC (rev 35976)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-25 10:01:38 UTC (rev 35977)
@@ -208,7 +208,7 @@
"Could not rename domain", e);
}
}
- }, getContainer(), getDatabindingContext());
+ }, getContainer(), getDataBindingContext());
} catch (Exception ex) {
// ignore
}
@@ -363,7 +363,7 @@
}
}
- }, getContainer(), getDatabindingContext());
+ }, getContainer(), getDataBindingContext());
} catch (Exception ex) {
// ignore
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-10-25 10:00:50 UTC (rev 35976)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-10-25 10:01:38 UTC (rev 35977)
@@ -146,8 +146,9 @@
}
@Override
- protected void onPageWillGetDeactivated(PageChangingEvent event, DataBindingContext dbc) {
- if (!model.areCredentialsValidated()) {
+ protected void onPageWillGetDeactivated(WizardProgressDirection direction, PageChangingEvent event, DataBindingContext dbc) {
+ if (!model.areCredentialsValidated()
+ && direction == WizardProgressDirection.FORWARD) {
try {
final ArrayBlockingQueue<IStatus> queue = new ArrayBlockingQueue<IStatus>(1);
WizardUtils.runInWizard(
@@ -159,7 +160,7 @@
queue.offer(status);
return Status.OK_STATUS;
}
- }, getContainer(), getDatabindingContext());
+ }, getContainer(), getDataBindingContext());
queue.poll(10, TimeUnit.SECONDS);
event.doit = model.areCredentialsValid();
} catch (Exception ex) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-25 10:00:50 UTC (rev 35976)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-25 10:01:38 UTC (rev 35977)
@@ -177,7 +177,7 @@
SshPrivateKeysPreferences.openPreferencesPage(getShell());
// refresh warning about key
// (since user may have changed SSH2 prefs)
- getDatabindingContext().updateTargets();
+ getDataBindingContext().updateTargets();
}
};
}
13 years, 2 months
JBoss Tools SVN: r35976 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-25 06:00:50 -0400 (Tue, 25 Oct 2011)
New Revision: 35976
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java
Log:
[JBIDE-10012] corrected page activation notifications
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java 2011-10-25 09:36:06 UTC (rev 35975)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java 2011-10-25 10:00:50 UTC (rev 35976)
@@ -20,6 +20,7 @@
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardContainer;
+import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
@@ -32,6 +33,10 @@
*/
public abstract class AbstractOpenShiftWizardPage extends WizardPage {
+ protected enum WizardProgressDirection {
+ BACKWARD, FORWARD
+ }
+
private DataBindingContext dbc;
protected AbstractOpenShiftWizardPage(String title, String description, String pageName, IWizard wizard) {
@@ -80,29 +85,46 @@
@Override
public void handlePageChanging(PageChangingEvent event) {
if (event.getTargetPage() == AbstractOpenShiftWizardPage.this) {
- onPageWillGetActivated(event, dbc);
- } else {
- onPageWillGetDeactivated(event, dbc);
+ onPageWillGetActivated(getActivationDirection(event), event, dbc);
+ } else if (event.getCurrentPage() == AbstractOpenShiftWizardPage.this){
+ onPageWillGetDeactivated(getDeactivationDirection(event), event, dbc);
}
}
+
});
}
}
- protected DataBindingContext getDatabindingContext() {
- return dbc;
+ private WizardProgressDirection getActivationDirection(PageChangingEvent event) {
+ IWizardPage previousPage = getPreviousPage();
+ if (previousPage == null
+ || previousPage.equals(event.getCurrentPage())) {
+ return WizardProgressDirection.BACKWARD;
+ } else {
+ return WizardProgressDirection.FORWARD;
+ }
}
+ private WizardProgressDirection getDeactivationDirection(PageChangingEvent event) {
+ IWizardPage previousPage = getPreviousPage();
+ if (previousPage == null
+ || previousPage.equals(event.getTargetPage())) {
+ return WizardProgressDirection.BACKWARD;
+ } else {
+ return WizardProgressDirection.FORWARD;
+ }
+ }
+
protected void onPageActivated(DataBindingContext dbc) {
}
protected void onPageDeactivated(DataBindingContext dbc) {
}
- protected void onPageWillGetActivated(PageChangingEvent event, DataBindingContext dbc) {
+ protected void onPageWillGetActivated(WizardProgressDirection direction, PageChangingEvent event, DataBindingContext dbc) {
}
- protected void onPageWillGetDeactivated(PageChangingEvent event, DataBindingContext dbc) {
+ protected void onPageWillGetDeactivated(WizardProgressDirection direction, PageChangingEvent event, DataBindingContext dbc) {
}
protected abstract void doCreateControls(Composite parent, DataBindingContext dbc);
@@ -110,5 +132,4 @@
protected DataBindingContext getDataBindingContext() {
return dbc;
}
-
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-25 09:36:06 UTC (rev 35975)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-25 10:00:50 UTC (rev 35976)
@@ -323,7 +323,7 @@
Label domainLabel = new Label(c, SWT.NONE);
domainLabel.setText("Host");
domainValueLabel = new Label(c, SWT.NONE);
- DataBindingContext dbc = getDatabindingContext();
+ DataBindingContext dbc = getDataBindingContext();
ValueBindingBuilder
.bind(WidgetProperties.text().observe(domainValueLabel))
.notUpdating(BeanProperties.value(AdapterWizardPageModel.PROPERTY_APPLICATION_URL).observe(model))
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-25 09:36:06 UTC (rev 35975)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-25 10:00:50 UTC (rev 35976)
@@ -208,7 +208,7 @@
"Could not rename domain", e);
}
}
- }, getContainer(), getDatabindingContext());
+ }, getContainer(), getDataBindingContext());
} catch (Exception ex) {
// ignore
}
@@ -363,7 +363,7 @@
}
}
- }, getContainer(), getDatabindingContext());
+ }, getContainer(), getDataBindingContext());
} catch (Exception ex) {
// ignore
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-10-25 09:36:06 UTC (rev 35975)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-10-25 10:00:50 UTC (rev 35976)
@@ -146,8 +146,9 @@
}
@Override
- protected void onPageWillGetDeactivated(PageChangingEvent event, DataBindingContext dbc) {
- if (!model.areCredentialsValidated()) {
+ protected void onPageWillGetDeactivated(WizardProgressDirection direction, PageChangingEvent event, DataBindingContext dbc) {
+ if (!model.areCredentialsValidated()
+ && direction == WizardProgressDirection.FORWARD) {
try {
final ArrayBlockingQueue<IStatus> queue = new ArrayBlockingQueue<IStatus>(1);
WizardUtils.runInWizard(
@@ -159,7 +160,7 @@
queue.offer(status);
return Status.OK_STATUS;
}
- }, getContainer(), getDatabindingContext());
+ }, getContainer(), getDataBindingContext());
queue.poll(10, TimeUnit.SECONDS);
event.doit = model.areCredentialsValid();
} catch (Exception ex) {
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-25 09:36:06 UTC (rev 35975)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-25 10:00:50 UTC (rev 35976)
@@ -177,7 +177,7 @@
SshPrivateKeysPreferences.openPreferencesPage(getShell());
// refresh warning about key
// (since user may have changed SSH2 prefs)
- getDatabindingContext().updateTargets();
+ getDataBindingContext().updateTargets();
}
};
}
13 years, 2 months