JBoss Tools SVN: r34737 - trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk.
by jbosstools-commits＠lists.jboss.org
Author: blafond
Date: 2011-09-14 13:49:18 -0400 (Wed, 14 Sep 2011)
New Revision: 34737
Modified:
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
Log:
TEIIDDES-1083 renaming Teiid Designer's trunk hudson job to "jbosstools-teiid-designer_trunk"
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-09-14 17:40:26 UTC (rev 34736)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-09-14 17:49:18 UTC (rev 34737)
@@ -82,12 +82,12 @@
<child location='../../../staging.previous/jbosstools-3.3_trunk.component--ws/all/repo/'/>
<child location='../../../staging/jbosstools-drools-5.2_trunk/all/repo/'/>
-<child location='../../../staging/jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
+<child location='../../../staging/jbosstools-teiid-designer_trunk/all/repo/'/>
<child location='../../../staging/savara-tools-eclipse-master/all/repo/'/>
<child location='../../../staging/xulrunner-1.9.2/all/repo/'/>
<child location='../../../staging.previous/jbosstools-drools-5.2_trunk/all/repo/'/>
-<child location='../../../staging.previous/jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-teiid-designer_trunk/all/repo/'/>
<child location='../../../staging.previous/savara-tools-eclipse-master/all/repo/'/>
<child location='../../../staging.previous/xulrunner-1.9.2/all/repo/'/>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-09-14 17:40:26 UTC (rev 34736)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-09-14 17:49:18 UTC (rev 34737)
@@ -82,12 +82,12 @@
<child location='../../../staging.previous/jbosstools-3.3_trunk.component--ws/all/repo/'/>
<child location='../../../staging/jbosstools-drools-5.2_trunk/all/repo/'/>
-<child location='../../../staging/jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
+<child location='../../../staging/jbosstools-teiid-designer_trunk/all/repo/'/>
<child location='../../../staging/savara-tools-eclipse-master/all/repo/'/>
<child location='../../../staging/xulrunner-1.9.2/all/repo/'/>
<child location='../../../staging.previous/jbosstools-drools-5.2_trunk/all/repo/'/>
-<child location='../../../staging.previous/jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-teiid-designer_trunk/all/repo/'/>
<child location='../../../staging.previous/savara-tools-eclipse-master/all/repo/'/>
<child location='../../../staging.previous/xulrunner-1.9.2/all/repo/'/>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34736 - in trunk/documentation/whatsnew: jst and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-09-14 13:40:26 -0400 (Wed, 14 Sep 2011)
New Revision: 34736
Modified:
trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M3.html
trunk/documentation/whatsnew/jst/jst-news-3.3.0.M3.html
trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M3.html
Log:
JBIDE-9610 typos/grammar/sanity
Modified: trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M3.html
===================================================================
--- trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M3.html 2011-09-14 17:39:03 UTC (rev 34735)
+++ trunk/documentation/whatsnew/cdi/cdi-news-3.3.0.M3.html 2011-09-14 17:40:26 UTC (rev 34736)
@@ -47,7 +47,7 @@
<li>Stereotype/Qualifier/Scope annotation type must be annotated with @Retention(RUNTIME)</li>
<li>Qualifier annotation type must be annotated with @Target('{'TYPE, METHOD, FIELD, PARAMETER'}') or @Target('{'FIELD, PARAMETER'}') [JSR-299 2.3.2, 10.1]</li>
<li>Scope annotation type must be annotated with @Target('{'TYPE, METHOD, FIELD'}') [JSR-299 2.4.2]</li>
- <li>Quick fix for "Stereotype declares a non-empty @Named annotation [JSR-299 2.7.1.3]</li>
+ <li>Stereotype declares a non-empty @Named annotation [JSR-299 2.7.1.3]</li>
<li>Interceptor/Decorator has a name [JSR-299 2.5.3]</li>
<li>Stereotype cannot be annotated @Typed [JSR-299 2.7.1.3]</li>
<li>Annotation-valued or array-valued member of a qualifier or interceptor binding type must be annotated @Nonbinding [JSR-299 5.2.5, 9.5.2]</li>
@@ -221,7 +221,7 @@
<p><b>Seam Servlet</b></p>
</td>
<td align="top">
- <p>Injection points annotated @RequestParam/@HeaderParam/@CookieParam are now ignored by CDI validator since it's imposible in design time to know what bean will be injected to this point.</p>
+ <p>Injection points annotated @RequestParam/@HeaderParam/@CookieParam are now ignored by CDI validator since it's imposible in design time to know what bean will be injected.</p>
<p>
<small>
<a href="https://issues.jboss.org/browse/JBIDE-9389">Related Jira JBIDE-9389</a>
Modified: trunk/documentation/whatsnew/jst/jst-news-3.3.0.M3.html
===================================================================
--- trunk/documentation/whatsnew/jst/jst-news-3.3.0.M3.html 2011-09-14 17:39:03 UTC (rev 34735)
+++ trunk/documentation/whatsnew/jst/jst-news-3.3.0.M3.html 2011-09-14 17:40:26 UTC (rev 34736)
@@ -40,9 +40,17 @@
<p><b>@ManagedBean support</b></p>
</td>
<td valign="top">
- <p>JSF Tools now support managed beans annotated @ManagedBean. This support includes EL code completion, validation, refactoring, OpenOns (Ctrl+Click) and searching (Ctrl+Shift+G).</p>
+ <p>JSF Tools now support managed beans annotated
+ @ManagedBean. This support includes EL code
+ completion, validation, refactoring, OpenOns
+ (Ctrl+Click) and searching (Ctrl+Shift+G).</p>
+
<img src="images/3.3.0.M3/ca.png"/>
- <p><small><a
+ <p>Wwith this existing
+ applications and examples will no longer have error
+ markers for EL expressions that refer to
+ @ManagedBeans. For new development consider use CDI
+ beans with @Named instead for fuller integration.</p><p><small><a
href="https://jira.jboss.org/browse/JBIDE-5045">Related Jira</a></small></p>
</td>
</tr>
@@ -58,7 +66,8 @@
<p><b><faces-config metadata-complete="true"></b></p>
</td>
<td valign="top">
- <p>If <faces-config metadata-complete="true"> then JSF Tools will ignore bean annotated @ManagedBean according to JSF-2 spec.</p>
+ <p> <code><faces-config
+ metadata-complete="true"></code> in faces-config.xml JSF Tools will ignore bean annotated @ManagedBean according to JSF-2 spec.</p>
<p><small><a href="https://jira.jboss.org/browse/JBIDE-8280">Related Jira</a></small></p>
</td>
</tr>
@@ -76,44 +85,78 @@
</td>
<td valign="top">
<p>
- It was a pretty annoying bug in <b>Add JSF Capability</b> dialog which required web.xml. That obsolete dialog has been removed. Now all you need to enable JBoss JSF Tools support is to install JSF facet into the project.
- So Project->Configuration->Add JSF Capability will lead you to Project Properties->Facets property page. Web.xml is not required there.
+ <b>Add JSF Capability</b> dialog which were
+ used to enable JSF on projects required an web.xml
+ even for JavaEE projects. That limitation and dialog
+ has now been removed. Now all you need to enable JBoss
+ JSF Tools support is to install JSF facet into the
+ project and things will just work.
+ </p>
+ <p>Project->Configuration->Add JSF Capability will
+ lead you to Project Properties->Facets property
+ page. Web.xml is not required for this.
</p>
+
<p>
<small>
<a href="https://jira.jboss.org/browse/JBIDE-9198">Related Jira</a>
</small>
</p>
- <p>
- If some of your JSF project depends on another Java Project then both project should have JBoss Tools Knowledge Base builder installed to provide code completion, validation and other features for all resources from both projects.
- If for some reason not all of your dependent projects configured correctly then JBoss Tools will add a warning to the project. A QuickFix is available for such a warning. And of course you can disable that warning in Preferences.
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Resources in related non-WTP projects</b></p>
+ </td>
+ <td valign=top>
+ <p>If you project have resources in related
+ projects which does not have JBoss Tools Knowledgebase
+ Builder installed JBoss Tools cannot "see" the
+ resources inside these projects and you might get
+ false warnings.</p>
+
+ <p>To help avoid this problem JBoss Tools now warns
+ if it detects project dependencies
+ which should have the knowledgebase
+ builder enabled to make it visible to
+ JBoss Tools and be available in code
+ completion, validation and resource lookups.</p>
+
+ <p>A QuickFix is available for the warning so it is
+ easy to fix and of course if you do not wish
+ your projects to have the build you can
+ disable the Warning in Preferences.
</p>
<img src="images/3.3.0.M3/qf.png"/>
<p>
- <small>
- <a href="https://jira.jboss.org/browse/JBIDE-9120">Related Jira</a>
- </small>
+ It is also possible to enable the
+ support via project properties page:
</p>
- <p>
- Also it's possible to enable such a support via project properties page:
- </p>
<img src="images/3.3.0.M3/properties.png"/>
<p>
+ If you missed the warning you will be
+ asked to fix the configuration problem when
+ you are opening any XHTML or JSP page with
+ JBoss Tools Visual Page Editor.
</p>
- <p>
- <small>
- <a href="https://jira.jboss.org/browse/JBIDE-9198">Related Jira</a>
- </small>
- </p>
- <p>
- If you missed the warning you will be asked to fix the configuration problem when you are opening any XHTML or JSP page with JBoss Tools Visual Page Editor.
- </p>
<img src="images/3.3.0.M3/nature.png"/>
<p>
<small>
- <a href="https://jira.jboss.org/browse/JBIDE-9427">Related Jira</a>
+ Related jira <a
+ href="https://jira.jboss.org/browse/JBIDE-9120">1</a>,<a
+ href="https://jira.jboss.org/browse/JBIDE-9198">2</a>,<a
+ href="https://jira.jboss.org/browse/JBIDE-9427">3</a>
+
</small>
</p>
+
</td>
</tr>
Modified: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M3.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M3.html 2011-09-14 17:39:03 UTC (rev 34735)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M3.html 2011-09-14 17:40:26 UTC (rev 34736)
@@ -39,26 +39,34 @@
<tr>
<td valign="top" align="left" width="200px">
<b><p>
- Special and non-ASCII characters is now supported in Externalize Strings wizard
+ non-ASCII characters in Externalize Strings wizard
<p></b>
</td>
<td valign="top">
- <p>Line breaks and carret returns are displayed as escaped sequence.</p>
- <p>As well as non-ASCII characters are shown in unicode codes.</p>
+ <p>Line breaks and carriage returns are now displayed
+ as escaped sequence and non-ASCII characters are shown in unicode codes.</p>
<p><img src="images/3.3.0.M3/9203.png" alt="non-ASCII characters" /></p>
<p><small>
<a href="https://jira.jboss.org/jira/browse/JBIDE-9203">Related Jira</a>
</small></p>
</td>
</tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
<tr>
<td valign="top" align="left" width="200px">
<b><p>
- Default "Actual Run-Time Folders" are shown in the Page Desigh Options dialog
+ Default "Actual Run-Time Folders" are shown in the Page Design Options dialog
<p></b>
</td>
<td valign="top">
- <p>Checkboxes were added to change default value</p>
+ <p>The default values are now shown in the Page Design
+ dialog letting you know what folders absolute and relative
+ folders are for. To change the default value use the checkbox
+ to enable editing of the fields.</p>
<p><img src="images/3.3.0.M3/8719.png" alt="Actual Run-Time Folders" /></p>
<p><small>
<a href="https://jira.jboss.org/jira/browse/JBIDE-8719">Related Jira</a>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34735 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-09-14 13:39:03 -0400 (Wed, 14 Sep 2011)
New Revision: 34735
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlink.java
Log:
"Show All Generic Configuration Points", "Show CDI Events" and "Show CDI Observer Methods" dialogs should look like "Open Implementation" in JDT https://issues.jboss.org/browse/JBIDE-9673
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlink.java 2011-09-14 17:35:52 UTC (rev 34734)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlink.java 2011-09-14 17:39:03 UTC (rev 34735)
@@ -29,12 +29,10 @@
public String getHyperlinkText() {
String text="";
if (bean != null) {
- String name = bean.getBeanClass().getElementName();
+ String name = bean.getElementName();
if (bean instanceof IProducerField) {
- name += "."+((IProducerField)bean).getField().getElementName();
text = NLS.bind(CDISeamExtMessages.OPEN_GENERIC_PRODUCER_BEAN, name);
} else if (bean instanceof IProducerMethod) {
- name += "."+((IProducerMethod)bean).getMethod().getElementName()+"()";
text = NLS.bind(CDISeamExtMessages.OPEN_GENERIC_PRODUCER_BEAN, name);
} else {
text = NLS.bind(CDISeamExtMessages.OPEN_GENERIC_BEAN, name);
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34734 - in trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink: xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-09-14 13:35:52 -0400 (Wed, 14 Sep 2011)
New Revision: 34734
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/AbstractInformationControl.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java
Log:
"Show All Generic Configuration Points", "Show CDI Events" and "Show CDI Observer Methods" dialogs should look like "Open Implementation" in JDT https://issues.jboss.org/browse/JBIDE-9673
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-09-14 17:00:51 UTC (rev 34733)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-09-14 17:35:52 UTC (rev 34734)
@@ -24,7 +24,6 @@
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
-import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
@@ -73,16 +72,7 @@
@Override
public String getHyperlinkText() {
- String text = CDIExtensionsMessages.CDI_EVENT_HYPERLINK_OPEN_EVENT+" "+event.getClassBean().getBeanClass().getElementName();
-
- if(event instanceof IInjectionPointField) {
- text += "."+((IInjectionPointField)event).getField().getElementName();
- } else if(event instanceof IInjectionPointParameter) {
- IInjectionPointParameter p = (IInjectionPointParameter)event;
- text += "." + p.getBeanMethod().getMethod().getElementName();
- }
-
- return text;
+ return CDIExtensionsMessages.CDI_EVENT_HYPERLINK_OPEN_EVENT+" "+event.getElementName();
}
@@ -99,19 +89,9 @@
}
public String getInformation() {
- String text = event.getClassBean().getBeanClass().getElementName();
-
- if(event instanceof IInjectionPointField) {
- text += "."+((IInjectionPointField)event).getField().getElementName();
- } else if(event instanceof IInjectionPointParameter) {
- IInjectionPointParameter p = (IInjectionPointParameter)event;
- text += "." + p.getBeanMethod().getMethod().getElementName();
- }
-
- return text;
+ return event.getElementName();
}
-
public Image getImage() {
return null;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-09-14 17:00:51 UTC (rev 34733)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-09-14 17:35:52 UTC (rev 34734)
@@ -94,17 +94,7 @@
text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN+" ";
}
-
-
- text += bean.getBeanClass().getElementName();
-
- if(bean instanceof IProducerField){
- text += "."+((IProducerField)bean).getField().getElementName();
- }else if(bean instanceof IProducerMethod){
- text += "."+((IProducerMethod)bean).getMethod().getElementName()+"()";
- }
-
-
+ text += bean.getElementName();
}
return text;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-09-14 17:00:51 UTC (rev 34733)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-09-14 17:35:52 UTC (rev 34734)
@@ -63,7 +63,7 @@
@Override
public String getHyperlinkText() {
- return CDIExtensionsMessages.CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD+" "+observerMethod.getMethod().getElementName();
+ return CDIExtensionsMessages.CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD+" "+observerMethod.getElementName();
}
@@ -80,7 +80,7 @@
}
public String getInformation() {
- return observerMethod.getClassBean().getBeanClass().getElementName()+"."+observerMethod.getMethod().getElementName()+"()";
+ return observerMethod.getElementName();
}
public Image getImage() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2011-09-14 17:00:51 UTC (rev 34733)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2011-09-14 17:35:52 UTC (rev 34734)
@@ -33,7 +33,6 @@
import org.eclipse.ui.texteditor.ITextEditor;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreNature;
-import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IBeanMethod;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/AbstractInformationControl.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/AbstractInformationControl.java 2011-09-14 17:00:51 UTC (rev 34733)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/AbstractInformationControl.java 2011-09-14 17:35:52 UTC (rev 34734)
@@ -13,11 +13,9 @@
import java.util.List;
-import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.util.StringMatcher;
-import org.eclipse.jdt.ui.actions.CustomFiltersActionGroup;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuManager;
@@ -90,8 +88,6 @@
*/
private Composite fViewMenuButtonComposite;
- private CustomFiltersActionGroup fCustomFiltersActionGroup;
-
private IAction fShowViewMenuAction;
private HandlerSubmission fShowViewMenuHandlerSubmission;
@@ -153,8 +149,6 @@
protected Control createDialogArea(Composite parent) {
fTableViewer= createTableViewer(parent, fTableStyle);
- fCustomFiltersActionGroup= new CustomFiltersActionGroup(getId(), fTableViewer);
-
final Table table= fTableViewer.getTable();
table.addKeyListener(new KeyListener() {
public void keyPressed(KeyEvent e) {
@@ -351,17 +345,6 @@
Object selectedElement= getSelectedElement();
if (selectedElement instanceof IHyperlink) {
((IHyperlink)selectedElement).open();
-// IJavaElement jElement = CDIUtil.getJavaElement((IBean)selectedElement);
-// if(jElement != null){
-// try {
-// dispose();
-// IEditorPart part= EditorUtility.openInEditor(jElement, true);
-// if (part != null)
-// EditorUtility.revealInEditor(part, jElement);
-// } catch (CoreException ex) {
-// JavaPlugin.log(ex);
-// }
-// }
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2011-09-14 17:00:51 UTC (rev 34733)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2011-09-14 17:35:52 UTC (rev 34734)
@@ -24,7 +24,6 @@
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.TextStyle;
@@ -44,7 +43,6 @@
private IHyperlink[] hyperlinks;
private BeanTableLabelProvider fLabelProvider;
- private KeyAdapter fKeyAdapter;
public HierarchyInformationControl(Shell parent, String title, int shellStyle, int tableStyle, IHyperlink[] hyperlinks) {
super(parent, shellStyle, tableStyle, IJavaEditorActionDefinitionIds.OPEN_HIERARCHY, true);
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34733 - branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-09-14 13:00:51 -0400 (Wed, 14 Sep 2011)
New Revision: 34733
Modified:
branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
Log:
JBIDE-9703 - m3
Modified: branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
===================================================================
--- branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-09-14 15:42:46 UTC (rev 34732)
+++ branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-09-14 17:00:51 UTC (rev 34733)
@@ -141,6 +141,8 @@
for( int i = 0; i < moduleTree.length-1; i++ ) {
tree2[i] = moduleTree[i];
}
+ if( tree2.length == 0 )
+ return new Path("/"); //$NON-NLS-1$
return PublishUtil.getDeployPath(publishMethod, tree2, server);
}
Modified: branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-09-14 15:42:46 UTC (rev 34732)
+++ branches/jbosstools-3.3.0.M3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-09-14 17:00:51 UTC (rev 34733)
@@ -249,6 +249,8 @@
suffix = IWTPConstants.EXT_EAR;
else if( IWTPConstants.FACET_WEB.equals(type) || IWTPConstants.FACET_STATIC_WEB.equals(type))
suffix = IWTPConstants.EXT_WAR;
+ else if( IWTPConstants.FACET_UTILITY.equals(type))
+ suffix = IWTPConstants.EXT_JAR;
else if( IWTPConstants.FACET_CONNECTOR.equals(type))
suffix = IWTPConstants.EXT_RAR;
else if( IWTPConstants.FACET_ESB.equals(type))
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34732 - in trunk: cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-09-14 11:42:46 -0400 (Wed, 14 Sep 2011)
New Revision: 34732
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamResourceBundleHyperlinkTest.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamCoreTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/BundleModelTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/jms/SeamJmsValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/servlet/SeamServletValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
Log:
JBIDE-9288
Open On for bundle messages doesn't work for CDI projects with International Module enabled
JUnit test is added.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF 2011-09-14 14:25:45 UTC (rev 34731)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF 2011-09-14 15:42:46 UTC (rev 34732)
@@ -24,4 +24,5 @@
org.jboss.tools.jst.text.ext,
org.jboss.tools.jst.text.ext.test,
org.eclipse.wst.validation;bundle-version="1.2.300"
+Export-Package: org.jboss.tools.cdi.seam.core.test
Copied: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTest.java (from rev 34667, trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamCoreTest.java)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTest.java 2011-09-14 15:42:46 UTC (rev 34732)
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.core.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.common.base.test.validation.TestUtil;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class SeamCoreTest extends TestCase {
+
+ protected IProject project;
+
+ protected IProject getTestProject() throws Exception {
+ if(project==null) {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamCoreTestSetup.PROJECT_NAME);
+ if(!project.exists()) {
+ project = ResourcesUtils.importProject(SeamCoreTestSetup.PLUGIN_ID, SeamCoreTestSetup.PROJECT_PATH);
+ TestUtil.waitForValidation();
+ }
+ }
+ return project;
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/BundleModelTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/BundleModelTest.java 2011-09-14 14:25:45 UTC (rev 34731)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/BundleModelTest.java 2011-09-14 15:42:46 UTC (rev 34732)
@@ -7,6 +7,7 @@
import org.jboss.tools.cdi.seam.core.international.IBundleModel;
import org.jboss.tools.cdi.seam.core.international.ILocalizedValue;
import org.jboss.tools.cdi.seam.core.international.IProperty;
+import org.jboss.tools.cdi.seam.core.test.SeamCoreTest;
public class BundleModelTest extends SeamCoreTest {
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamCoreTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamCoreTest.java 2011-09-14 14:25:45 UTC (rev 34731)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamCoreTest.java 2011-09-14 15:42:46 UTC (rev 34732)
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.seam.core.test.international;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.jboss.tools.cdi.seam.core.test.SeamCoreTestSetup;
-import org.jboss.tools.common.base.test.validation.TestUtil;
-import org.jboss.tools.test.util.ResourcesUtils;
-
-/**
- * @author Alexey Kazakov
- */
-public class SeamCoreTest extends TestCase {
-
- protected IProject project;
-
- protected IProject getTestProject() throws Exception {
- if(project==null) {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamCoreTestSetup.PROJECT_NAME);
- if(!project.exists()) {
- project = ResourcesUtils.importProject(SeamCoreTestSetup.PLUGIN_ID, SeamCoreTestSetup.PROJECT_PATH);
- TestUtil.waitForValidation();
- }
- }
- return project;
- }
-}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java 2011-09-14 14:25:45 UTC (rev 34731)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java 2011-09-14 15:42:46 UTC (rev 34732)
@@ -17,6 +17,7 @@
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.seam.core.CDISeamCorePlugin;
import org.jboss.tools.cdi.seam.core.international.el.CDIInternationalMessagesELResolver;
+import org.jboss.tools.cdi.seam.core.test.SeamCoreTest;
import org.jboss.tools.common.el.core.resolver.ELContext;
import org.jboss.tools.common.el.core.resolver.ELResolver;
import org.jboss.tools.common.text.TextProposal;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/jms/SeamJmsValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/jms/SeamJmsValidationTest.java 2011-09-14 14:25:45 UTC (rev 34731)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/jms/SeamJmsValidationTest.java 2011-09-14 15:42:46 UTC (rev 34732)
@@ -12,7 +12,7 @@
import org.eclipse.core.resources.IFile;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
-import org.jboss.tools.cdi.seam.core.test.international.SeamCoreTest;
+import org.jboss.tools.cdi.seam.core.test.SeamCoreTest;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/servlet/SeamServletValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/servlet/SeamServletValidationTest.java 2011-09-14 14:25:45 UTC (rev 34731)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/servlet/SeamServletValidationTest.java 2011-09-14 15:42:46 UTC (rev 34732)
@@ -12,7 +12,7 @@
import org.eclipse.core.resources.IFile;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
-import org.jboss.tools.cdi.seam.core.test.international.SeamCoreTest;
+import org.jboss.tools.cdi.seam.core.test.SeamCoreTest;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-09-14 14:25:45 UTC (rev 34731)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-09-14 15:42:46 UTC (rev 34732)
@@ -24,7 +24,10 @@
org.eclipse.jdt.ui,
org.jboss.tools.cdi.seam.solder.core.test,
org.jboss.tools.cdi.text.ext,
- org.eclipse.wst.validation
+ org.eclipse.wst.validation,
+ org.jboss.tools.common.base.test,
+ org.jboss.tools.cdi.seam.core.test,
+ org.jboss.tools.jst.text.ext
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.cdi.seam.text.ext.test
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java 2011-09-14 14:25:45 UTC (rev 34731)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java 2011-09-14 15:42:46 UTC (rev 34732)
@@ -17,6 +17,7 @@
import org.eclipse.wst.validation.ValidationFramework;
import org.jboss.tools.cdi.core.test.CDICoreTestSetup;
import org.jboss.tools.cdi.seam.config.core.test.SeamConfigTestSetup;
+import org.jboss.tools.cdi.seam.core.test.SeamCoreTestSetup;
import org.jboss.tools.cdi.seam.solder.core.test.SeamSolderTestSetup;
public class CdiSeamTextExtAllTests {
@@ -30,9 +31,12 @@
TestSuite suite = new TestSuite("CDI Seam OpenOns Tests");
suite.addTestSuite(CDISeamResourceLoadingHyperlinkDetectorTest.class);
-
suiteAll.addTest(new CDICoreTestSetup(suite));
+ TestSuite suiteSeam = new TestSuite("CDI Seam Resource Bundle Tests");
+ suiteSeam.addTestSuite(SeamResourceBundleHyperlinkTest.class);
+ suiteAll.addTest(new SeamCoreTestSetup(suiteSeam));
+
TestSuite suiteConfig = new TestSuite("CDI Seam Config OpenOns Tests");
suiteConfig.addTestSuite(SeamConfigTagNameHyperlinkTest.class);
suiteConfig.addTestSuite(SeamConfigInjectedPointHyperlinkTest.class);
@@ -45,7 +49,7 @@
suiteSolder.addTestSuite(SeamGenericInjectedPointHyperlinkTest.class);
suiteAll.addTest(new SeamSolderTestSetup(suiteSolder));
-
+
return suiteAll;
}
}
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamResourceBundleHyperlinkTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamResourceBundleHyperlinkTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamResourceBundleHyperlinkTest.java 2011-09-14 15:42:46 UTC (rev 34732)
@@ -0,0 +1,41 @@
+package org.jboss.tools.cdi.seam.text.ext.test;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.jboss.tools.cdi.seam.core.test.SeamCoreTest;
+import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil;
+import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlink;
+
+public class SeamResourceBundleHyperlinkTest extends SeamCoreTest {
+ private static final String PAGE_NAME = "WebContent/seam-international.xhtml";
+
+ /**
+ * The test case finds the hyperlinks for bundle property and checks that there are only Messages Hyperlinks
+ * @throws Exception
+ */
+ public void testCDIInternationalMessagesHyperLink () throws Exception {
+ ArrayList<CDIHyperlinkTestUtil.TestRegion> regionList = new ArrayList<CDIHyperlinkTestUtil.TestRegion>();
+ regionList.add(new CDIHyperlinkTestUtil.TestRegion(398, 11,
+ new CDIHyperlinkTestUtil.TestHyperlink[]{new CDIHyperlinkTestUtil.TestHyperlink(ELHyperlink.class, "Open property 'home_header' of bundle 'messages'", "messages.properties")}));
+ regionList.add(new CDIHyperlinkTestUtil.TestRegion(389, 8,
+ new CDIHyperlinkTestUtil.TestHyperlink[]{new CDIHyperlinkTestUtil.TestHyperlink(ELHyperlink.class, "Open bundle 'messages'", (String)null)}));
+ regionList.add(new CDIHyperlinkTestUtil.TestRegion(381, 7,
+ new CDIHyperlinkTestUtil.TestHyperlink[]{new CDIHyperlinkTestUtil.TestHyperlink(ELHyperlink.class, "Open bundle 'messages'", (String)null)}));
+ regionList.add(new CDIHyperlinkTestUtil.TestRegion(381, 16,
+ new CDIHyperlinkTestUtil.TestHyperlink[]{new CDIHyperlinkTestUtil.TestHyperlink(ELHyperlink.class, "Open bundle 'messages'", (String)null)}));
+
+ for (CDIHyperlinkTestUtil.TestRegion testRegion : regionList) {
+ IHyperlink[] hyperlinks = CDIHyperlinkTestUtil.detectELHyperlinks(PAGE_NAME, getTestProject(), testRegion.getRegion().getOffset());
+ assertNotNull("Hyperlink not found!", hyperlinks);
+ for (IHyperlink hyperlink : hyperlinks) {
+ assertTrue("Hyperlink found is not EL Hyperlink", (hyperlink instanceof ELHyperlink));
+ }
+
+ CDIHyperlinkTestUtil.checkTestRegion(hyperlinks, testRegion);
+ }
+ }
+
+
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamResourceBundleHyperlinkTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2011-09-14 14:25:45 UTC (rev 34731)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2011-09-14 15:42:46 UTC (rev 34732)
@@ -20,7 +20,10 @@
org.jboss.tools.cdi.core,
org.jboss.tools.common.el.core,
org.jboss.tools.jst.web.ui,
- org.eclipse.wst.validation;bundle-version="1.2.300"
+ org.eclipse.wst.validation;bundle-version="1.2.300",
+ org.jboss.tools.jst.jsp,
+ org.jboss.tools.jst.web,
+ org.jboss.tools.jst.text.ext
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.cdi.text.ext.test
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-09-14 14:25:45 UTC (rev 34731)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-09-14 15:42:46 UTC (rev 34732)
@@ -20,7 +20,6 @@
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
@@ -43,6 +42,9 @@
import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.util.AxisUtil;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditorPart;
+import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlinkDetector;
import org.jboss.tools.jst.web.ui.editors.WebCompoundEditor;
public class CDIHyperlinkTestUtil extends TestCase{
@@ -137,7 +139,7 @@
documentProvider.disconnect(editorInput);
}
- private static void checkTestRegion(IHyperlink[] links, TestRegion testRegion){
+ public static void checkTestRegion(IHyperlink[] links, TestRegion testRegion){
for(IHyperlink link : links){
TestHyperlink testLink = findTestHyperlink(testRegion.hyperlinks, link);
assertNotNull("Unexpected hyperlink - "+link.getHyperlinkText(), testLink);
@@ -201,6 +203,20 @@
}
public static IHyperlink checkHyperLinkInXml(String fileName, IProject project, int offset, String hyperlinkClassName) throws Exception {
+ IHyperlink[] links = detectHyperlinks(fileName, project, offset);
+
+ if(links!=null) {
+ for (IHyperlink hyperlink : links) {
+ if(hyperlink.getClass().getName().equals(hyperlinkClassName)) {
+ return hyperlink;
+ }
+ }
+ }
+ fail("Can't find HyperLink");
+ return null;
+ }
+
+ public static IHyperlink[] detectHyperlinks(String fileName, IProject project, int offset) {
Region region = new Region(offset, 0);
IFile file = project.getFile(fileName);
@@ -217,24 +233,52 @@
if(parts.length>0) {
viewer = ((StructuredTextEditor)parts[0]).getTextViewer();
}
+ } else if (part instanceof JSPMultiPageEditor) {
+ IEditorPart[] parts = ((JSPMultiPageEditorPart)part).findEditors(editorInput);
+ if(parts.length>0) {
+ viewer = ((StructuredTextEditor)parts[0]).getTextViewer();
+ }
} else if(part instanceof ObjectMultiPageEditor) {
viewer = ((ObjectMultiPageEditor)part).getSourceEditor().getTextViewer();
} else if(part instanceof StructuredTextEditor) {
viewer = ((StructuredTextEditor)part).getTextViewer();
}
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, region, true);
- if(links!=null) {
- for (IHyperlink hyperlink : links) {
- if(hyperlink.getClass().getName().equals(hyperlinkClassName)) {
- return hyperlink;
- }
+ return HyperlinkDetector.getInstance().detectHyperlinks(viewer, region, true);
+ }
+
+ public static IHyperlink[] detectELHyperlinks(String fileName, IProject project, int offset) {
+ Region region = new Region(offset, 0);
+ IFile file = project.getFile(fileName);
+
+ assertNotNull("The file \"" + fileName + "\" is not found", file);
+ assertTrue("The file \"" + fileName + "\" is not found", file.isAccessible());
+
+ FileEditorInput editorInput = new FileEditorInput(file);
+
+ IEditorPart part = openFileInEditor(file);
+ if(part instanceof EditorPartWrapper) part = ((EditorPartWrapper)part).getEditor();
+ ISourceViewer viewer = null;
+ if (part instanceof XMLMultiPageEditorPart) {
+ IEditorPart[] parts = ((XMLMultiPageEditorPart)part).findEditors(editorInput);
+ if(parts.length>0) {
+ viewer = ((StructuredTextEditor)parts[0]).getTextViewer();
}
+ } else if (part instanceof JSPMultiPageEditor) {
+ IEditorPart[] parts = ((JSPMultiPageEditorPart)part).findEditors(editorInput);
+ if(parts.length>0) {
+ viewer = ((StructuredTextEditor)parts[0]).getTextViewer();
+ }
+ } else if(part instanceof ObjectMultiPageEditor) {
+ viewer = ((ObjectMultiPageEditor)part).getSourceEditor().getTextViewer();
+ } else if(part instanceof StructuredTextEditor) {
+ viewer = ((StructuredTextEditor)part).getTextViewer();
}
- fail("Can't find HyperLink");
- return null;
+
+ return new ELHyperlinkDetector().detectHyperlinks(viewer, region, true);
}
+
private static TestRegion findOffsetInRegions(int offset, List<TestRegion> regionList){
for(TestRegion testRegion : regionList){
if(offset >= testRegion.region.getOffset() && offset <= testRegion.region.getOffset()+testRegion.region.getLength())
@@ -410,6 +454,9 @@
hyperlinks.add(testHyperlink);
}
}
+ public IRegion getRegion() {
+ return region;
+ }
}
public static class TestHyperlink{
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2011-09-14 14:25:45 UTC (rev 34731)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2011-09-14 15:42:46 UTC (rev 34732)
@@ -12,19 +12,15 @@
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.util.Assert;
import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
@@ -40,11 +36,9 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Item;
-import org.eclipse.ui.IEditorActionBarContributor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IKeyBindingService;
import org.eclipse.ui.INestableKeyBindingService;
import org.eclipse.ui.IPropertyListener;
@@ -52,9 +46,7 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.handlers.IHandlerService;
import org.eclipse.ui.part.EditorPart;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
import org.eclipse.ui.part.MultiPageEditorSite;
-import org.eclipse.ui.part.MultiPageSelectionProvider;
import org.eclipse.ui.part.PageSwitcher;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.jboss.tools.common.core.resources.XModelObjectEditorInput;
@@ -329,7 +321,31 @@
}
return null;
}
+
+ /**
+ * Find the editors contained in this multi-page editor
+ * whose editor input match the provided input.
+ * @param input the editor input
+ * @return the editors contained in this multi-page editor
+ * whose editor input match the provided input
+ * @since 3.3
+ */
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public final IEditorPart[] findEditors(IEditorInput input) {
+ List result = new ArrayList();
+ int count = getPageCount();
+ for (int i = 0; i < count; i++) {
+ IEditorPart editor = getEditor(i);
+ if (editor != null
+ && editor.getEditorInput() != null
+ && editor.getEditorInput().equals(input)) {
+ result.add(editor);
+ }
+ }
+ return (IEditorPart[]) result.toArray(new IEditorPart[result.size()]);
+ }
+
private CTabItem getItem(int pageIndex) {
return getTabFolder().getItem(pageIndex);
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34731 - in trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core: src/org/jboss/ide/eclipse/as/openshift/core/internal and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-14 10:25:45 -0400 (Wed, 14 Sep 2011)
New Revision: 34731
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftRequest.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractOpenshiftRequest.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractJsonMarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractOpenshiftMarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ApplicationRequestJsonMarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/DomainRequestJsonMarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftMarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ListCartridgesRequestJsonMarshaller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/UserInfoRequestJsonMarshaller.java
Log:
[JBIDE-9510]
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-14 14:25:05 UTC (rev 34730)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-14 14:25:45 UTC (rev 34731)
@@ -14,6 +14,6 @@
Export-Package: org.jboss.dmr;x-friends:="org.jboss.ide.eclipse.as.openshift.test",
org.jboss.ide.eclipse.as.openshift.core,
org.jboss.ide.eclipse.as.openshift.core.internal;x-friends:="org.jboss.ide.eclipse.as.openshift.test",
- org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;x-friends:="org.jboss.ide.eclipse.as.openshift.test",
org.jboss.ide.eclipse.as.openshift.core.internal.request;x-friends:="org.jboss.ide.eclipse.as.openshift.test",
+ org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling;x-friends:="org.jboss.ide.eclipse.as.openshift.test",
org.jboss.ide.eclipse.as.openshift.core.internal.response;x-friends:="org.jboss.ide.eclipse.as.openshift.test"
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-14 14:25:05 UTC (rev 34730)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-14 14:25:45 UTC (rev 34731)
@@ -28,10 +28,6 @@
import org.jboss.ide.eclipse.as.openshift.core.internal.httpclient.HttpClientException;
import org.jboss.ide.eclipse.as.openshift.core.internal.httpclient.UnauthorizedException;
import org.jboss.ide.eclipse.as.openshift.core.internal.httpclient.UrlConnectionHttpClient;
-import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ApplicationRequestJsonMarshaller;
-import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.DomainRequestJsonMarshaller;
-import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ListCartridgesRequestJsonMarshaller;
-import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.UserInfoRequestJsonMarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.AbstractDomainRequest;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ApplicationAction;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ApplicationRequest;
@@ -40,11 +36,16 @@
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ListCartridgesRequest;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftJsonRequestFactory;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.UserInfoRequest;
+import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.ApplicationRequestJsonMarshaller;
+import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.DomainRequestJsonMarshaller;
+import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.ListCartridgesRequestJsonMarshaller;
+import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.UserInfoRequestJsonMarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.ApplicationResponseUnmarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.DomainResponseUnmarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.JsonSanitizer;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.ListCartridgesResponseUnmarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.OpenshiftResponse;
+import org.jboss.ide.eclipse.as.openshift.core.internal.response.UserInfoResponseUnmarshaller;
/**
* @author André Dietisheim
@@ -62,13 +63,16 @@
}
public UserInfo getUserInfo() throws OpenshiftException {
- UserInfoRequest userInfoRequest = new UserInfoRequest(username, true);
- String url = userInfoRequest.getUrlString(BASE_URL);
+ UserInfoRequest request = new UserInfoRequest(username, true);
+ String url = request.getUrlString(BASE_URL);
try {
- String userInfoRequestString = new UserInfoRequestJsonMarshaller().marshall(userInfoRequest);
- String request = new OpenshiftJsonRequestFactory(password, userInfoRequestString).create();
- String userInfoResponse = createHttpClient(url).post(request);
- throw new UnsupportedOperationException();
+ String requestString = new UserInfoRequestJsonMarshaller().marshall(request);
+ String openShiftRequestString = new OpenshiftJsonRequestFactory(password, requestString).create();
+ String responseString = createHttpClient(url).post(openShiftRequestString);
+ responseString = JsonSanitizer.sanitize(responseString);
+ OpenshiftResponse<UserInfo> response =
+ new UserInfoResponseUnmarshaller().unmarshall(responseString);
+ return response.getData();
} catch (MalformedURLException e) {
throw new OpenshiftEndpointException(
url, e, "Could not get user info for user \"{0}\" at \"{1}\"", username, url, e);
@@ -185,10 +189,9 @@
*/
@Override
public Status getStatus(Application application) throws OpenshiftException {
+ application = requestApplicationAction(
+ new ApplicationRequest(application.getName(), application.getCartridge(),ApplicationAction.STATUS, username, true));
throw new UnsupportedOperationException();
- // requestApplicationAction(
- // new ApplicationRequest(application.getName(),
- // application.getCartridge(), ApplicationAction.STOP, username, true));
}
protected Application requestApplicationAction(ApplicationRequest applicationRequest) throws OpenshiftException {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractOpenshiftRequest.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractOpenshiftRequest.java 2011-09-14 14:25:05 UTC (rev 34730)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractOpenshiftRequest.java 2011-09-14 14:25:45 UTC (rev 34731)
@@ -13,7 +13,6 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.IOpenshiftRequest;
import org.jboss.ide.eclipse.as.openshift.core.internal.utils.UrlBuilder;
/**
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.java (from rev 34672, trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.java 2011-09-14 14:25:45 UTC (rev 34731)
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.openshift.core.internal.request;
+
+/**
+ * @author André Dietisheim
+ */
+public interface IOpenshiftRequest {
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/IOpenshiftRequest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractJsonMarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractJsonMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractJsonMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling;
import org.jboss.dmr.ModelNode;
import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractOpenshiftMarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractOpenshiftMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/AbstractOpenshiftMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731)
@@ -1,6 +1,8 @@
-package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling;
+import org.jboss.ide.eclipse.as.openshift.core.internal.request.IOpenshiftRequest;
+
public abstract class AbstractOpenshiftMarshaller<REQUEST extends IOpenshiftRequest> implements IOpenshiftMarshaller<REQUEST> {
@Override
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ApplicationRequestJsonMarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ApplicationRequestJsonMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ApplicationRequestJsonMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling;
import org.jboss.dmr.ModelNode;
import org.jboss.ide.eclipse.as.openshift.core.Cartridge;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/DomainRequestJsonMarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/DomainRequestJsonMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/DomainRequestJsonMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling;
import org.jboss.dmr.ModelNode;
import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftMarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731)
@@ -8,9 +8,10 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
+import org.jboss.ide.eclipse.as.openshift.core.internal.request.IOpenshiftRequest;
/**
* @author André Dietisheim
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftRequest.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java 2011-09-13 12:09:46 UTC (rev 34672)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/IOpenshiftRequest.java 2011-09-14 14:25:45 UTC (rev 34731)
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
-
-/**
- * @author André Dietisheim
- */
-public interface IOpenshiftRequest {
-
-}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ListCartridgesRequestJsonMarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ListCartridgesRequestJsonMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/ListCartridgesRequestJsonMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling;
import org.jboss.dmr.ModelNode;
import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/UserInfoRequestJsonMarshaller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java 2011-09-13 12:09:46 UTC (rev 34672)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/marshalling/UserInfoRequestJsonMarshaller.java 2011-09-14 14:25:45 UTC (rev 34731)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;
+package org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.UserInfoRequest;
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34730 - trunk/as/plugins.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-14 10:25:05 -0400 (Wed, 14 Sep 2011)
New Revision: 34730
Modified:
trunk/as/plugins/pom.xml
Log:
[JBIDE-9510] added openshift plugins to the build
Modified: trunk/as/plugins/pom.xml
===================================================================
--- trunk/as/plugins/pom.xml 2011-09-14 14:24:37 UTC (rev 34729)
+++ trunk/as/plugins/pom.xml 2011-09-14 14:25:05 UTC (rev 34730)
@@ -25,7 +25,10 @@
<module>org.jboss.ide.eclipse.as.jmx.integration</module>
<module>org.jboss.ide.eclipse.as.management.as7</module>
<module>org.jboss.ide.eclipse.as.egit.core</module>
- <module>org.jboss.ide.eclipse.as.egit.ui</module>
+ <module>org.jboss.ide.eclipse.as.egit.core</module>
+ <module>org.jboss.ide.eclipse.as.openshift.core</module>
+ <module>org.jboss.ide.eclipse.as.openshift.ui</module>
+
</modules>
</project>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34729 - trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-14 10:24:37 -0400 (Wed, 14 Sep 2011)
New Revision: 34729
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/pom.xml
Log:
[JBIDE-9510] added openshift plugins to the build
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/pom.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/pom.xml (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/pom.xml 2011-09-14 14:24:37 UTC (rev 34729)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.as</groupId>
+ <artifactId>plugins</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.as.plugins</groupId>
+ <artifactId>org.jboss.ide.eclipse.as.openshift.core</artifactId>
+ <packaging>eclipse-plugin</packaging>
+</project>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34728 - trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-14 10:24:30 -0400 (Wed, 14 Sep 2011)
New Revision: 34728
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/pom.xml
Log:
[JBIDE-9510] added openshift plugins to the build
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/pom.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/pom.xml (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/pom.xml 2011-09-14 14:24:30 UTC (rev 34728)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.as</groupId>
+ <artifactId>plugins</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.as.plugins</groupId>
+ <artifactId>org.jboss.ide.eclipse.as.openshift.ui</artifactId>
+ <packaging>eclipse-plugin</packaging>
+</project>
14 years, 7 months
- 1
- 0