JBoss Tools SVN: r35812 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-19 11:27:11 -0400 (Wed, 19 Oct 2011)
New Revision: 35812
Modified:
trunk/build/aggregate/site/build.xml
Log:
externalize list of files to add to site/ and site_assembly.zip into property for reuse
Modified: trunk/build/aggregate/site/build.xml
===================================================================
--- trunk/build/aggregate/site/build.xml 2011-10-19 15:27:02 UTC (rev 35811)
+++ trunk/build/aggregate/site/build.xml 2011-10-19 15:27:11 UTC (rev 35812)
@@ -31,6 +31,8 @@
<property name="aggregateSite.properties" value="aggregateSite.jbosstools.properties" />
<property file="${aggregateSite.properties}" />
+ <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml"/>
+
<target name="init">
<ant antfile="${build.xml}" target="init" />
<taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -400,7 +402,7 @@
</target>
<target name="pack.zip">
- <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.* index.html, web/*.css, README*" />
+ <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.*, ${web.content.files}" />
</target>
<target name="check.target">
@@ -489,7 +491,7 @@
</directory>
</echo>
<copy todir="${update.site.source.dir}">
- <fileset dir="${output.dir}" includes="index.html, **/*.css, README*, *directory.xml" />
+ <fileset dir="${output.dir}" includes="${web.content.files}" />
</copy>
</target>
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r35811 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-19 11:27:02 -0400 (Wed, 19 Oct 2011)
New Revision: 35811
Added:
trunk/build/aggregate/site/jbosstools-directory.xml
Removed:
trunk/build/aggregate/site/directory.xml
Modified:
trunk/build/aggregate/site/build.xml
Log:
rename directory.xml -> jbosstools-directory.xml per Max's request
Modified: trunk/build/aggregate/site/build.xml
===================================================================
--- trunk/build/aggregate/site/build.xml 2011-10-19 15:14:53 UTC (rev 35810)
+++ trunk/build/aggregate/site/build.xml 2011-10-19 15:27:02 UTC (rev 35811)
@@ -483,13 +483,13 @@
</path>
<property name="central.discovery.path" refid="central.discovery.jar.id"/>
<basename property="central.discovery.jar" file="${central.discovery.path}"/>
- <echo file="${output.dir}/directory.xml"><?xml version='1.0' encoding='UTF-8'?>
+ <echo file="${output.dir}/jbosstools-directory.xml"><?xml version='1.0' encoding='UTF-8'?>
<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
<entry url="plugins/${central.discovery.jar}" permitCategories="true"/>
</directory>
</echo>
<copy todir="${update.site.source.dir}">
- <fileset dir="${output.dir}" includes="index.html, **/*.css, README*, directory.xml" />
+ <fileset dir="${output.dir}" includes="index.html, **/*.css, README*, *directory.xml" />
</copy>
</target>
Deleted: trunk/build/aggregate/site/directory.xml
===================================================================
--- trunk/build/aggregate/site/directory.xml 2011-10-19 15:14:53 UTC (rev 35810)
+++ trunk/build/aggregate/site/directory.xml 2011-10-19 15:27:02 UTC (rev 35811)
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
-<entry url="plugins/org.jboss.tools.central.discovery_1.0.0.v20111014-1052-H24-M4.jar" permitCategories="true"/>
-</directory>
Copied: trunk/build/aggregate/site/jbosstools-directory.xml (from rev 35810, trunk/build/aggregate/site/directory.xml)
===================================================================
--- trunk/build/aggregate/site/jbosstools-directory.xml (rev 0)
+++ trunk/build/aggregate/site/jbosstools-directory.xml 2011-10-19 15:27:02 UTC (rev 35811)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
+<entry url="plugins/org.jboss.tools.central.discovery_1.0.0.v20111014-1052-H24-M4.jar" permitCategories="true"/>
+</directory>
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r35810 - 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-19 11:14:53 -0400 (Wed, 19 Oct 2011)
New Revision: 35810
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
Log:
[JBIDE-9947] updating selection binding if you uncheck checkbox
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-19 15:13:58 UTC (rev 35809)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-19 15:14:53 UTC (rev 35810)
@@ -526,7 +526,7 @@
}
public IStatus validate(Object value) {
- if (!serverAdapterCheckbox.getSelection()) {
+ if (!serverAdapterCheckbox.getSelection()) {
updateBinding();
return Status.OK_STATUS;
}
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r35809 - 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-19 11:13:58 -0400 (Wed, 19 Oct 2011)
New Revision: 35809
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
Log:
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-19 15:10:21 UTC (rev 35808)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-19 15:13:58 UTC (rev 35809)
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.core.databinding.Binding;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.UpdateValueStrategy;
import org.eclipse.core.databinding.beans.BeanProperties;
@@ -275,23 +276,20 @@
serverAdapterGroup.setLayout(fillLayout);
fillServerAdapterGroup(serverAdapterGroup);
IObservableValue runtimeSelection = WidgetProperties.singleSelectionIndex().observe(suitableRuntimes);
- dbc.bindValue(
- WidgetProperties.singleSelectionIndex().observe(suitableRuntimes)
+
+ IObservableValue dummyObservable = new WritableValue();
+ Binding comboSelectionBinding = dbc.bindValue(
+ dummyObservable
, WidgetProperties.singleSelectionIndex().observe(suitableRuntimes)
, new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)
- , new UpdateValueStrategy().setAfterGetValidator(new IValidator() {
- public IStatus validate(Object value) {
- if( !serverAdapterCheckbox.getSelection())
- return Status.OK_STATUS;
- if( new Integer(-1).equals(value)) {
- if( suitableRuntimes.getItems() == null || suitableRuntimes.getItems().length == 0) {
- return ValidationStatus.error("Please add a new valid runtime.");
- }
- return ValidationStatus.error("Please select a runtime");
- }
- return Status.OK_STATUS;
- }
- }));
+ , new UpdateValueStrategy().setAfterGetValidator(new SelectedRuntimeValidator(null)));
+
+ dbc.bindValue(
+ dummyObservable
+ , WidgetProperties.selection().observe(serverAdapterCheckbox)
+ , new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)
+ , new UpdateValueStrategy().setAfterGetValidator(new SelectedRuntimeValidator(comboSelectionBinding)));
+
runtimeSelection.setValue(null);
return serverAdapterGroup;
@@ -519,4 +517,34 @@
model.getParentModel().setProperty(AdapterWizardPageModel.CREATE_SERVER, canCreateServer);
}
+ private class SelectedRuntimeValidator implements IValidator {
+
+ private Binding binding;
+
+ public SelectedRuntimeValidator(Binding binding) {
+ this.binding = binding;
+ }
+
+ public IStatus validate(Object value) {
+ if (!serverAdapterCheckbox.getSelection()) {
+ updateBinding();
+ return Status.OK_STATUS;
+ }
+ if (new Integer(-1).equals(suitableRuntimes.getSelectionIndex())) {
+ if (suitableRuntimes.getItems() == null || suitableRuntimes.getItems().length == 0) {
+ return ValidationStatus.error("Please add a new valid runtime.");
+ }
+ return ValidationStatus.error("Please select a runtime");
+ }
+ updateBinding();
+ return Status.OK_STATUS;
+ }
+
+ private void updateBinding() {
+ if (binding != null) {
+ this.binding.updateModelToTarget();
+ }
+ }
+ }
+
}
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r35808 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-10-19 11:10:21 -0400 (Wed, 19 Oct 2011)
New Revision: 35808
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java
Log:
Set disovery url to stable milestone 4 location.
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-10-19 14:39:41 UTC (rev 35807)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-10-19 15:10:21 UTC (rev 35808)
@@ -64,7 +64,7 @@
private static final String JBOSS_DISCOVERY_DIRECTORY = "jboss.discovery.directory";
- public static final String JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML = "http://download.jboss.org/jbosstools/examples/directory-3.3.0.xml";
+ public static final String JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML = "http://download.jboss.org/jbosstools/updates/development/indigo/directory...";
public static final String ICON = "icon";
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r35807 - 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: rob.stryker(a)jboss.com
Date: 2011-10-19 10:39:41 -0400 (Wed, 19 Oct 2011)
New Revision: 35807
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
Log:
JBIDE-9947 - runtime validation
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-19 14:39:38 UTC (rev 35806)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-19 14:39:41 UTC (rev 35807)
@@ -102,7 +102,7 @@
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(projectGroup);
- Group serverAdapterGroup = createAdapterGroup(parent);
+ Group serverAdapterGroup = createAdapterGroup(parent, dbc);
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(serverAdapterGroup);
}
@@ -266,7 +266,7 @@
};
}
- private Group createAdapterGroup(Composite parent) {
+ private Group createAdapterGroup(Composite parent, DataBindingContext dbc) {
Group serverAdapterGroup = new Group(parent, SWT.BORDER);
serverAdapterGroup.setText("JBoss Server adapter");
FillLayout fillLayout = new FillLayout();
@@ -274,6 +274,25 @@
fillLayout.marginWidth = 6;
serverAdapterGroup.setLayout(fillLayout);
fillServerAdapterGroup(serverAdapterGroup);
+ IObservableValue runtimeSelection = WidgetProperties.singleSelectionIndex().observe(suitableRuntimes);
+ dbc.bindValue(
+ WidgetProperties.singleSelectionIndex().observe(suitableRuntimes)
+ , WidgetProperties.singleSelectionIndex().observe(suitableRuntimes)
+ , new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)
+ , new UpdateValueStrategy().setAfterGetValidator(new IValidator() {
+ public IStatus validate(Object value) {
+ if( !serverAdapterCheckbox.getSelection())
+ return Status.OK_STATUS;
+ if( new Integer(-1).equals(value)) {
+ if( suitableRuntimes.getItems() == null || suitableRuntimes.getItems().length == 0) {
+ return ValidationStatus.error("Please add a new valid runtime.");
+ }
+ return ValidationStatus.error("Please select a runtime");
+ }
+ return Status.OK_STATUS;
+ }
+ }));
+ runtimeSelection.setValue(null);
return serverAdapterGroup;
}
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r35806 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-19 10:39:38 -0400 (Wed, 19 Oct 2011)
New Revision: 35806
Modified:
trunk/build/aggregate/site/build.xml
trunk/build/aggregate/site/directory.xml
trunk/build/aggregate/site/index.html
trunk/build/aggregate/site/pom.xml
Log:
make the path from directory.xml -> central.discovery_*.jar relative so that when we move the site it'll still resolve
Modified: trunk/build/aggregate/site/build.xml
===================================================================
--- trunk/build/aggregate/site/build.xml 2011-10-19 14:11:08 UTC (rev 35805)
+++ trunk/build/aggregate/site/build.xml 2011-10-19 14:39:38 UTC (rev 35806)
@@ -485,7 +485,7 @@
<basename property="central.discovery.jar" file="${central.discovery.path}"/>
<echo file="${output.dir}/directory.xml"><?xml version='1.0' encoding='UTF-8'?>
<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
-<entry url="${jbosstools-nightly}plugins/${central.discovery.jar}" permitCategories="true"/>
+<entry url="plugins/${central.discovery.jar}" permitCategories="true"/>
</directory>
</echo>
<copy todir="${update.site.source.dir}">
Modified: trunk/build/aggregate/site/directory.xml
===================================================================
--- trunk/build/aggregate/site/directory.xml 2011-10-19 14:11:08 UTC (rev 35805)
+++ trunk/build/aggregate/site/directory.xml 2011-10-19 14:39:38 UTC (rev 35806)
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
-<entry url="http://download.jboss.org/jbosstools/updates/nightly/trunk/plugins/org.jb..." permitCategories="true"/>
+<entry url="plugins/org.jboss.tools.central.discovery_1.0.0.v20111014-1052-H24-M4.jar" permitCategories="true"/>
</directory>
Modified: trunk/build/aggregate/site/index.html
===================================================================
--- trunk/build/aggregate/site/index.html 2011-10-19 14:11:08 UTC (rev 35805)
+++ trunk/build/aggregate/site/index.html 2011-10-19 14:39:38 UTC (rev 35806)
@@ -78,8 +78,8 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20111013-0228-H479-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
- <td><span style="font-size:x-small">3.2.1.v20111013-0228-H479-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20111017-1647-H487-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
+ <td><span style="font-size:x-small">3.2.1.v20111017-1647-H487-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
@@ -87,8 +87,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20111013-0248-H783-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20111013-0248-H783-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20111017-1659-H792-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20111017-1659-H792-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
@@ -96,8 +96,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.server.egit.integration.feature_0.0.1.v20111013-0248-H783-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.server.egit.integration.feature</a></td>
- <td><span style="font-size:x-small">0.0.1.v20111013-0248-H783-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.server.egit.integration.feature_0.0.1.v20111017-1659-H792-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.server.egit.integration.feature</a></td>
+ <td><span style="font-size:x-small">0.0.1.v20111017-1659-H792-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
@@ -105,8 +105,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.freemarker.feature_1.2.0.v20111013-0221-H446-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.freemarker.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111013-0221-H446-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.freemarker.feature_1.2.0.v20111018-1544-H458-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.freemarker.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111018-1544-H458-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
@@ -114,15 +114,15 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.birt.feature_1.3.0.v20111013-0228-H478-M4.jar" style="font-size:x-small">org.jboss.tools.birt.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111013-0228-H478-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.birt.feature_1.3.0.v20111018-1546-H490-M4.jar" style="font-size:x-small">org.jboss.tools.birt.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111018-1546-H490-M4</span></td>
<td><span style="font-size:x-small">
|
ReportTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.cdi.feature_1.2.0.v20111013-0259-H621-M4.jar" style="font-size:x-small">org.jboss.tools.cdi.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111013-0259-H621-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.cdi.feature_1.2.0.v20111018-0443-H631-M4.jar" style="font-size:x-small">org.jboss.tools.cdi.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111018-0443-H631-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
@@ -132,8 +132,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.cdi.seam.feature_1.2.0.v20111013-0259-H621-M4.jar" style="font-size:x-small">org.jboss.tools.cdi.seam.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111013-0259-H621-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.cdi.seam.feature_1.2.0.v20111018-0443-H631-M4.jar" style="font-size:x-small">org.jboss.tools.cdi.seam.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111018-0443-H631-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
@@ -143,167 +143,181 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.central.feature_1.0.0.v20111013-0545-M4.jar" style="font-size:x-small">org.jboss.tools.central.feature</a></td>
- <td><span style="font-size:x-small">1.0.0.v20111013-0545-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.central.discovery.feature_1.0.0.v20111014-1052-H24-M4.jar" style="font-size:x-small">org.jboss.tools.central.discovery.feature</a></td>
+ <td><span style="font-size:x-small">1.0.0.v20111014-1052-H24-M4</span></td>
+ <td></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.central.feature_1.0.0.v20111014-1052-H24-M4.jar" style="font-size:x-small">org.jboss.tools.central.feature</a></td>
+ <td><span style="font-size:x-small">1.0.0.v20111014-1052-H24-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span></td>
</tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.common.core.feature_3.3.0.v20111018-0318-H518-M4.jar" style="font-size:x-small">org.jboss.tools.common.core.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111018-0318-H518-M4</span></td>
+ <td></td>
+ </tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.core.feature_3.3.0.v20111012-1652-H506-M4.jar" style="font-size:x-small">org.jboss.tools.common.core.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111012-1652-H506-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.feature_3.3.0.v20111018-0318-H518-M4.jar" style="font-size:x-small">org.jboss.tools.common.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111018-0318-H518-M4</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.feature_3.3.0.v20111012-1652-H506-M4.jar" style="font-size:x-small">org.jboss.tools.common.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111012-1652-H506-M4</span></td>
- <td></td>
- </tr>
- <tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.jdt.feature_3.3.0.v20111012-1652-H506-M4.jar" style="font-size:x-small">org.jboss.tools.common.jdt.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111012-1652-H506-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.jdt.feature_3.3.0.v20111018-1504-H520-M4.jar" style="font-size:x-small">org.jboss.tools.common.jdt.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111018-1504-H520-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span></td>
</tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.common.text.ext.feature_3.3.0.v20111018-0318-H518-M4.jar" style="font-size:x-small">org.jboss.tools.common.text.ext.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111018-0318-H518-M4</span></td>
+ <td></td>
+ </tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.text.ext.feature_3.3.0.v20111012-1652-H506-M4.jar" style="font-size:x-small">org.jboss.tools.common.text.ext.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111012-1652-H506-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.ui.feature_3.3.0.v20111018-0318-H518-M4.jar" style="font-size:x-small">org.jboss.tools.common.ui.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111018-0318-H518-M4</span></td>
<td></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.ui.feature_3.3.0.v20111012-1652-H506-M4.jar" style="font-size:x-small">org.jboss.tools.common.ui.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111012-1652-H506-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.verification.feature_3.3.0.v20111018-0318-H518-M4.jar" style="font-size:x-small">org.jboss.tools.common.verification.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111018-0318-H518-M4</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.verification.feature_3.3.0.v20111012-1652-H506-M4.jar" style="font-size:x-small">org.jboss.tools.common.verification.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111012-1652-H506-M4</span></td>
- <td></td>
- </tr>
- <tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.community.project.examples.feature_1.2.1.v20111012-2348-H448-M4.jar" style="font-size:x-small">org.jboss.tools.community.project.examples.feature</a></td>
- <td><span style="font-size:x-small">1.2.1.v20111012-2348-H448-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.community.project.examples.feature_1.2.1.v20111014-0812-H449-M4.jar" style="font-size:x-small">org.jboss.tools.community.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.2.1.v20111014-0812-H449-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
|
GeneralTools</span></td>
</tr>
- <tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.deltacloud.feature_1.0.1.v20111013-0307-H689-M4.jar" style="font-size:x-small">org.jboss.tools.deltacloud.feature</a></td>
- <td><span style="font-size:x-small">1.0.1.v20111013-0307-H689-M4</span></td>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.deltacloud.feature_1.0.1.v20111017-1739-H699-M4.jar" style="font-size:x-small">org.jboss.tools.deltacloud.feature</a></td>
+ <td><span style="font-size:x-small">1.0.1.v20111017-1739-H699-M4</span></td>
<td><span style="font-size:x-small">
|
CloudTools</span></td>
</tr>
- <tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.forge.feature_1.0.0.v20111013-0221-H311-M4.jar" style="font-size:x-small">org.jboss.tools.forge.feature</a></td>
- <td><span style="font-size:x-small">1.0.0.v20111013-0221-H311-M4</span></td>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.forge.feature_1.0.0.v20111018-0426-H320-M4.jar" style="font-size:x-small">org.jboss.tools.forge.feature</a></td>
+ <td><span style="font-size:x-small">1.0.0.v20111018-0426-H320-M4</span></td>
<td><span style="font-size:x-small">
|
WebTools</span></td>
</tr>
- <tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.gwt.feature_1.0.2.v20111013-0227-H263-M4.jar" style="font-size:x-small">org.jboss.tools.gwt.feature</a></td>
- <td><span style="font-size:x-small">1.0.2.v20111013-0227-H263-M4</span></td>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.gwt.feature_1.0.2.v20111018-1539-H274-M4.jar" style="font-size:x-small">org.jboss.tools.gwt.feature</a></td>
+ <td><span style="font-size:x-small">1.0.2.v20111018-1539-H274-M4</span></td>
<td><span style="font-size:x-small">
|
GeneralTools</span></td>
</tr>
- <tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20111013-0221-H446-M4.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111013-0221-H446-M4</span></td>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20111017-1632-H453-M4.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111017-1632-H453-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
|
GeneralTools</span></td>
</tr>
- <tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jsf.feature_3.3.0.v20111013-0342-H478-M4.jar" style="font-size:x-small">org.jboss.tools.jsf.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111013-0342-H478-M4</span></td>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.jsf.feature_3.3.0.v20111018-0523-H484-M4.jar" style="font-size:x-small">org.jboss.tools.jsf.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111018-0523-H484-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
|
WebTools</span></td>
</tr>
- <tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jst.feature_3.3.0.v20111013-0233-H570-M4.jar" style="font-size:x-small">org.jboss.tools.jst.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111013-0233-H570-M4</span></td>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.jst.feature_3.3.0.v20111018-0418-H580-M4.jar" style="font-size:x-small">org.jboss.tools.jst.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111018-0418-H580-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
|
WebTools</span></td>
</tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.cdi.feature_1.3.0.v20111014-0754-H450-M4.jar" style="font-size:x-small">org.jboss.tools.maven.cdi.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111014-0754-H450-M4</span></td>
+ <td><span style="font-size:x-small">
+ |
+ MavenTools</span></td>
+ </tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.cdi.feature_1.3.0.v20111012-2335-H449-M4.jar" style="font-size:x-small">org.jboss.tools.maven.cdi.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111012-2335-H449-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.feature_1.3.0.v20111014-0754-H450-M4.jar" style="font-size:x-small">org.jboss.tools.maven.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111014-0754-H450-M4</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.feature_1.3.0.v20111012-2335-H449-M4.jar" style="font-size:x-small">org.jboss.tools.maven.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111012-2335-H449-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.hibernate.feature_1.3.0.v20111014-0754-H450-M4.jar" style="font-size:x-small">org.jboss.tools.maven.hibernate.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111014-0754-H450-M4</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.hibernate.feature_1.3.0.v20111012-2335-H449-M4.jar" style="font-size:x-small">org.jboss.tools.maven.hibernate.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111012-2335-H449-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.jaxrs.feature_1.3.0.v20111014-0754-H450-M4.jar" style="font-size:x-small">org.jboss.tools.maven.jaxrs.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111014-0754-H450-M4</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.jaxrs.feature_1.3.0.v20111012-2335-H449-M4.jar" style="font-size:x-small">org.jboss.tools.maven.jaxrs.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111012-2335-H449-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.jbosspackaging.feature_1.3.0.v20111014-0754-H450-M4.jar" style="font-size:x-small">org.jboss.tools.maven.jbosspackaging.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111014-0754-H450-M4</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.jbosspackaging.feature_1.3.0.v20111012-2335-H449-M4.jar" style="font-size:x-small">org.jboss.tools.maven.jbosspackaging.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111012-2335-H449-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.jsf.feature_1.3.0.v20111014-0754-H450-M4.jar" style="font-size:x-small">org.jboss.tools.maven.jsf.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111014-0754-H450-M4</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.jsf.feature_1.3.0.v20111012-2335-H449-M4.jar" style="font-size:x-small">org.jboss.tools.maven.jsf.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111012-2335-H449-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.portlet.feature_1.3.0.v20111014-0754-H450-M4.jar" style="font-size:x-small">org.jboss.tools.maven.portlet.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111014-0754-H450-M4</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.portlet.feature_1.3.0.v20111012-2335-H449-M4.jar" style="font-size:x-small">org.jboss.tools.maven.portlet.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111012-2335-H449-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.project.examples.feature_1.3.0.v20111014-0754-H450-M4.jar" style="font-size:x-small">org.jboss.tools.maven.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111014-0754-H450-M4</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.project.examples.feature_1.3.0.v20111012-2335-H449-M4.jar" style="font-size:x-small">org.jboss.tools.maven.project.examples.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111012-2335-H449-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.seam.feature_1.3.0.v20111014-0754-H450-M4.jar" style="font-size:x-small">org.jboss.tools.maven.seam.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111014-0754-H450-M4</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.seam.feature_1.3.0.v20111012-2335-H449-M4.jar" style="font-size:x-small">org.jboss.tools.maven.seam.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111012-2335-H449-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.openshift.express.feature_2.3.0.v20111017-1659-H792-M4.jar" style="font-size:x-small">org.jboss.tools.openshift.express.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20111017-1659-H792-M4</span></td>
<td><span style="font-size:x-small">
|
- MavenTools</span></td>
+ AllTools</span><span style="font-size:x-small">
+ |
+ WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.openshift.express.feature_2.3.0.v20111013-0248-H783-M4.jar" style="font-size:x-small">org.jboss.tools.openshift.express.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20111013-0248-H783-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.portlet.feature_1.2.0.v20111014-0739-H390-M4.jar" style="font-size:x-small">org.jboss.tools.portlet.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111014-0739-H390-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
@@ -311,115 +325,106 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.portlet.feature_1.2.0.v20111012-2335-H389-M4.jar" style="font-size:x-small">org.jboss.tools.portlet.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111012-2335-H389-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.project.examples.feature_1.2.1.v20111014-0812-H449-M4.jar" style="font-size:x-small">org.jboss.tools.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.2.1.v20111014-0812-H449-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
|
- WebTools</span></td>
+ GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.project.examples.feature_1.2.1.v20111012-2348-H448-M4.jar" style="font-size:x-small">org.jboss.tools.project.examples.feature</a></td>
- <td><span style="font-size:x-small">1.2.1.v20111012-2348-H448-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.richfaces.feature_3.3.0.v20111018-0523-H484-M4.jar" style="font-size:x-small">org.jboss.tools.richfaces.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111018-0523-H484-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
|
- GeneralTools</span></td>
+ WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.richfaces.feature_3.3.0.v20111013-0342-H478-M4.jar" style="font-size:x-small">org.jboss.tools.richfaces.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111013-0342-H478-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.as.detector.feature_1.3.0.v20111018-0501-H454-M4.jar" style="font-size:x-small">org.jboss.tools.runtime.as.detector.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111018-0501-H454-M4</span></td>
<td><span style="font-size:x-small">
|
- AllTools</span><span style="font-size:x-small">
- |
- WebTools</span></td>
+ AllTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.as.detector.feature_1.3.0.v20111013-0430-H442-M4.jar" style="font-size:x-small">org.jboss.tools.runtime.as.detector.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111013-0430-H442-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.core.feature_1.3.0.v20111018-0501-H454-M4.jar" style="font-size:x-small">org.jboss.tools.runtime.core.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111018-0501-H454-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.core.feature_1.3.0.v20111013-0430-H442-M4.jar" style="font-size:x-small">org.jboss.tools.runtime.core.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111013-0430-H442-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.feature_1.3.0.v20111018-0501-H454-M4.jar" style="font-size:x-small">org.jboss.tools.runtime.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111018-0501-H454-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.feature_1.3.0.v20111013-0430-H442-M4.jar" style="font-size:x-small">org.jboss.tools.runtime.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111013-0430-H442-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.seam.detector.feature_1.3.0.v20111018-0501-H454-M4.jar" style="font-size:x-small">org.jboss.tools.runtime.seam.detector.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111018-0501-H454-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.seam.detector.feature_1.3.0.v20111013-0430-H442-M4.jar" style="font-size:x-small">org.jboss.tools.runtime.seam.detector.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111013-0430-H442-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.seam.feature_3.3.0.v20111015-0436-H631-M4.jar" style="font-size:x-small">org.jboss.tools.seam.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111015-0436-H631-M4</span></td>
<td><span style="font-size:x-small">
|
- AllTools</span></td>
- </tr>
- <tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.seam.feature_3.3.0.v20111013-0135-H626-M4.jar" style="font-size:x-small">org.jboss.tools.seam.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111013-0135-H626-M4</span></td>
- <td><span style="font-size:x-small">
- |
AllTools</span><span style="font-size:x-small">
|
WebTools</span></td>
</tr>
- <tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.struts.feature_3.3.0.v20111013-0543-H391-M4.jar" style="font-size:x-small">org.jboss.tools.struts.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111013-0543-H391-M4</span></td>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.struts.feature_3.3.0.v20111018-0610-H397-M4.jar" style="font-size:x-small">org.jboss.tools.struts.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111018-0610-H397-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
|
WebTools</span></td>
</tr>
- <tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.usage.feature_1.1.0.v20111013-0214-H411-M4.jar" style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
- <td><span style="font-size:x-small">1.1.0.v20111013-0214-H411-M4</span></td>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.usage.feature_1.1.0.v20111018-1522-H421-M4.jar" style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
+ <td><span style="font-size:x-small">1.1.0.v20111018-1522-H421-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span></td>
</tr>
- <tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.vpe.feature_3.3.0.v20111013-0254-H550-M4.jar" style="font-size:x-small">org.jboss.tools.vpe.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111013-0254-H550-M4</span></td>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.vpe.feature_3.3.0.v20111018-0449-H559-M4.jar" style="font-size:x-small">org.jboss.tools.vpe.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111018-0449-H559-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
|
WebTools</span></td>
</tr>
- <tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.ws.feature_1.2.2.v20111013-0311-H570-M4.jar" style="font-size:x-small">org.jboss.tools.ws.feature</a></td>
- <td><span style="font-size:x-small">1.2.2.v20111013-0311-H570-M4</span></td>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.ws.feature_1.2.2.v20111015-0241-H578-M4.jar" style="font-size:x-small">org.jboss.tools.ws.feature</a></td>
+ <td><span style="font-size:x-small">1.2.2.v20111015-0241-H578-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
|
WebTools</span></td>
</tr>
- <tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.ws.jaxrs.feature_1.2.2.v20111013-0311-H570-M4.jar" style="font-size:x-small">org.jboss.tools.ws.jaxrs.feature</a></td>
- <td><span style="font-size:x-small">1.2.2.v20111013-0311-H570-M4</span></td>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.ws.jaxrs.feature_1.2.2.v20111015-0241-H578-M4.jar" style="font-size:x-small">org.jboss.tools.ws.jaxrs.feature</a></td>
+ <td><span style="font-size:x-small">1.2.2.v20111015-0241-H578-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
|
WebTools</span></td>
</tr>
- <tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.xulrunner.feature_3.3.0.v20111013-0507-H551-M4.jar" style="font-size:x-small">org.jboss.tools.xulrunner.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111013-0507-H551-M4</span></td>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.xulrunner.feature_3.3.0.v20111018-0449-H559-M4.jar" style="font-size:x-small">org.jboss.tools.xulrunner.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111018-0449-H559-M4</span></td>
<td></td>
</tr>
<tr style="background-color:#DDDDDD">
@@ -431,8 +436,8 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.hibernate.eclipse.feature_3.4.0.v20111013-0236-H513-M4.jar" style="font-size:x-small">org.hibernate.eclipse.feature</a></td>
- <td><span style="font-size:x-small">3.4.0.v20111013-0236-H513-M4</span></td>
+ <td class="rowLine"><a href="features/org.hibernate.eclipse.feature_3.4.0.v20111018-0516-H523-M4.jar" style="font-size:x-small">org.hibernate.eclipse.feature</a></td>
+ <td><span style="font-size:x-small">3.4.0.v20111018-0516-H523-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span style="font-size:x-small">
Modified: trunk/build/aggregate/site/pom.xml
===================================================================
--- trunk/build/aggregate/site/pom.xml 2011-10-19 14:11:08 UTC (rev 35805)
+++ trunk/build/aggregate/site/pom.xml 2011-10-19 14:39:38 UTC (rev 35806)
@@ -29,7 +29,6 @@
<ant antfile="build.xml">
<property name="inputRepo"
value="${jbosstools-nightly-staging-composite}" />
- <property name="jbosstools-nightly" value="${jbosstools-nightly}" />
<property name="JBT_VERSION" value="${JBT_VERSION}" />
<property name="BUILD_ALIAS" value="${BUILD_ALIAS}" />
</ant>
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r35805 - trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-19 10:11:08 -0400 (Wed, 19 Oct 2011)
New Revision: 35805
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/InternalUser.java
Log:
[JBIDE-9944] returning same list instead of new one
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/InternalUser.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/InternalUser.java 2011-10-19 14:02:42 UTC (rev 35804)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/InternalUser.java 2011-10-19 14:11:08 UTC (rev 35805)
@@ -165,7 +165,7 @@
if (getUserInfo().getApplicationInfos().size() > applications.size()) {
update(getUserInfo().getApplicationInfos());
}
- return Collections.unmodifiableList(applications);
+ return applications;
}
@Override
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r35804 - in trunk/forge/plugins: org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-10-19 10:02:42 -0400 (Wed, 19 Oct 2011)
New Revision: 35804
Added:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/FieldPostProcessor.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandPostProcessor.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandPostProcessorHelper.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/NewProjectPostProcessor.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/PersistencePostProcessor.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/PickUpPostProcessor.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/PrettyFacesPostProcessor.java
Removed:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/CommandRecorder.java
Modified:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/AllCommandsInterceptor.java
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/EventHandler.java
trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
Log:
JBIDE-9945: Refactor the Command Recorder So That Post Processing Becomes Cleaner
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF 2011-10-19 13:31:52 UTC (rev 35803)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF 2011-10-19 14:02:42 UTC (rev 35804)
@@ -9,6 +9,8 @@
modules/org/jboss/forge/shell-api/main/forge-shell-api.jar
Export-Package: javax.enterprise.event,
javax.inject,
+ org.jboss.forge.project,
+ org.jboss.forge.resources,
org.jboss.forge.shell,
org.jboss.forge.shell.command,
org.jboss.forge.shell.events,
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/AllCommandsInterceptor.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/AllCommandsInterceptor.java 2011-10-19 13:31:52 UTC (rev 35803)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/AllCommandsInterceptor.java 2011-10-19 14:02:42 UTC (rev 35804)
@@ -2,6 +2,7 @@
import javax.inject.Inject;
+import org.jboss.forge.project.Project;
import org.jboss.forge.shell.Shell;
import org.jboss.forge.shell.spi.CommandInterceptor;
@@ -14,7 +15,12 @@
@Override
public String intercept(String line) {
- sendEscaped("Intercepted Command: " + line);
+ Project project = shell.getCurrentProject();
+ String str = "no project";
+ if (project != null) {
+ str = project.getProjectRoot().getName();
+ }
+ sendEscaped("Intercepted Command: " + line + " Current Project Directory: " + str);
return line;
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/EventHandler.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/EventHandler.java 2011-10-19 13:31:52 UTC (rev 35803)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/EventHandler.java 2011-10-19 14:02:42 UTC (rev 35804)
@@ -3,6 +3,7 @@
import javax.enterprise.event.Observes;
import javax.inject.Inject;
+import org.jboss.forge.project.Project;
import org.jboss.forge.shell.Shell;
import org.jboss.forge.shell.events.CommandExecuted;
@@ -14,7 +15,12 @@
private Shell shell;
public void handleCommandExecuted(@Observes CommandExecuted event) {
- sendEscaped("Executed Command: " + event.getCommand().getName());
+ Project project = shell.getCurrentProject();
+ String str = "no project";
+ if (project != null) {
+ str = project.getProjectRoot().getName();
+ }
+ sendEscaped("Executed Command: " + event.getCommand().getName() + " Current Project Directory: " + str);
}
private void sendEscaped(String str) {
Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/CommandRecorder.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/CommandRecorder.java 2011-10-19 13:31:52 UTC (rev 35803)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/CommandRecorder.java 2011-10-19 14:02:42 UTC (rev 35804)
@@ -1,266 +0,0 @@
-package org.jboss.tools.forge.ui.console;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.jboss.tools.forge.importer.ProjectConfigurationUpdater;
-import org.jboss.tools.forge.importer.ProjectImporter;
-import org.jboss.tools.forge.ui.ForgeUIPlugin;
-
-public class CommandRecorder implements IDocumentListener {
-
- private StringBuffer buffer = new StringBuffer();
- private String beforePrompt = null;
- private String currentPrompt = null;
- private String currentCommand = null;
-
- @Override
- public void documentAboutToBeChanged(DocumentEvent event) {
- }
-
- @Override
- public void documentChanged(DocumentEvent event) {
- if (event.getLength() == 1 && "".equals(event.getText())) {
- buffer.setLength(buffer.length() - 1);
- } else {
- buffer.append(event.getText());
- String newPrompt = getNewPrompt();
- if (newPrompt != null) {
- currentPrompt = newPrompt;
- beforePrompt = buffer.substring(0, buffer.length() - newPrompt.length());
- buffer.setLength(0);
- if (currentCommand != null) {
- postProcessCurrentCommand();
- currentCommand = null;
- }
- } else {
- if (currentPrompt != null) {
- String newCommand = getNewCommand();
- if (newCommand != null) {
- currentCommand = newCommand;
- }
- }
- }
- }
- }
-
- private String getNewPrompt() {
- int lastLineBreak = buffer.lastIndexOf("\n");
- if (lastLineBreak == -1) return null;
- String lastLine = buffer.substring(lastLineBreak + 1);
- if (lastLine.length() == 0) return null;
- if (lastLine.charAt(0) != '[') return null;
- int rightBracketIndex = lastLine.indexOf(']');
- if (rightBracketIndex == -1) return null;
- return lastLine.endsWith("$ ") ? lastLine : null;
- }
-
- private String getNewCommand() {
- String candidateCommand = buffer.toString();
- if ("pwd".equals(candidateCommand)) {
- return "pwd";
- } else if ("new-project".equals(candidateCommand)) {
- return "new-project";
- } else if ("persistence".equals(candidateCommand)) {
- return "persistence";
- } else if ("entity".equals(candidateCommand)) {
- return "entity";
- } else if ("field".equals(candidateCommand)) {
- return "field";
- } else if ("prettyfaces".equals(candidateCommand)) {
- return "prettyfaces";
- } else if ("build".equals(candidateCommand)) {
- return "build";
- } else {
- return null;
- }
- }
-
- private void postProcessCurrentCommand() {
- IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
- String projectName = currentPrompt.substring(1, currentPrompt.indexOf(']'));
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if (project != null) {
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (CoreException e) {
- ForgeUIPlugin.log(e);
- }
- }
- if ("pwd".equals(currentCommand)) {
- // do nothing
- } else if ("new-project".equals(currentCommand)) {
- int index = beforePrompt.lastIndexOf("***SUCCESS*** Created project [");
- if (index == -1) return;
- if (index + 31 > beforePrompt.length()) return;
- String str = beforePrompt.substring(index + 31);
- index = str.lastIndexOf("] in new working directory [");
- if (index == -1) return;
- if (index + 28 > str.length()) return;
- str = str.substring(index + 28);
- index = str.indexOf("]");
- if (index == -1) return;
- String projectPath = str.substring(0, index);
- index = projectPath.lastIndexOf('/');
- String projectDirName = projectPath.substring(index + 1);
- String projectBaseDirPath = projectPath.substring(0, index);
- ProjectImporter importer = new ProjectImporter(projectBaseDirPath, projectDirName);
- importer.importProject();
- } else if ("persistence".equals(currentCommand)) {
- int index = beforePrompt.lastIndexOf("***SUCCESS*** Installed [forge.spec.jpa] successfully.\nWrote ");
- if (index == -1) return;
- try {
- IFile file = project.getFile("/src/main/resources/META-INF/persistence.xml");
- if (file == null) return;
- Object objectToSelect = file;
- IDE.openEditor(workbenchPage, file);
- IViewPart projectExplorer = workbenchPage.findView("org.eclipse.ui.navigator.ProjectExplorer");
- if (projectExplorer != null && projectExplorer instanceof ISetSelectionTarget) {
- ((ISetSelectionTarget)projectExplorer).selectReveal(new StructuredSelection(objectToSelect));
- }
- IViewPart packageExplorer = workbenchPage.findView("org.eclipse.jdt.ui.PackageExplorer");
- if (packageExplorer == null && projectExplorer == null) {
- packageExplorer = workbenchPage.showView("org.eclipse.jdt.ui.PackageExplorer");
- }
- if (packageExplorer != null && packageExplorer instanceof ISetSelectionTarget) {
- ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect));
- }
- } catch (PartInitException e) {
- ForgeUIPlugin.log(e);
- }
- } else if ("entity".equals(currentCommand)) {
- int index = beforePrompt.lastIndexOf("Picked up type <JavaResource>: ");
- if (index == -1) return;
- if (index + 31 > beforePrompt.length() -1) return;
- String entityName = beforePrompt.substring(index + 31, beforePrompt.length() - 1).replace('.', '/');
- try {
- IFile file = project.getFile("/src/main/java/" + entityName + ".java");
- if (file == null) return;
- Object objectToSelect = file;
- IDE.openEditor(workbenchPage, file);
- IJavaElement javaElement = JavaCore.create(file);
- if (javaElement != null && javaElement.getElementType() == IJavaElement.COMPILATION_UNIT) {
- try {
- objectToSelect = ((ICompilationUnit)javaElement).getTypes()[0];
- } catch (JavaModelException e) {
- ForgeUIPlugin.log(e);
- }
- }
- IViewPart projectExplorer = workbenchPage.findView("org.eclipse.ui.navigator.ProjectExplorer");
- if (projectExplorer != null && projectExplorer instanceof ISetSelectionTarget) {
- ((ISetSelectionTarget)projectExplorer).selectReveal(new StructuredSelection(objectToSelect));
- }
- IViewPart packageExplorer = workbenchPage.findView("org.eclipse.jdt.ui.PackageExplorer");
- if (packageExplorer == null && projectExplorer == null) {
- packageExplorer = workbenchPage.showView("org.eclipse.jdt.ui.PackageExplorer");
- }
- if (packageExplorer != null && packageExplorer instanceof ISetSelectionTarget) {
- ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect));
- }
- } catch (PartInitException e) {
- ForgeUIPlugin.log(e);
- }
- } else if ("field".equals(currentCommand)) {
- try {
- int index = beforePrompt.lastIndexOf("Added field to ");
- if (index == -1) return;
- if (index + 15 > beforePrompt.length()) return;
- String str = beforePrompt.substring(index + 15);
- index = str.indexOf(':');
- if (index == -1) return;
- String entityName = str.substring(0, index);
- str = str.substring(index);
- index = str.lastIndexOf(';');
- if (index == -1) return;
- str = str.substring(0, index);
- index = str.lastIndexOf(' ');
- if (index == -1) return;
- String fieldName = str.substring(index + 1);
- IFile file = project.getFile("/src/main/java/" + entityName.replace('.', '/') + ".java");
- if (file == null) return;
- IEditorPart editorPart = IDE.openEditor(workbenchPage, file);
- IJavaElement javaElement = JavaCore.create(file);
- if (javaElement != null && javaElement.getElementType() == IJavaElement.COMPILATION_UNIT) {
- try {
- IType type = ((ICompilationUnit)javaElement).getTypes()[0];
- IField field = type.getField(fieldName);
- if (field != null) {
- ISourceRange sourceRange = field.getSourceRange();
- if (sourceRange != null && editorPart != null && editorPart instanceof ITextEditor) {
- ((ITextEditor)editorPart).selectAndReveal(sourceRange.getOffset(), sourceRange.getLength());
- }
- }
- } catch (JavaModelException e) {
- ForgeUIPlugin.log(e);
- }
- }
- } catch (PartInitException e) {
- ForgeUIPlugin.log(e);
- }
- } else if ("prettyfaces".equals(currentCommand)) {
- int index = beforePrompt.lastIndexOf("***SUCCESS*** Installed [com.ocpsoft.prettyfaces] successfully.");
- if (index == -1) return;
- String str = beforePrompt.substring(0, index - 1);
- index = str.lastIndexOf("Wrote ");
- if (index == -1) return;
- if (index + 6 > str.length()) return;
- str = str.substring(index + 6);
- String projectLocation = project.getLocation().toString();
- index = str.lastIndexOf(projectLocation);
- if (index != 0) return;
- str = str.substring(projectLocation.length());
- IFile file = project.getFile(str);
- if (file == null) return;
- Object objectToSelect = file;
- new ProjectConfigurationUpdater(project).updateProject();
- try {
- IDE.openEditor(workbenchPage, file);
- IViewPart projectExplorer = workbenchPage.findView("org.eclipse.ui.navigator.ProjectExplorer");
- if (projectExplorer != null && projectExplorer instanceof ISetSelectionTarget) {
- ((ISetSelectionTarget)projectExplorer).selectReveal(new StructuredSelection(objectToSelect));
- }
- IViewPart packageExplorer = workbenchPage.findView("org.eclipse.jdt.ui.PackageExplorer");
- if (packageExplorer == null && projectExplorer == null) {
- packageExplorer = workbenchPage.showView("org.eclipse.jdt.ui.PackageExplorer");
- }
- if (packageExplorer != null && packageExplorer instanceof ISetSelectionTarget) {
- ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect));
- }
- } catch (PartInitException e) {
- ForgeUIPlugin.log(e);
- }
- } else if ("build".equals(currentCommand)) {
-
- } else {
-
- }
- try {
- workbenchPage.showView("org.jboss.tools.forge.console").setFocus();
- } catch (PartInitException e) {
- ForgeUIPlugin.log(e);
- }
- }
-
-}
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/FieldPostProcessor.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/FieldPostProcessor.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/FieldPostProcessor.java 2011-10-19 14:02:42 UTC (rev 35804)
@@ -0,0 +1,64 @@
+package org.jboss.tools.forge.ui.console;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IField;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.ISourceRange;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.jboss.tools.forge.ui.ForgeUIPlugin;
+
+public class FieldPostProcessor implements ForgeCommandPostProcessor {
+
+ @Override
+ public void postProcessCommand(String command, String output) {
+ try {
+ int index = output.lastIndexOf("Added field to ");
+ if (index == -1) return;
+ if (index + 15 > output.length()) return;
+ String str = output.substring(index + 15);
+ index = str.indexOf(':');
+ if (index == -1) return;
+ String entityName = str.substring(0, index);
+ str = str.substring(index);
+ index = str.lastIndexOf(';');
+ if (index == -1) return;
+ str = str.substring(0, index);
+ index = str.lastIndexOf(' ');
+ if (index == -1) return;
+ String fieldName = str.substring(index + 1);
+ IProject project = ForgeCommandPostProcessorHelper.getProject(command);
+ if (project == null) return;
+ IFile file = project.getFile("/src/main/java/" + entityName.replace('.', '/') + ".java");
+ if (file == null) return;
+ IJavaElement javaElement = JavaCore.create(file);
+ if (javaElement != null && javaElement.getElementType() == IJavaElement.COMPILATION_UNIT) {
+ try {
+ IType type = ((ICompilationUnit)javaElement).getTypes()[0];
+ IField field = type.getField(fieldName);
+ if (field != null) {
+ ISourceRange sourceRange = field.getSourceRange();
+ IWorkbenchPage workbenchPage = ForgeCommandPostProcessorHelper.getActiveWorkbenchPage();
+ IEditorPart editorPart = IDE.openEditor(workbenchPage, file);
+ if (sourceRange != null && editorPart != null && editorPart instanceof ITextEditor) {
+ ((ITextEditor)editorPart).selectAndReveal(sourceRange.getOffset(), sourceRange.getLength());
+ }
+ }
+ } catch (JavaModelException e) {
+ ForgeUIPlugin.log(e);
+ }
+ }
+ } catch (PartInitException e) {
+ ForgeUIPlugin.log(e);
+ }
+ }
+
+}
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandPostProcessor.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandPostProcessor.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandPostProcessor.java 2011-10-19 14:02:42 UTC (rev 35804)
@@ -0,0 +1,7 @@
+package org.jboss.tools.forge.ui.console;
+
+public interface ForgeCommandPostProcessor {
+
+ void postProcessCommand(String command, String str);
+
+}
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandPostProcessorHelper.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandPostProcessorHelper.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandPostProcessorHelper.java 2011-10-19 14:02:42 UTC (rev 35804)
@@ -0,0 +1,41 @@
+package org.jboss.tools.forge.ui.console;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+public class ForgeCommandPostProcessorHelper {
+
+ public static String getProjectName(String command) {
+ String result = null;
+ int i = command.indexOf("Current Project Directory: ");
+ if (i != -1 && command.length() >= i + 27) {
+ result = command.substring(i + 27).trim();
+ if ("".equals(result)) {
+ result = null;
+ }
+ }
+ return result;
+ }
+
+ public static IProject getProject(String command) {
+ IProject result = null;
+ String projectName = getProjectName(command);
+ if (projectName != null) {
+ result = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ }
+ return result;
+ }
+
+ public static IWorkbenchPage getActiveWorkbenchPage() {
+ IWorkbenchPage result = null;
+ IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ if (workbenchWindow != null) {
+ result = workbenchWindow.getActivePage();
+ }
+ return result;
+ }
+
+}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java 2011-10-19 13:31:52 UTC (rev 35803)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java 2011-10-19 14:02:42 UTC (rev 35804)
@@ -1,5 +1,92 @@
package org.jboss.tools.forge.ui.console;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.forge.ui.ForgeUIPlugin;
+
+
public class ForgeCommandProcessor {
-
+
+ static Map<String, ForgeCommandPostProcessor> POST_PROCESSORS = null;
+
+ public static Map<String, ForgeCommandPostProcessor> getPostProcessors() {
+ if (POST_PROCESSORS == null) {
+ POST_PROCESSORS = new HashMap<String, ForgeCommandPostProcessor>();
+ POST_PROCESSORS.put("new-project", new NewProjectPostProcessor());
+ POST_PROCESSORS.put("persistence", new PersistencePostProcessor());
+ POST_PROCESSORS.put("pick-up", new PickUpPostProcessor());
+ POST_PROCESSORS.put("field", new FieldPostProcessor());
+ POST_PROCESSORS.put("prettyfaces", new PrettyFacesPostProcessor());
+ }
+ return POST_PROCESSORS;
+ }
+
+ private String currentCommand;
+ private StringBuffer buffer = new StringBuffer();
+
+ public void startCommand(String command) {
+ buffer.setLength(0);
+ currentCommand = command;
+ }
+
+ public void stopCurrentCommand() {
+ if (currentCommand != null) {
+ postProcessCommand(currentCommand, buffer.toString());
+ }
+ currentCommand = null;
+ }
+
+ public void log(String str) {
+ if (currentCommand != null) {
+ buffer.append(str);
+ }
+ }
+
+ private void postProcessCommand(final String command, final String output) {
+ String mainCommand = command;
+ int i = mainCommand.indexOf(' ');
+ if (i != -1) {
+ mainCommand = command.substring(0, i);
+ }
+ final ForgeCommandPostProcessor postProcessor = getPostProcessors().get(mainCommand);
+ if (postProcessor != null) {
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ refreshWorkspace();
+ postProcessor.postProcessCommand(command, output);
+ showForgeConsole();
+ }
+ });
+ }
+ }
+
+ private void refreshWorkspace() {
+ try {
+ ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
+ } catch (CoreException e) {
+ ForgeUIPlugin.log(e);
+ }
+ }
+
+ private void showForgeConsole() {
+ try {
+ IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
+ workbenchPage.showView("org.jboss.tools.forge.console").setFocus();
+ } catch (PartInitException e) {
+ ForgeUIPlugin.log(e);
+ }
+
+ }
+
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-10-19 13:31:52 UTC (rev 35803)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-10-19 14:02:42 UTC (rev 35804)
@@ -64,6 +64,7 @@
}
}
+ private ForgeCommandProcessor commandProcessor;
private RuntimeStopListener stopListener;
private ForgeOutputListener outputListener;
private ForgeRuntime runtime;
@@ -80,7 +81,7 @@
private void initialize() {
initDocument();
initViewer();
- initCommandRecorder();
+ initForgeCommandProcessor();
initOutputListener();
initStopListener();
}
@@ -141,14 +142,15 @@
return Display.getDefault().getSystemColor(colorCode);
}
- private void initCommandRecorder() {
- getDocument().addDocumentListener(new CommandRecorder());
+ private void initForgeCommandProcessor() {
+ commandProcessor = new ForgeCommandProcessor();
}
private void initOutputListener() {
ForgeOutputListener target = new ForgeOutputListener() {
@Override
public void outputAvailable(final String output) {
+ commandProcessor.log(output);
Display.getDefault().asyncExec(new Runnable() {
@Override
public void run() {
@@ -176,12 +178,13 @@
outputListener = new ForgeHiddenOutputFilter(ansiCommandFilter) {
@Override
public void handleFilteredString(String str) {
+// System.out.println("handle filtered string: " + str);
if (str.startsWith("Intercepted Command: ")) {
-
+ commandProcessor.startCommand(str.substring(21));
} else if (str.startsWith("Executed Command: ")) {
-
- } else {
- System.out.println("unhandled hidden output: " + str);
+ commandProcessor.stopCurrentCommand();
+// } else {
+// System.out.println("unhandled hidden output: " + str);
}
}
};
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/NewProjectPostProcessor.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/NewProjectPostProcessor.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/NewProjectPostProcessor.java 2011-10-19 14:02:42 UTC (rev 35804)
@@ -0,0 +1,27 @@
+package org.jboss.tools.forge.ui.console;
+
+import org.jboss.tools.forge.importer.ProjectImporter;
+
+public class NewProjectPostProcessor implements ForgeCommandPostProcessor {
+
+ @Override
+ public void postProcessCommand(String command, String output) {
+ int index = output.lastIndexOf("***SUCCESS*** Created project [");
+ if (index == -1) return;
+ if (index + 31 > output.length()) return;
+ output = output.substring(index + 31);
+ index = output.lastIndexOf("] in new working directory [");
+ if (index == -1) return;
+ if (index + 28 > output.length()) return;
+ output = output.substring(index + 28);
+ index = output.indexOf("]");
+ if (index == -1) return;
+ String projectPath = output.substring(0, index);
+ index = projectPath.lastIndexOf('/');
+ String projectDirName = projectPath.substring(index + 1);
+ String projectBaseDirPath = projectPath.substring(0, index);
+ ProjectImporter importer = new ProjectImporter(projectBaseDirPath, projectDirName);
+ importer.importProject();
+ }
+
+}
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/PersistencePostProcessor.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/PersistencePostProcessor.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/PersistencePostProcessor.java 2011-10-19 14:02:42 UTC (rev 35804)
@@ -0,0 +1,50 @@
+package org.jboss.tools.forge.ui.console;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.part.ISetSelectionTarget;
+import org.jboss.tools.forge.ui.ForgeUIPlugin;
+
+public class PersistencePostProcessor implements ForgeCommandPostProcessor {
+
+ @Override
+ public void postProcessCommand(String command, String output) {
+ if (command.indexOf("setup") != -1) {
+ postProcessPersistenceSetup(command, output);
+ }
+ }
+
+ private void postProcessPersistenceSetup(final String command, final String output) {
+ IProject project = ForgeCommandPostProcessorHelper.getProject(command);
+ if (project == null) return;
+ int index = output.lastIndexOf("***SUCCESS***");
+ if (index == -1) return;
+ try {
+ IFile file = project.getFile("/src/main/resources/META-INF/persistence.xml");
+ if (file == null) return;
+ Object objectToSelect = file;
+ IWorkbenchPage workbenchPage = ForgeCommandPostProcessorHelper.getActiveWorkbenchPage();
+ IDE.openEditor(workbenchPage, file);
+ IViewPart projectExplorer = workbenchPage.findView("org.eclipse.ui.navigator.ProjectExplorer");
+ if (projectExplorer != null && projectExplorer instanceof ISetSelectionTarget) {
+ ((ISetSelectionTarget)projectExplorer).selectReveal(new StructuredSelection(objectToSelect));
+ }
+ IViewPart packageExplorer = workbenchPage.findView("org.eclipse.jdt.ui.PackageExplorer");
+ if (packageExplorer == null && projectExplorer == null) {
+ packageExplorer = workbenchPage.showView("org.eclipse.jdt.ui.PackageExplorer");
+ }
+ if (packageExplorer != null && packageExplorer instanceof ISetSelectionTarget) {
+ ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect));
+ }
+ } catch (PartInitException e) {
+ ForgeUIPlugin.log(e);
+ }
+ }
+
+
+}
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/PickUpPostProcessor.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/PickUpPostProcessor.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/PickUpPostProcessor.java 2011-10-19 14:02:42 UTC (rev 35804)
@@ -0,0 +1,59 @@
+package org.jboss.tools.forge.ui.console;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.part.ISetSelectionTarget;
+import org.jboss.tools.forge.ui.ForgeUIPlugin;
+
+public class PickUpPostProcessor implements ForgeCommandPostProcessor {
+
+ @Override
+ public void postProcessCommand(final String command, final String output) {
+ IProject project = ForgeCommandPostProcessorHelper.getProject(command);
+ if (project == null) return;
+ int index = output.lastIndexOf("Picked up type <JavaResource>: ");
+ if (index == -1) return;
+ if (index + 31 > output.length() -1) return;
+ String entityName = output.substring(index + 31, output.length() - 1).replace('.', '/');
+ try {
+ IFile file = project.getFile("/src/main/java/" + entityName + ".java");
+ if (file == null) return;
+ Object objectToSelect = file;
+ IWorkbenchPage workbenchPage = ForgeCommandPostProcessorHelper.getActiveWorkbenchPage();
+ if (workbenchPage == null) return;
+ IDE.openEditor(workbenchPage, file);
+ IJavaElement javaElement = JavaCore.create(file);
+ if (javaElement != null && javaElement.getElementType() == IJavaElement.COMPILATION_UNIT) {
+ try {
+ objectToSelect = ((ICompilationUnit)javaElement).getTypes()[0];
+ } catch (JavaModelException e) {
+ ForgeUIPlugin.log(e);
+ }
+ }
+ IViewPart projectExplorer = workbenchPage.findView("org.eclipse.ui.navigator.ProjectExplorer");
+ if (projectExplorer != null && projectExplorer instanceof ISetSelectionTarget) {
+ ((ISetSelectionTarget)projectExplorer).selectReveal(new StructuredSelection(objectToSelect));
+ }
+ IViewPart packageExplorer = workbenchPage.findView("org.eclipse.jdt.ui.PackageExplorer");
+ if (packageExplorer == null && projectExplorer == null) {
+ packageExplorer = workbenchPage.showView("org.eclipse.jdt.ui.PackageExplorer");
+ }
+ if (packageExplorer != null && packageExplorer instanceof ISetSelectionTarget) {
+ ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect));
+ }
+ } catch (PartInitException e) {
+ ForgeUIPlugin.log(e);
+ }
+ }
+
+
+}
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/PrettyFacesPostProcessor.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/PrettyFacesPostProcessor.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/PrettyFacesPostProcessor.java 2011-10-19 14:02:42 UTC (rev 35804)
@@ -0,0 +1,53 @@
+package org.jboss.tools.forge.ui.console;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.part.ISetSelectionTarget;
+import org.jboss.tools.forge.importer.ProjectConfigurationUpdater;
+import org.jboss.tools.forge.ui.ForgeUIPlugin;
+
+public class PrettyFacesPostProcessor implements ForgeCommandPostProcessor {
+
+ @Override
+ public void postProcessCommand(String command, String output) {
+ IProject project = ForgeCommandPostProcessorHelper.getProject(command);
+ int index = output.lastIndexOf("***SUCCESS*** Installed [com.ocpsoft.prettyfaces] successfully.");
+ if (index == -1) return;
+ String str = output.substring(0, index - 1);
+ index = str.lastIndexOf("Wrote ");
+ if (index == -1) return;
+ if (index + 6 > str.length()) return;
+ str = str.substring(index + 6);
+ String projectLocation = project.getLocation().toString();
+ index = str.lastIndexOf(projectLocation);
+ if (index != 0) return;
+ str = str.substring(projectLocation.length());
+ IFile file = project.getFile(str);
+ if (file == null) return;
+ Object objectToSelect = file;
+ new ProjectConfigurationUpdater(project).updateProject();
+ try {
+ IWorkbenchPage workbenchPage = ForgeCommandPostProcessorHelper.getActiveWorkbenchPage();
+ IDE.openEditor(workbenchPage, file);
+ IViewPart projectExplorer = workbenchPage.findView("org.eclipse.ui.navigator.ProjectExplorer");
+ if (projectExplorer != null && projectExplorer instanceof ISetSelectionTarget) {
+ ((ISetSelectionTarget)projectExplorer).selectReveal(new StructuredSelection(objectToSelect));
+ }
+ IViewPart packageExplorer = workbenchPage.findView("org.eclipse.jdt.ui.PackageExplorer");
+ if (packageExplorer == null && projectExplorer == null) {
+ packageExplorer = workbenchPage.showView("org.eclipse.jdt.ui.PackageExplorer");
+ }
+ if (packageExplorer != null && packageExplorer instanceof ISetSelectionTarget) {
+ ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect));
+ }
+ } catch (PartInitException e) {
+ ForgeUIPlugin.log(e);
+ }
+ }
+
+}
13 years, 2 months
- 1
- 0
JBoss Tools SVN: r35803 - 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-19 09:31:52 -0400 (Wed, 19 Oct 2011)
New Revision: 35803
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/AdapterWizardPageModel.java
Log:
[JBIDE-9943] disabling git-uri and host widgets + "Finish" while loading
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-19 12:39:25 UTC (rev 35802)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-19 13:31:52 UTC (rev 35803)
@@ -18,7 +18,11 @@
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.UpdateValueStrategy;
import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.conversion.Converter;
import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.WritableValue;
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.databinding.validation.ValidationStatus;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -42,7 +46,6 @@
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
@@ -63,14 +66,13 @@
import org.jboss.tools.common.ui.databinding.DataBindingUtils;
import org.jboss.tools.common.ui.databinding.InvertingBooleanConverter;
import org.jboss.tools.common.ui.ssh.SshPrivateKeysPreferences;
-import org.jboss.tools.openshift.express.client.IApplication;
import org.jboss.tools.openshift.express.client.ICartridge;
import org.jboss.tools.openshift.express.client.OpenShiftException;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
public class AdapterWizardPage extends AbstractOpenShiftWizardPage implements IWizardPage, PropertyChangeListener {
private Text gitUriValueText;
-
+
private AdapterWizardPageModel model;
private Combo suitableRuntimes;
private IServerType serverTypeToCreate;
@@ -118,18 +120,41 @@
gitUriValueText = new Text(cloneGroup, SWT.BORDER);
gitUriValueText.setEditable(false);
-// gitUriValueText.setBackground(cloneGroup.getBackground());
- GridDataFactory.fillDefaults().span(3, 1).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(gitUriValueText);
+ // gitUriValueText.setBackground(cloneGroup.getBackground());
+ GridDataFactory.fillDefaults().span(3, 1).align(SWT.FILL, SWT.CENTER).grab(true, false)
+ .applyTo(gitUriValueText);
dbc.bindValue(
WidgetProperties.text(SWT.Modify).observe(gitUriValueText)
, BeanProperties.value(AdapterWizardPageModel.PROPERTY_GIT_URI).observe(model)
, new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)
, null);
-
+ dbc.bindValue(
+ WidgetProperties.enabled().observe(gitUriValueText)
+ , BeanProperties.value(AdapterWizardPageModel.PROPERTY_LOADING).observe(model)
+ , new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)
+ , new UpdateValueStrategy().setConverter(new InvertingBooleanConverter()));
+
+ // bind loading state to page complete
+ dbc.bindValue(
+ new WritableValue(false, Boolean.class)
+ , BeanProperties.value(AdapterWizardPageModel.PROPERTY_LOADING).observe(model)
+ , new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)
+ , new UpdateValueStrategy().setAfterGetValidator(new IValidator() {
+
+ @Override
+ public IStatus validate(Object value) {
+ if (Boolean.FALSE.equals(value)) {
+ return ValidationStatus.ok();
+ } else {
+ return ValidationStatus.cancel("Loading...");
+ }
+ }
+ }));
+
Label repoPathLabel = new Label(cloneGroup, SWT.NONE);
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(repoPathLabel);
repoPathLabel.setText("Destination");
-
+
Button defaultRepoPathButton = new Button(cloneGroup, SWT.CHECK);
defaultRepoPathButton.setText("default");
GridDataFactory.fillDefaults()
@@ -257,7 +282,7 @@
suitableRuntimes.setEnabled(enabled);
runtimeLabel.setEnabled(enabled);
addRuntimeLink.setEnabled(enabled);
- domainLabel.setEnabled(enabled);
+ // domainLabel.setEnabled(enabled);
modeLabel.setEnabled(enabled);
}
@@ -286,6 +311,23 @@
addRuntimeLink.setText("<a>" + Messages.addRuntime + "</a>");
domainLabel = new Label(c, SWT.NONE);
+ DataBindingContext dbc = getDatabindingContext();
+ dbc.bindValue(
+ WidgetProperties.text().observe(domainLabel)
+ , BeanProperties.value(AdapterWizardPageModel.PROPERTY_APPLICATION_URL).observe(model)
+ , new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)
+ , new UpdateValueStrategy().setConverter(new Converter(String.class, String.class) {
+
+ @Override
+ public Object convert(Object fromObject) {
+ String host = "";
+ if (fromObject instanceof String && ((String) fromObject).length() > 0) {
+ host = (String) fromObject;
+ }
+ return "Host: " + host;
+ }
+
+ }));
// appLabel = new Label(c, SWT.NONE);
modeLabel = new Label(c, SWT.NONE);
@@ -360,8 +402,6 @@
}
protected void onPageActivated(DataBindingContext dbc) {
- gitUriValueText.setEnabled(false);
- gitUriValueText.setText("Loading...");
model.resetRepositoryPath();
serverTypeToCreate = getServerTypeToCreate();
@@ -375,34 +415,20 @@
addRuntimeLink.setEnabled(type != null);
modeLabel.setText("Mode: Source");
model.getParentModel().setProperty(AdapterWizardPageModel.MODE, AdapterWizardPageModel.MODE_SOURCE);
-
+
setPageComplete(false);
getWizard().getContainer().updateButtons();
onPageActivatedBackground(dbc);
}
-
- protected void onPageActivatedBackground2(DataBindingContext dbc) throws OpenShiftException {
- model.updateGitUri();
- gitUriValueText.setEnabled(true);
- domainLabel.setText("Host: " + model.getParentModel().getApplication().getApplicationUrl());
- setPageComplete(true);
- getWizard().getContainer().updateButtons();
- }
-
+
protected void onPageActivatedBackground(final DataBindingContext dbc) {
new Job("Loading remote OpenShift application") {
public IStatus run(IProgressMonitor monitor) {
- final IApplication application = model.getParentModel().getApplication();
- if (application != null) {
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- try {
- onPageActivatedBackground2(dbc);
- } catch( OpenShiftException e) {
- OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(e.getMessage(), e));
- }
- }
- });
+ try {
+ model.loadGitUri();
+ model.loadApplicationUrl();
+ } catch (OpenShiftException e) {
+ OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(e.getMessage(), e));
}
return Status.OK_STATUS;
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-10-19 12:39:25 UTC (rev 35802)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-10-19 13:31:52 UTC (rev 35803)
@@ -25,8 +25,10 @@
private static final String REMOTE_NAME_DEFAULT = "origin";
public static final String PROPERTY_GIT_URI = "gitUri";
+ public static final String PROPERTY_APPLICATION_URL = "applicationUrl";
public static final String PROPERTY_REPO_PATH = "repositoryPath";
public static final String PROPERTY_REMOTE_NAME = "remoteName";
+ public static final String PROPERTY_LOADING = "loading";
public static final String CREATE_SERVER = "createServer";
public static final String MODE = "serverMode";
@@ -36,28 +38,53 @@
public static final String SERVER_TYPE = "serverType";
private ImportProjectWizardModel wizardModel;
- private String gitUri;
+// private String gitUri;
+// private String applicationUrl;
+ private boolean loading;
public AdapterWizardPageModel(ImportProjectWizardModel wizardModel) {
this.wizardModel = wizardModel;
setRemoteName(REMOTE_NAME_DEFAULT);
}
- public void updateGitUri() throws OpenShiftException {
+ public void loadGitUri() throws OpenShiftException {
+ setLoading(true);
+ setGitUri(null);
+ setGitUri(getGitUri());
+ setLoading(false);
+ }
+
+ private void setGitUri(String gitUri) {
+ firePropertyChange(PROPERTY_GIT_URI, null, gitUri);
+ }
+
+ public String getGitUri() throws OpenShiftException {
IApplication application = wizardModel.getApplication();
- if (application != null) {
- setGitUri(application.getGitUri());
+ if (application == null) {
+ return null;
}
+ return application.getGitUri();
}
- public void setGitUri(String gitUri) {
- firePropertyChange(PROPERTY_GIT_URI, this.gitUri, this.gitUri = gitUri);
+ public void loadApplicationUrl() throws OpenShiftException {
+ setLoading(true);
+ setApplicationUrl(null);
+ setApplicationUrl(getApplicationUrl());
+ setLoading(false);
}
- public String getGitUri() {
- return this.gitUri;
+ public String getApplicationUrl() throws OpenShiftException {
+ IApplication application = wizardModel.getApplication();
+ if (application == null) {
+ return null;
+ }
+ return application.getApplicationUrl();
}
+ public void setApplicationUrl(String applicationUrl) {
+ firePropertyChange(PROPERTY_APPLICATION_URL, null, applicationUrl);
+ }
+
public String getRepositoryPath() {
return wizardModel.getRepositoryPath();
}
@@ -98,4 +125,13 @@
public ImportProjectWizardModel getParentModel() {
return wizardModel;
}
+
+ public boolean isLoading() {
+ return loading;
+ }
+
+ public void setLoading(boolean loading) {
+ firePropertyChange(PROPERTY_LOADING, this.loading, this.loading = loading);
+ }
+
}
13 years, 2 months
- 1
- 0