JBoss Tools SVN: r36103 - in trunk/build/aggregate: site and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-31 21:23:36 -0400 (Mon, 31 Oct 2011)
New Revision: 36103
Modified:
trunk/build/aggregate/bottests-site/site/index-template.html
trunk/build/aggregate/site/index-template.html
trunk/build/aggregate/soa-site/index-template.html
trunk/build/aggregate/webtools-site/index-template.html
Log:
JBIDE-10047 add instructions for installation; remove links to 3rd party sites (no longer needed)
Modified: trunk/build/aggregate/bottests-site/site/index-template.html
===================================================================
--- trunk/build/aggregate/bottests-site/site/index-template.html 2011-11-01 01:12:16 UTC (rev 36102)
+++ trunk/build/aggregate/bottests-site/site/index-template.html 2011-11-01 01:23:36 UTC (rev 36103)
@@ -30,16 +30,44 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
- Update Site for JBoss Tools - Bot Tests. See <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
- Instructions</a>.</p>
- </td>
- </tr>
+ Update Site for JBoss Tools - Bot Tests.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+
+ <!--
<tr class="dark-row" style="height: 90px">
<td class="bodyText">
<p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
-<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
</p>
@@ -50,18 +78,8 @@
</ul>
</td>
</tr>
+ -->
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">You can also download JBoss Tools as
- individual zips for offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br/>
- If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
- </td>
- </tr>
</table>
</td>
<td>      </td>
Modified: trunk/build/aggregate/site/index-template.html
===================================================================
--- trunk/build/aggregate/site/index-template.html 2011-11-01 01:12:16 UTC (rev 36102)
+++ trunk/build/aggregate/site/index-template.html 2011-11-01 01:23:36 UTC (rev 36103)
@@ -30,16 +30,44 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
- Update Site for JBoss Tools. See <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
- Instructions</a>.</p>
- </td>
- </tr>
+ Update Site for JBoss Tools.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+
+ <!--
<tr class="dark-row" style="height: 90px">
<td class="bodyText">
<p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
-<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
</p>
@@ -49,18 +77,8 @@
</ul>
</td>
</tr>
+ -->
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">You can also download JBoss Tools as
- individual zips for offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br/>
- If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
- </td>
- </tr>
</table>
</td>
<td>      </td>
Modified: trunk/build/aggregate/soa-site/index-template.html
===================================================================
--- trunk/build/aggregate/soa-site/index-template.html 2011-11-01 01:12:16 UTC (rev 36102)
+++ trunk/build/aggregate/soa-site/index-template.html 2011-11-01 01:23:36 UTC (rev 36103)
@@ -30,16 +30,44 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
- Update Site for JBoss Tools - SOA Tooling. See <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
- Instructions</a>.</p>
- </td>
- </tr>
+ Update Site for JBoss Tools - SOA Tooling.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+
+ <!--
<tr class="dark-row" style="height: 90px">
<td class="bodyText">
<p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
-<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
</p>
@@ -49,18 +77,8 @@
</ul>
</td>
</tr>
+ -->
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">You can also download JBoss Tools as
- individual zips for offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br/>
- If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
- </td>
- </tr>
</table>
</td>
<td>      </td>
Modified: trunk/build/aggregate/webtools-site/index-template.html
===================================================================
--- trunk/build/aggregate/webtools-site/index-template.html 2011-11-01 01:12:16 UTC (rev 36102)
+++ trunk/build/aggregate/webtools-site/index-template.html 2011-11-01 01:23:36 UTC (rev 36103)
@@ -6,67 +6,101 @@
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
-<center>
-<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0" width="920" class="bodyText">
- <tr>
- <td colspan="3"><img
- src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
- </tr>
- <tr>
- <td>      </td>
- <td>      </td>
- <td>      </td>
- </tr>
- <tr>
- <td>      </td>
- <td>
- <h2 class="title">JBoss Tools - Web Tools - ${update.site.description} Update Site</h2>
- <table width="100%">
- <tr class="header">
- <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td>
+ <center>
+ <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0" width="920" class="bodyText">
+ <tr>
+ <td colspan="3"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
</tr>
-
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">This is the <b>${update.site.description}</b>
- Update Site for JBoss Tools - Web Tools. See <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
- Instructions</a>.</p>
- </td>
+ <tr>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
</tr>
+ <tr>
+ <td>      </td>
+ <td>
+ <h2 class="title">JBoss Tools - Web Tools - ${update.site.description} Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td>
+ </tr>
- <tr class="dark-row" style="height: 90px">
- <td class="bodyText">
- <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
-<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
-Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
- </p>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>${update.site.description}</b>
+ Update Site for JBoss Tools - Web Tools.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
- <ul>
- <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR1">JBoss Tools Requirements - Composite Mirror - Indigo SR1</a></li>
- <li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li>
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+
+ <!--
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">
+ <b class="bodyText" style="color: red;">NOTE:</b>
+ Some features (such as BIRT, Maven, or GWT) require additional
+ third-party prerequisites not available from Eclipse.org or
+ JBoss.org. These can be installed from the following composite
+ update site mirror, which should be added automatically when
+ you add the JBoss Tools update site to your Eclipse's list of
+ Available Software Sites. To verify which sites are enabled,
+ open
+ <code>
+ <strong>Window > Preferences
+ > Install/Update > Available Software Sites</strong>
+ </code>
+ . To add sites, Click the
+ <code>
+ <strong>Add...</strong>
+ </code>
+ button, then right-click the link(s) below, copy the link(s),
+ and paste them into Eclipse one by one as needed.
+ </p>
+
+ <ul>
+ <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR1">JBoss Tools Requirements - Composite Mirror - Indigo SR1</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li>
</ul>
</td>
</tr>
-
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">You can also download JBoss Tools as
- individual zips for offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br/>
- If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
+ -->
+ </table>
</td>
+ <td>      </td>
</tr>
- </table>
- </td>
- <td>      </td>
- </tr>
- <tr>
- <td></td>
+ <tr>
+ <td></td>
<td>
${site.contents}
</td>
@@ -128,7 +162,7 @@
</tr>
</table>
</td>
- </tr>
-</table>
-</center>
+ </tr>
+ </table>
+ </center>
</html>
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36102 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-31 21:12:16 -0400 (Mon, 31 Oct 2011)
New Revision: 36102
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessagesComponent.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessagesLoader.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java
Log:
JBIDE-9910
https://issues.jboss.org/browse/JBIDE-9910
Property objects are bound to proposals for 'messages' component.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java 2011-11-01 00:37:39 UTC (rev 36101)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java 2011-11-01 01:12:16 UTC (rev 36102)
@@ -11,9 +11,11 @@
package org.jboss.tools.seam.core;
import java.util.Collection;
+import java.util.List;
import java.util.Map;
import org.eclipse.core.resources.IResource;
+import org.jboss.tools.common.model.XModelObject;
/**
* @author Viacheslav Kabanovich
@@ -32,10 +34,11 @@
*/
public Collection<ISeamProperty> getProperties();
- /**
+ /**
+ * Intruduced instead of getProperties() - as much more lightweight in implementation.
*
- * @return map of properties and corresponding resources
+ * @return
*/
- public Map<String, IResource> getResourcesMap();
+ public Map<String, List<XModelObject>> getPropertiesMap();
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java 2011-11-01 00:37:39 UTC (rev 36101)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java 2011-11-01 01:12:16 UTC (rev 36102)
@@ -16,6 +16,7 @@
import java.util.Properties;
import org.eclipse.core.resources.IResource;
+import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.project.ext.event.Change;
import org.jboss.tools.seam.core.ISeamElement;
import org.jboss.tools.seam.core.ISeamMessages;
@@ -38,14 +39,14 @@
return messagesLoader.getProperties();
}
+ public Map<String, List<XModelObject>> getPropertiesMap() {
+ return messagesLoader.getPropertiesMap();
+ }
+
public Collection<String> getPropertyNames() {
- return messagesLoader.getPropertyNames();
+ return messagesLoader.getPropertiesMap().keySet();
}
- public Map<String, IResource> getResourcesMap() {
- return messagesLoader.getResources();
- }
-
public SeamMessages clone() throws CloneNotSupportedException {
SeamMessages c = (SeamMessages)super.clone();
return c;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessagesComponent.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessagesComponent.java 2011-11-01 00:37:39 UTC (rev 36101)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessagesComponent.java 2011-11-01 01:12:16 UTC (rev 36102)
@@ -16,6 +16,7 @@
import java.util.Properties;
import org.eclipse.core.resources.IResource;
+import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.project.ext.event.Change;
import org.jboss.tools.seam.core.ISeamElement;
import org.jboss.tools.seam.core.ISeamMessages;
@@ -34,9 +35,13 @@
}
public Collection<String> getPropertyNames() {
- return messagesLoader.getPropertyNames();
+ return messagesLoader.getPropertiesMap().keySet();
}
+ public Map<String, List<XModelObject>> getPropertiesMap() {
+ return messagesLoader.getPropertiesMap();
+ }
+
public SeamMessagesComponent clone() throws CloneNotSupportedException {
return this;
}
@@ -52,8 +57,4 @@
return changes;
}
- public Map<String, IResource> getResourcesMap() {
- return messagesLoader.getResources();
- }
-
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessagesLoader.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessagesLoader.java 2011-11-01 00:37:39 UTC (rev 36101)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessagesLoader.java 2011-11-01 01:12:16 UTC (rev 36102)
@@ -10,23 +10,20 @@
******************************************************************************/
package org.jboss.tools.seam.internal.core;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.Set;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.XModelObjectConstants;
+import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamElement;
@@ -42,10 +39,19 @@
* @author Viacheslav Kabanovich
*/
public class SeamMessagesLoader {
- static Map<String, IResource> EMPTY = new HashMap<String, IResource>();
- Map<String, IResource> resources = EMPTY; // Maps the bundleName to the IResource
+ static class MessageBundle {
+ String bundle;
+ List<XModelObject> files = new ArrayList<XModelObject>();
+ MessageBundle(String bundle, List<XModelObject> files) {
+ this.bundle = bundle;
+ this.files = files;
+ }
+ }
+ static List<MessageBundle> EMPTY = new ArrayList<MessageBundle>();
+ List<MessageBundle> resources = EMPTY; // Maps the bundleName to the IResource
Map<String, Long> timestamps = null;
Set<String> keys = null;
+ Map<String, List<XModelObject>> properties = null;
ISeamElement object;
@@ -61,40 +67,55 @@
}
public void revalidate() {
- Map<String, IResource> resources2 = getResources();
+ List<MessageBundle> resources2 = getResources();
if(changed(resources2)) {
timestamps = new HashMap<String, Long>();
- for (String n : resources2.keySet()) {
- IResource r = resources2.get(n);
- timestamps.put(n, r.getLocalTimeStamp());
+ for (int i = 0; i < resources2.size(); i++) {
+ List<XModelObject> r = resources2.get(i).files;
+ long q = 0;
+ for (XModelObject o: r) q += o.getTimeStamp();
+ timestamps.put(resources2.get(i).bundle, q);
}
resources = resources2;
keys = null;
+ properties = null;
}
}
- private boolean changed(Map<String, IResource> resources2) {
+ private boolean changed(List<MessageBundle> resources2) {
if(resources == resources2) return false;
if(resources2.size() != resources.size()) return true;
if(timestamps == null) return true;
- for (String s: resources2.keySet()) {
- IResource r2 = resources2.get(s);
- IResource r1 = resources.get(s);
- if(r1 == null || !r2.equals(r1)) return true;
- long l1 = r1.getLocalTimeStamp();
- Long l2 = timestamps.get(s);
+ for (int i = 0; i < resources2.size(); i++) {
+ List<XModelObject> r2 = resources2.get(i).files;
+ List<XModelObject> r1 = resources.get(i).files;
+ if(r1 == null || r2.size() == r1.size()) return true;
+ long l1 = 0;
+ for (XModelObject o: r1) l1 += o.getTimeStamp();
+ Long l2 = timestamps.get(resources2.get(i).bundle);
if(l2 == null || l1 != l2.longValue()) return true;
}
return false;
}
- public Map<String, IResource> getResources() {
+ public List<MessageBundle> getResources() {
ISeamProject p = object.getSeamProject();
if(p == null) return EMPTY;
IResource[] srcs = EclipseResourceUtil.getJavaSourceRoots(p.getProject());
+ List<String> names = getNames();
+ return names.isEmpty() ? EMPTY : getResources(names, srcs);
+ }
+
+ private List<String> getNames() {
+ ISeamProject p = object.getSeamProject();
+ if(p == null) {
+ return new ArrayList<String>();
+ }
ISeamComponent c = p.getComponent(resourceComponent);
- if(c == null) return EMPTY;
+ if(c == null) {
+ return new ArrayList<String>();
+ }
List<String> names = new ArrayList<String>();
Set<ISeamXmlComponentDeclaration> ds = c.getXmlDeclarations();
for (ISeamXmlComponentDeclaration d: ds) {
@@ -123,46 +144,37 @@
if(ds.isEmpty()) {
names.add("messages");
}
- return getResources(names, srcs);
+ return names;
}
public Collection<ISeamProperty> getProperties() {
throw new IllegalStateException("Not implemented");
}
- public Collection<String> getPropertyNames() {
- if(keys == null) {
- keys = new HashSet<String>();
- for (IResource r: resources.values()) {
- IPath p = r.getLocation();
- if(p == null) continue;
- File f = p.toFile();
- Properties properties = new Properties();
- FileInputStream is = null;
- try {
- is = new FileInputStream(f);
- properties.load(is);
- } catch (IOException e) {
- //ignore
- //TODO keep error for validation
- } finally {
- if(is!=null) {
- try {
- is.close();
- } catch (IOException e) {
- // ignore
+ public Map<String, List<XModelObject>> getPropertiesMap() {
+ if(properties == null) {
+ properties = new HashMap<String, List<XModelObject>>();
+ for (int i = 0; i < resources.size(); i++) {
+ List<XModelObject> list = resources.get(i).files;
+ for (XModelObject o: list) {
+ XModelObject[] ps = o.getChildren();
+ for (XModelObject p: ps) {
+ String propertyName = p.getAttributeValue(XModelObjectConstants.ATTR_NAME);
+ List<XModelObject> vs = properties.get(propertyName);
+ if(vs == null) {
+ vs = new ArrayList<XModelObject>();
+ properties.put(propertyName, vs);
}
+ vs.add(p);
}
}
- Set<?> s = properties.keySet();
- for (Object o : s) keys.add((String)o);
}
}
- return keys;
+ return properties;
}
- private Map<String, IResource> getResources(List<String> names, IResource[] srcs) {
- Map<String, IResource> rs = new HashMap<String, IResource>();
+ private List<MessageBundle> getResources(List<String> names, IResource[] srcs) {
+ List<MessageBundle> rs = new ArrayList<MessageBundle>();
for (String name: names) {
String n = name.replace('.', '/');
int k = n.lastIndexOf('/');
@@ -173,7 +185,19 @@
result = find(p, n, srcs[j]);
}
if(result != null) {
- rs.put(name, result);
+ List<XModelObject> l = new ArrayList<XModelObject>();
+ XModelObject o = EclipseResourceUtil.createObjectForResource(result);
+ if(o != null) {
+ XModelObject[] os = o.getParent().getChildren();
+ String dn = o.getAttributeValue(XModelObjectConstants.ATTR_NAME);
+ for (XModelObject c: os) {
+ String fileName = FileAnyImpl.toFileName(c);
+ if(fileName.endsWith(".properties") && (c == o || fileName.startsWith(dn + "_"))) {
+ l.add(c);
+ }
+ }
+ rs.add(new MessageBundle(name, l));
+ }
}
}
return rs;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2011-11-01 00:37:39 UTC (rev 36101)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2011-11-01 01:12:16 UTC (rev 36102)
@@ -14,6 +14,7 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@@ -26,6 +27,7 @@
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine;
import org.jboss.tools.common.el.core.ca.MessagesELTextProposal;
+import org.jboss.tools.common.el.core.model.ELArgumentInvocation;
import org.jboss.tools.common.el.core.model.ELExpression;
import org.jboss.tools.common.el.core.model.ELInstance;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
@@ -36,18 +38,18 @@
import org.jboss.tools.common.el.core.parser.ELParserFactory;
import org.jboss.tools.common.el.core.parser.ELParserUtil;
import org.jboss.tools.common.el.core.resolver.ELResolution;
+import org.jboss.tools.common.el.core.resolver.ELResolutionImpl;
import org.jboss.tools.common.el.core.resolver.ELSegment;
import org.jboss.tools.common.el.core.resolver.ElVarSearcher;
import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment;
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector;
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo;
import org.jboss.tools.common.el.core.resolver.Var;
-import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.project.IModelNature;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.model.XModelObjectConstants;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.text.TextProposal;
-import org.jboss.tools.jsf.model.helpers.converter.OpenKeyHelper;
+import org.jboss.tools.jst.web.kb.el.MessagePropertyELSegmentImpl;
import org.jboss.tools.seam.core.IBijectedAttribute;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamContextShortVariable;
@@ -190,39 +192,190 @@
return (mbr instanceof MessagesInfo);
}
+ protected void resolveLastSegment(ELInvocationExpression expr,
+ List<TypeInfoCollector.MemberInfo> members,
+ ELResolutionImpl resolution,
+ boolean returnEqualedVariablesOnly, boolean varIsUsed) {
+ if(resolveLastSegmentInMessages(expr, members, resolution, returnEqualedVariablesOnly, varIsUsed)) {
+ return;
+ } else {
+ super.resolveLastSegment(expr, members, resolution, returnEqualedVariablesOnly, varIsUsed);
+ }
+ }
+
+ private boolean resolveLastSegmentInMessages(ELInvocationExpression expr,
+ List<TypeInfoCollector.MemberInfo> members,
+ ELResolutionImpl resolution,
+ boolean returnEqualedVariablesOnly, boolean varIsUsed) {
+ if(members.isEmpty() || !(members.get(0) instanceof MessagesInfo)) {
+ return false;
+ }
+ MessagesInfo messagesInfo = ((MessagesInfo)members.get(0));
+ MessagePropertyELSegmentImpl segment = null;
+ if(expr instanceof ELPropertyInvocation) {
+ segment = new MessagePropertyELSegmentImpl(((ELPropertyInvocation)expr).getName());
+ } else if (expr instanceof ELArgumentInvocation) {
+ segment = new MessagePropertyELSegmentImpl(((ELArgumentInvocation)expr).getArgument().getOpenArgumentToken().getNextToken());
+ }
+ if(segment.getToken() == null) {
+ return false;
+ }
+
+ Set<TextProposal> kbProposals = new TreeSet<TextProposal>(TextProposal.KB_PROPOSAL_ORDER);
+
+ String propertyName = segment.getToken().getText();
+ Map<String, List<XModelObject>> properties = messagesInfo.getPropertiesMap();
+ List<XModelObject> os = properties.get(propertyName);
+ if(os != null) {
+ for(XModelObject o: os) {
+ segment.addObject(o);
+ }
+ if(!os.isEmpty()) {
+ segment.setBaseName(getBundle(os.get(0)));
+ } else {
+ segment.setBaseName("messages");
+ }
+ }
+
+ if(segment.getToken()!=null) {
+ resolution.addSegment(segment);
+ }
+ resolution.setProposals(kbProposals);
+ if (expr.getType() == ELObjectType.EL_PROPERTY_INVOCATION && ((ELPropertyInvocation)expr).getName() == null) {
+ // return all the methods + properties
+ for (TypeInfoCollector.MemberInfo mbr : members) {
+ processSingularMember(mbr, kbProposals);
+ }
+ } else
+ if(expr.getType() != ELObjectType.EL_ARGUMENT_INVOCATION) {
+ Set<String> proposalsToFilter = new TreeSet<String>();
+ for (TypeInfoCollector.MemberInfo mbr : members) {
+ filterSingularMember((MessagesInfo)mbr, proposalsToFilter);
+ }
+ for (String proposal : proposalsToFilter) {
+ // We do expect nothing but name for method tokens (No round brackets)
+ String filter = expr.getMemberName();
+ if(filter == null) filter = ""; //$NON-NLS-1$
+ if(returnEqualedVariablesOnly) {
+ // This is used for validation.
+ if (proposal.equals(filter)) {
+ MessagesELTextProposal kbProposal = createProposal(messagesInfo, proposal);
+ kbProposals.add(kbProposal);
+ break;
+ }
+ } else if (proposal.startsWith(filter)) {
+ // This is used for CA.
+ MessagesELTextProposal kbProposal = createProposal(messagesInfo, proposal);
+ kbProposal.setReplacementString(proposal.substring(filter.length()));
+ kbProposals.add(kbProposal);
+ }
+ }
+ } else if(expr.getType() == ELObjectType.EL_ARGUMENT_INVOCATION) {
+ Set<String> proposalsToFilter = new TreeSet<String>();
+ boolean isMessages = false;
+ for (TypeInfoCollector.MemberInfo mbr : members) {
+ isMessages = true;
+ filterSingularMember((MessagesInfo)mbr, proposalsToFilter);
+ }
+ String filter = expr.getMemberName();
+ boolean bSurroundWithQuotes = false;
+ if(filter == null) {
+ filter = ""; //$NON-NLS-1$
+ bSurroundWithQuotes = true;
+ } else {
+ boolean b = filter.startsWith("'") || filter.startsWith("\""); //$NON-NLS-1$ //$NON-NLS-2$
+ boolean e = filter.endsWith("'") || filter.endsWith("\""); //$NON-NLS-1$ //$NON-NLS-2$
+ if((b) && (e)) {
+ filter = filter.length() == 1 ? "" : filter.substring(1, filter.length() - 1); //$NON-NLS-1$
+ } else if(b && !returnEqualedVariablesOnly) {
+ filter = filter.substring(1);
+ } else {
+ //Value is set as expression itself, we cannot compute it
+ if(isMessages) {
+ resolution.setMapOrCollectionOrBundleAmoungTheTokens(true);
+ }
+ return true;
+ }
+ }
+
+ for (String proposal : proposalsToFilter) {
+ if(returnEqualedVariablesOnly) {
+ // This is used for validation.
+ if (proposal.equals(filter)) {
+ MessagesELTextProposal kbProposal = createProposal(messagesInfo, proposal);
+ kbProposals.add(kbProposal);
+ break;
+ }
+ } else if (proposal.startsWith(filter)) {
+ // This is used for CA.
+ MessagesELTextProposal kbProposal = createProposal(messagesInfo, proposal);
+ String replacementString = proposal.substring(filter.length());
+ if (bSurroundWithQuotes) {
+ replacementString = "'" + replacementString + "']"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ kbProposal.setReplacementString(replacementString);
+ kbProposals.add(kbProposal);
+ }
+ }
+ }
+ segment.setResolved(!kbProposals.isEmpty());
+ if (resolution.isResolved()){
+ resolution.setLastResolvedToken(expr);
+ }
+ return true;
+ }
+
protected void processSingularMember(TypeInfoCollector.MemberInfo mbr, Set<TextProposal> kbProposals) {
if (mbr instanceof MessagesInfo) {
- // Surround the "long" keys containing the dots with [' ']
+ // Surround the "long" keys containing the dots with [' ']
+ Map<String, List<XModelObject>> properties = ((MessagesInfo)mbr).getPropertiesMap();
TreeSet<String> keys = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
- keys.addAll(((MessagesInfo)mbr).getKeys());
+ keys.addAll(properties.keySet());
Iterator<String> sortedKeys = keys.iterator();
while(sortedKeys.hasNext()) {
String key = sortedKeys.next();
if (key == null || key.length() == 0)
continue;
-
- MessagesELTextProposal proposal = new MessagesELTextProposal();
- if (key.indexOf('.') != -1) {
- proposal.setReplacementString("['" + key + "']");
- proposal.setLabel("['" + key + "']");
- } else {
- proposal.setReplacementString(key);
- proposal.setLabel(key);
- }
- proposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE);
-
- /* Setup basename, propertyName and List<XModelObject> describing the property here:
- *
- proposal.setBaseName(mbr.basename);
- proposal.setPropertyName(key);
- proposal.setObjects(objects);
- */
-
+ MessagesELTextProposal proposal = createProposal((MessagesInfo)mbr, key);
kbProposals.add(proposal);
}
}
}
+ private MessagesELTextProposal createProposal(MessagesInfo mbr, String proposal) {
+ Map<String, List<XModelObject>> properties = mbr.getPropertiesMap();
+ List<XModelObject> ps = properties.get(proposal);
+ String bundle = ps.isEmpty() ? "messages" : getBundle(ps.get(0));
+
+ MessagesELTextProposal kbProposal = new MessagesELTextProposal();
+ kbProposal.setBaseName(bundle);
+ kbProposal.setObjects(ps);
+
+ if (proposal.indexOf('.') != -1) {
+ kbProposal.setReplacementString("['" + proposal + "']");
+ kbProposal.setLabel("['" + proposal + "']");
+ } else {
+ kbProposal.setReplacementString(proposal);
+ kbProposal.setLabel(proposal);
+ }
+ kbProposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE);
+ return kbProposal;
+ }
+
+ private String getBundle(XModelObject o) {
+ StringBuilder sb = new StringBuilder();
+ XModelObject f = FileSystemsHelper.getFile(o);
+ if(f != null) {
+ sb.append(f.getAttributeValue(XModelObjectConstants.ATTR_NAME));
+ f = f.getParent();
+ while(f != null && f.getFileType() == XModelObject.FOLDER) {
+ sb.insert(0, ".").insert(0, f.getAttributeValue(XModelObjectConstants.ATTR_NAME));
+ f = f.getParent();
+ }
+ }
+ return sb.toString();
+ }
+
protected void filterSingularMember(TypeInfoCollector.MemberInfo mbr, Set<TypeInfoCollector.MemberPresentation> proposalsToFilter) {
Collection<String> keys = ((MessagesInfo)mbr).getKeys();
for (String key : keys) {
@@ -230,6 +383,13 @@
}
}
+ protected void filterSingularMember(MessagesInfo mbr, Set<String> proposalsToFilter) {
+ Collection<String> keys = ((MessagesInfo)mbr).getKeys();
+ for (String key : keys) {
+ proposalsToFilter.add(key);
+ }
+ }
+
/**
* Returns scope for the resource
* @param project
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2011-11-01 00:37:39 UTC (rev 36101)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2011-11-01 01:12:16 UTC (rev 36102)
@@ -15,6 +15,7 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.IFile;
@@ -39,6 +40,7 @@
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.TypeInfo;
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.TypeMemberInfo;
import org.jboss.tools.common.java.IJavaSourceReference;
+import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.seam.core.BijectedAttributeType;
import org.jboss.tools.seam.core.IBijectedAttribute;
@@ -253,6 +255,16 @@
public Collection<String> getKeys() {
return messages.getPropertyNames();
}
+
+ /**
+ * Returns mapping of property name to all model objects that represent it,
+ * for all locales and all bundles.
+ *
+ * @return
+ */
+ public Map<String, List<XModelObject>> getPropertiesMap() {
+ return messages.getPropertiesMap();
+ }
}
/**
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36101 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-10-31 20:37:39 -0400 (Mon, 31 Oct 2011)
New Revision: 36101
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
Log:
Quickfix and Wizard for fixing ambigious injection warning is confusing https://issues.jboss.org/browse/JBIDE-9940
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-01 00:20:27 UTC (rev 36100)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-01 00:37:39 UTC (rev 36101)
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.draw2d.ColorConstants;
import org.eclipse.jdt.core.Flags;
+import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.dialogs.Dialog;
@@ -175,9 +176,11 @@
ValuedQualifier lastQualifier = null;
String beanTypeName = bean.getBeanClass().getFullyQualifiedName();
String beanPackage = beanTypeName.substring(0,beanTypeName.lastIndexOf(MarkerResolutionUtils.DOT));
+ IJavaProject beanJavaProject = bean.getBeanClass().getJavaProject();
String injectionPointTypeName = injectionPoint.getClassBean().getBeanClass().getFullyQualifiedName();
String injectionPointPackage = injectionPointTypeName.substring(0,injectionPointTypeName.lastIndexOf(MarkerResolutionUtils.DOT));
+ IJavaProject injectionPointJavaProject = injectionPoint.getBean().getBeanClass().getJavaProject();
boolean samePackage = beanPackage.equals(injectionPointPackage);
@@ -186,19 +189,22 @@
for(IQualifier q : qs){
ValuedQualifier vq = new ValuedQualifier(q);
if(!contains(originalQualifiers, vq) && !contains(qualifiers, vq) && !contains(deployed, vq)){
- boolean isPublic = true;
try{
- isPublic = Flags.isPublic(q.getSourceType().getFlags());
- }catch(JavaModelException ex){
+ boolean isPublic = Flags.isPublic(q.getSourceType().getFlags());
+
+ String qualifierTypeName = q.getSourceType().getFullyQualifiedName();
+ String qualifierPackage = qualifierTypeName.substring(0,qualifierTypeName.lastIndexOf(MarkerResolutionUtils.DOT));
+ if((isPublic || (samePackage && injectionPointPackage.equals(qualifierPackage))) ){
+ if(beanJavaProject.findType(qualifierTypeName) != null && injectionPointJavaProject.findType(qualifierTypeName) != null){
+ qualifiers.add(vq);
+ availableTableViewer.add(vq);
+ lastQualifier = vq;
+ }
+ }
+ } catch (JavaModelException ex) {
CDIUIPlugin.getDefault().logError(ex);
}
- String qualifierTypeName = q.getSourceType().getFullyQualifiedName();
- String qualifierPackage = qualifierTypeName.substring(0,qualifierTypeName.lastIndexOf(MarkerResolutionUtils.DOT));
- if((isPublic || (samePackage && injectionPointPackage.equals(qualifierPackage))) ){
- qualifiers.add(vq);
- availableTableViewer.add(vq);
- lastQualifier = vq;
- }
+
}
}
return lastQualifier;
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36100 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-10-31 20:20:27 -0400 (Mon, 31 Oct 2011)
New Revision: 36100
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizard.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java
Log:
Quickfix and Wizard for fixing ambigious injection warning is confusing https://issues.jboss.org/browse/JBIDE-9940
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizard.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizard.java 2011-11-01 00:20:11 UTC (rev 36099)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizard.java 2011-11-01 00:20:27 UTC (rev 36100)
@@ -34,11 +34,6 @@
addPage(page);
}
- @Override
- public boolean performFinish() {
- return true;
- }
-
public List<ValuedQualifier> getDeployedQualifiers(){
return page.getDeployedQualifiers();
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java 2011-11-01 00:20:11 UTC (rev 36099)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java 2011-11-01 00:20:27 UTC (rev 36100)
@@ -84,11 +84,6 @@
return page.checkBeans();
}
- @Override
- public boolean performFinish() {
- return true;
- }
-
class SelectBeanWizardPage extends UserInputWizardPage{
TableViewer tableViewer;
protected SelectBeanWizardPage(String pageName) {
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36099 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-10-31 20:20:11 -0400 (Mon, 31 Oct 2011)
New Revision: 36099
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
Log:
Quickfix and Wizard for fixing ambigious injection warning is confusing https://issues.jboss.org/browse/JBIDE-9940
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-11-01 00:16:15 UTC (rev 36098)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-11-01 00:20:11 UTC (rev 36099)
@@ -522,10 +522,10 @@
IFile file = (IFile)injectionPoint.getClassBean().getResource();
TextFileChange fileChange = new TextFileChange(file.getName(), file);
- if(isEditorOpened(file))
- fileChange.setSaveMode(TextFileChange.LEAVE_DIRTY);
- else
- fileChange.setSaveMode(TextFileChange.FORCE_SAVE);
+// if(isEditorOpened(file))
+// fileChange.setSaveMode(TextFileChange.LEAVE_DIRTY);
+// else
+// fileChange.setSaveMode(TextFileChange.FORCE_SAVE);
MultiTextEdit edit = new MultiTextEdit();
try{
@@ -569,10 +569,10 @@
IFile file = (IFile)bean.getBeanClass().getResource();
TextFileChange fileChange = new TextFileChange(file.getName(), file);
- if(isEditorOpened(file))
- fileChange.setSaveMode(TextFileChange.LEAVE_DIRTY);
- else
- fileChange.setSaveMode(TextFileChange.FORCE_SAVE);
+// if(isEditorOpened(file))
+// fileChange.setSaveMode(TextFileChange.LEAVE_DIRTY);
+// else
+// fileChange.setSaveMode(TextFileChange.FORCE_SAVE);
MultiTextEdit edit = new MultiTextEdit();
IJavaElement beanElement = null;
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36098 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-31 20:16:15 -0400 (Mon, 31 Oct 2011)
New Revision: 36098
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
Log:
fix groupId for org.jboss.tools.esb.ui.bot.test (should be org.jboss.tools.esb.tests)
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2011-11-01 00:09:32 UTC (rev 36097)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2011-11-01 00:16:15 UTC (rev 36098)
@@ -7,7 +7,7 @@
<artifactId>tests</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.esb.tests</groupId>
<artifactId>org.jboss.tools.esb.ui.bot.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36097 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-31 20:09:32 -0400 (Mon, 31 Oct 2011)
New Revision: 36097
Modified:
trunk/build/parent/pom.xml
Log:
bump from SR1 to SR1a to allow inclusion of SpringIDE 2.7.2 (JBDS-1863)
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-11-01 00:09:23 UTC (rev 36096)
+++ trunk/build/parent/pom.xml 2011-11-01 00:09:32 UTC (rev 36097)
@@ -58,7 +58,7 @@
<jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightly/trunk/</jbosstools-nightly>
<!-- 5. extra requirements (for 3rd party "Extras" site) -->
- <jboss-requirements-composite-extras-mirror>http://download.jboss.org/jbosstools/updates/indigo/extras/SR1/</jboss-requirements-composite-extras-mirror>
+ <jboss-requirements-composite-extras-mirror>http://download.jboss.org/jbosstools/updates/indigo/extras/SR1a/</jboss-requirements-composite-extras-mirror>
</properties>
<build>
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36096 - in trunk/download.jboss.org/jbosstools/updates/indigo/extras: SR1a and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-31 20:09:23 -0400 (Mon, 31 Oct 2011)
New Revision: 36096
Added:
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/.gitignore
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/compositeA...
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/compositeC...
Log:
new extras composite for SR1a - includes SpringIDE 2.7.2 (JBDS-1863)
Added: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/.gitignore (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/.gitignore 2011-11-01 00:09:23 UTC (rev 36096)
@@ -0,0 +1 @@
+.directory
Added: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/compositeA...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/compositeA... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/compositeA... 2011-11-01 00:09:23 UTC (rev 36096)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1320104639000'/>
+</properties>
+<children size='8'>
+<child location='../../../requirements/eclipsecs/5.4.0.201109110000/'/>
+<child location='../../../requirements/findbugs/1.3.9/'/>
+<child location='../../../requirements/jslint/1.5/'/>
+<child location='../../../requirements/pmd/3.2.4/'/>
+<child location='../../../requirements/springide/2.7.2.201109122348/'/>
+
+<child location='../../../requirements/subclipse/1.6_1.3/'/>
+<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
+<child location='../../../requirements/testng/6.1.1.20110823_1537/'/>
+</children>
+</repository>
+
Added: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/compositeC...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/compositeC... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1a/compositeC... 2011-11-01 00:09:23 UTC (rev 36096)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1320104643000'/>
+</properties>
+<children size='8'>
+<child location='../../../requirements/eclipsecs/5.4.0.201109110000/'/>
+<child location='../../../requirements/findbugs/1.3.9/'/>
+<child location='../../../requirements/jslint/1.5/'/>
+<child location='../../../requirements/pmd/3.2.4/'/>
+<child location='../../../requirements/springide/2.7.2.201109122348/'/>
+
+<child location='../../../requirements/subclipse/1.6_1.3/'/>
+<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
+<child location='../../../requirements/testng/6.1.1.20110823_1537/'/>
+</children>
+</repository>
+
13 years, 1 month
- 1
- 0