JBoss Tools SVN: r24618 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-01 14:21:29 -0400 (Wed, 01 Sep 2010)
New Revision: 24618
Modified:
trunk/build/publish.sh
Log:
ensure that metadata file is being created for aggregate builds; suppress checksum errors
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-09-01 18:03:13 UTC (rev 24617)
+++ trunk/build/publish.sh 2010-09-01 18:21:29 UTC (rev 24618)
@@ -41,23 +41,23 @@
z=$siteZip
fi
+# note the job name, build number, SVN rev, and build ID of the latest snapshot zip
+mkdir -p ${STAGINGDIR}/logs
+METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt"
+if [[ ${SVN_REVISION} ]]; then
+ METAFILE="${BUILD_ID}-H${BUILD_NUMBER}-r${SVN_REVISION}.txt"
+ echo "SVN_REVISION = ${SVN_REVISION}" > ${STAGINGDIR}/logs/${METAFILE}
+else
+ echo -n "" > ${STAGINGDIR}/logs/${METAFILE}
+fi
+echo "JOB_NAME = ${JOB_NAME}" >> ${STAGINGDIR}/logs/${METAFILE}
+echo "BUILD_NUMBER = ${BUILD_NUMBER}" >> ${STAGINGDIR}/logs/${METAFILE}
+echo "BUILD_ID = ${BUILD_ID}" >> ${STAGINGDIR}/logs/${METAFILE}
+echo "WORKSPACE = ${WORKSPACE}" >> ${STAGINGDIR}/logs/${METAFILE}
+echo "HUDSON_SLAVE = $(uname -a)" >> ${STAGINGDIR}/logs/${METAFILE}
+
+#echo "$z ..."
if [[ $z != "" ]] && [[ -f $z ]] ; then
- #echo "$z ..."
- # note the job name, build number, SVN rev, and build ID of the latest snapshot zip
- mkdir -p ${STAGINGDIR}/logs
- METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt"
- if [[ ${SVN_REVISION} ]]; then
- METAFILE="${BUILD_ID}-H${BUILD_NUMBER}-r${SVN_REVISION}.txt"
- echo "SVN_REVISION = ${SVN_REVISION}" > ${STAGINGDIR}/logs/${METAFILE}
- else
- echo -n "" > ${STAGINGDIR}/logs/${METAFILE}
- fi
- echo "JOB_NAME = ${JOB_NAME}" >> ${STAGINGDIR}/logs/${METAFILE}
- echo "BUILD_NUMBER = ${BUILD_NUMBER}" >> ${STAGINGDIR}/logs/${METAFILE}
- echo "BUILD_ID = ${BUILD_ID}" >> ${STAGINGDIR}/logs/${METAFILE}
- echo "WORKSPACE = ${WORKSPACE}" >> ${STAGINGDIR}/logs/${METAFILE}
- echo "HUDSON_SLAVE = $(uname -a)" >> ${STAGINGDIR}/logs/${METAFILE}
-
# unzip into workspace for publishing as unpacked site
mkdir -p ${STAGINGDIR}/all/repo
unzip -u -o -q -d ${STAGINGDIR}/all/repo $z
14 years, 4 months
JBoss Tools SVN: r24617 - workspace/mareshkau/xulrunner-1.9.1.2.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-01 14:03:13 -0400 (Wed, 01 Sep 2010)
New Revision: 24617
Added:
workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.carbon.macosx.x86/
Removed:
workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.carbon.macosx/
Log:
platform arch has been added to plugin name
Copied: workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.carbon.macosx.x86 (from rev 24616, workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.carbon.macosx)
14 years, 4 months
JBoss Tools SVN: r24616 - in trunk/documentation/whatsnew: modeshape and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2010-09-01 13:35:18 -0400 (Wed, 01 Sep 2010)
New Revision: 24616
Added:
trunk/documentation/whatsnew/modeshape/
trunk/documentation/whatsnew/modeshape/images/
trunk/documentation/whatsnew/modeshape/images/ModeShapeMessageConsole.png
trunk/documentation/whatsnew/modeshape/images/ModeShapePreferencesDialog.png
trunk/documentation/whatsnew/modeshape/images/ModeShapeView.png
trunk/documentation/whatsnew/modeshape/images/PublishDialog.png
trunk/documentation/whatsnew/modeshape/images/ResourceContextMenu.png
trunk/documentation/whatsnew/modeshape/modeshape-news-7.1.0.M2.html
Log:
JBIDE-6915 ModeShape New & Noteworthy: created the whatsnew folder for ModeShape, as well as the html page and the images.
Added: trunk/documentation/whatsnew/modeshape/images/ModeShapeMessageConsole.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/modeshape/images/ModeShapeMessageConsole.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/modeshape/images/ModeShapePreferencesDialog.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/modeshape/images/ModeShapePreferencesDialog.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/modeshape/images/ModeShapeView.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/modeshape/images/ModeShapeView.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/modeshape/images/PublishDialog.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/modeshape/images/PublishDialog.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/modeshape/images/ResourceContextMenu.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/modeshape/images/ResourceContextMenu.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/modeshape/modeshape-news-7.1.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/modeshape/modeshape-news-7.1.0.M2.html (rev 0)
+++ trunk/documentation/whatsnew/modeshape/modeshape-news-7.1.0.M2.html 2010-09-01 17:35:18 UTC (rev 24616)
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>ModeShape What's New</title>
+</head>
+<body>
+<h1>ModeShape 7.1.0 M2 What's New</h1>
+<p align="right"><a href="../index.html">< Main Index</a></p>
+<p>Last revised September 1, 2010</p>
+<p>The ModeShape publishing feature, which is new to JBoss Tools, enables you to publish files to (upload) and unpublish files from (remove) ModeShape repositories.
+Once files are uploaded to a ModeShaper repository, the appropriate ModeShape sequencers will extract and add information, such as relationships and metadata.
+For more details on the ModeShape project visit the <a href="http://www.modeshape.org/">ModeShape project</a>.
+<p>The ModeShape publishing feature consists of a ModeShape view, resource context menu, publishing wizard, preference dialog, and a Console view.
+Each of these are briefly discussed below.</p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td valign="top" align="left">
+ <p>
+ <b>ModeShape View</b>
+ </p>
+ </td>
+
+ <td valign="top">
+ <p>
+ The ModeShape view allows you to register ModeShape instances using a host URL, user, and password. A ModeShape instance
+ is a host that is running the ModeShape REST service. Once a ModeShape instance is registered, the ModeShape view obtains
+ the repositories and repository workspaces from ModeShape. These workspaces are where you can publish your files. This
+ view also allows you to unpublish files from a workspace in case you ever need to do that. Using the ModeShape view you
+ can unregister (remove) a ModeShape instance, reconnect to a ModeShape instance, and edit a ModeShape instance's
+ properties. The ModeShape view quite simply is how you maintain your registry of ModeShape repositories. And the
+ ModeShape registry is persisted from session to session.
+ </p>
+
+ <p>
+ Here is what the ModeShape view looks like:
+ </p>
+
+ <p>
+ <img src="images/ModeShapeView.png" alt="ModeShape View"/>
+ </p>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td valign="top" align="left">
+ <p>
+ <b>Resource Context Menu</b>
+ </p>
+ </td>
+
+ <td valign="top">
+ <p>
+ Once you have one or more ModeShape instances registered, you can now start publishing files. When you select one or
+ more projects, folders, or files in your Eclipse workspace, the context menu for those files will include a ModeShape
+ submenu that allows you to publish or unpublish those resources. If only one resource is selected you can also view the
+ locations where that resource has been published. When you publish or unpublish the files, the publishing wizard is
+ displayed.
+ </p>
+
+ <p>
+ Here is what the ModeShape resource context menu looks like:
+ </p>
+
+ <p>
+ <img src="images/ResourceContextMenu.png" alt="ModeShape Resource Context Menu"/>
+ </p>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td valign="top" align="left">
+ <p>
+ <b>Publishing Wizard</b>
+ </p>
+ </td>
+
+ <td valign="top">
+ <p>
+ The publishing wizard allows you to choose which ModeShape repository workspace you want the operation to take place.
+ It also lists the files that will be involved in the operation. When a project or folder is selected all their included
+ files are published. But there might be certain folder names and certain file types that you never want to publish.
+ Wouldn't it be nice to filter those out of all your publishing operations? The ModeShape preferences dialog helps you do
+ just that.
+ </p>
+
+ <p>
+ Here is what the ModeShape publishing wizard looks like:
+ </p>
+
+ <p>
+ <img src="images/PublishDialog.png" alt="ModeShape Publishing Wizard"/>
+ </p>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td valign="top" align="left">
+ <p>
+ <b>Preference Dialog</b>
+ </p>
+ </td>
+
+ <td valign="top">
+ <p>
+ The preferences dialog is where you maintain a list of file extensions and a list of folder names to filter out of
+ your publishing operations. These can be changed at any time and will be remembered from session to session. For each
+ file that does get published or unpublished you can see the outcome using the console view.
+ </p>
+
+ <p>
+ Here is what the ModeShape preference dialog looks like:
+ </p>
+
+ <p>
+ <img src="images/ModeShapePreferencesDialog.png" alt="ModeShape Preferences Dialog"/>
+ </p>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td valign="top" align="left">
+ <p>
+ <b>ModeShape Console View</b>
+ </p>
+ </td>
+
+ <td valign="top">
+ <p>
+ The ModeShape console view is where publishing and unpublishing operations direct their output. In the console view you
+ will see where the publishing operation took place, how long the operation took, and the outcome for each file included in
+ the operation. You can run these operations in the background so you can have many running at once. You can also cancel an
+ operation while it is processing. For each file, a hyperlink, which allows you to open the file in an Eclipse editor, and
+ a ModeShape repository workspace URL is provided.
+ </p>
+
+ <p>
+ Here is what the ModeShape console view looks like:
+ </p>
+
+ <p>
+ <img src="images/ModeShapeMessageConsole.png" alt="ModeShape Console View"/>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr /></td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/modeshape/modeshape-news-7.1.0.M2.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 4 months
JBoss Tools SVN: r24615 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-09-01 12:17:43 -0400 (Wed, 01 Sep 2010)
New Revision: 24615
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6957
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2010-09-01 15:22:51 UTC (rev 24614)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2010-09-01 16:17:43 UTC (rev 24615)
@@ -40,7 +40,7 @@
"org.jboss.jsr299.tck.tests.decorators.definition.Foo",
"org.jboss.jsr299.tck.tests.decorators.definition.Bar",
"org.jboss.jsr299.tck.tests.decorators.definition.Baz",
- "org.jboss.jsr299.tck.tests.decorators.definition.Baz");
+ "org.jboss.jsr299.tck.tests.decorators.definition.Boo");
}
/**
14 years, 4 months
JBoss Tools SVN: r24614 - in trunk/esb/plugins/org.jboss.tools.esb.core: resources/help and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-01 11:22:51 -0400 (Wed, 01 Sep 2010)
New Revision: 24614
Added:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddHibernateBusSupport.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java
Log:
https://jira.jboss.org/browse/JBIDE-6941
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-09-01 15:16:05 UTC (rev 24613)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-09-01 15:22:51 UTC (rev 24614)
@@ -49,6 +49,8 @@
class="org.jboss.tools.esb.core.model.handlers.AddProviderSupport"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.AddScheduleProviderSupport"
class="org.jboss.tools.esb.core.model.handlers.AddScheduleProviderSupport"/>
+ <xclass id="org.jboss.tools.esb.core.model.handlers.AddHibernateBusSupport"
+ class="org.jboss.tools.esb.core.model.handlers.AddHibernateBusSupport"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.AddGenericActionSupport"
class="org.jboss.tools.esb.core.model.handlers.AddGenericActionSupport"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport"
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-09-01 15:16:05 UTC (rev 24613)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-09-01 15:22:51 UTC (rev 24614)
@@ -67,6 +67,8 @@
ESBProviders101_AddHibernateProvider_0.Title=ESB Hibernate Provider
ESBProviders101_AddHibernateProvider_1.WindowTitle=Add Hibernate Provider
ESBProviders101_AddHibernateProvider_1.Title=ESB Channel
+ESBProviders101_AddHibernateProvider_2.WindowTitle=Add Hibernate Provider
+ESBProviders101_AddHibernateProvider_2.Title=ESB Message Filter
ESBProviders101_Properties.Title=Providers List
@@ -116,6 +118,8 @@
ESBProviders110_AddHibernateProvider_0.Title=ESB Hibernate Provider
ESBProviders110_AddHibernateProvider_1.WindowTitle=Add Hibernate Provider
ESBProviders110_AddHibernateProvider_1.Title=ESB Channel
+ESBProviders110_AddHibernateProvider_2.WindowTitle=Add Hibernate Provider
+ESBProviders110_AddHibernateProvider_2.Title=ESB Message Filter
ESBProviders110_AddHTTPProvider_0.WindowTitle=Add HTTP Provider
ESBProviders110_AddHTTPProvider_0.Title=ESB HTTP Provider
@@ -170,6 +174,8 @@
ESBProviders120_AddHibernateProvider_0.Title=ESB Hibernate Provider
ESBProviders120_AddHibernateProvider_1.WindowTitle=Add Hibernate Provider
ESBProviders120_AddHibernateProvider_1.Title=ESB Channel
+ESBProviders120_AddHibernateProvider_2.WindowTitle=Add Hibernate Provider
+ESBProviders120_AddHibernateProvider_2.Title=ESB Message Filter
ESBProviders120_AddHTTPProvider_0.WindowTitle=Add HTTP Provider
ESBProviders120_AddHTTPProvider_0.Title=ESB HTTP Provider
@@ -229,6 +235,8 @@
ESBProviders130_AddHibernateProvider_0.Title=ESB Hibernate Provider
ESBProviders130_AddHibernateProvider_1.WindowTitle=Add Hibernate Provider
ESBProviders130_AddHibernateProvider_1.Title=ESB Channel
+ESBProviders130_AddHibernateProvider_2.WindowTitle=Add Hibernate Provider
+ESBProviders130_AddHibernateProvider_2.Title=ESB Message Filter
ESBProviders130_AddHTTPProvider_0.WindowTitle=Add HTTP Provider
ESBProviders130_AddHTTPProvider_0.Title=ESB HTTP Provider
@@ -294,6 +302,10 @@
ESBHibernateProvider101_AddBus.WindowTitle=Add Hibernate Channel
ESBHibernateProvider101_AddBus.Title=ESB Hibernate Channel
+ESBHibernateProvider101_AddBus_0.WindowTitle=Add Hibernate Channel
+ESBHibernateProvider101_AddBus_0.Title=ESB Hibernate Channel
+ESBHibernateProvider101_AddBus_1.WindowTitle=Add Hibernate Channel
+ESBHibernateProvider101_AddBus_1.Title=ESB Message Filter
ESBHibernateProvider101_Properties.Title=ESB Hibernate Provider
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2010-09-01 15:16:05 UTC (rev 24613)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2010-09-01 15:22:51 UTC (rev 24614)
@@ -1096,7 +1096,7 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="ftp provider" loader="ElementType" name="element type">
+ <XModelAttribute default="hibernate provider" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -1111,12 +1111,16 @@
<XActionItem ICON="action.empty" displayName="New" group="1"
kind="list" name="CreateActions">
<XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddHibernateBusSupport"
displayName="Hibernate Bus..." kind="action" name="AddBus">
<EntityData EntityName="ESBHibernateBus101">
<AttributeData AttributeName="id"/>
</EntityData>
+ <EntityData EntityName="ESBHibernateMessageFilter101">
+ <AttributeData AttributeName="class name"/>
+ <AttributeData AttributeName="event" Mandatory="no"/>
+ </EntityData>
</XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
@@ -1960,6 +1964,10 @@
<EntityData EntityName="ESBBusCreator">
<AttributeData AttributeName="id"/>
</EntityData>
+ <EntityData EntityName="ESBHibernateMessageFilter101">
+ <AttributeData AttributeName="class name"/>
+ <AttributeData AttributeName="event" Mandatory="no"/>
+ </EntityData>
</XActionItem>
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBJBRBus101"
Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddHibernateBusSupport.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddHibernateBusSupport.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddHibernateBusSupport.java 2010-09-01 15:22:51 UTC (rev 24614)
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.esb.core.model.handlers;
+
+import java.util.Properties;
+
+import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
+import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.FindObjectHelper;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class AddHibernateBusSupport extends SpecialWizardSupport {
+ String busEntity;
+ String filterEntity;
+
+ public AddHibernateBusSupport() {}
+
+ protected void reset() {
+ busEntity = getEntityData()[0].getModelEntity().getName();
+ filterEntity = getEntityData()[1].getModelEntity().getName();
+ }
+
+ public String[] getActionNames(int stepId) {
+ if(getStepId() < getEntityData().length - 1) {
+ if(getStepId() == 0) {
+ return new String[]{NEXT, CANCEL};
+ } else {
+ return new String[]{BACK, NEXT, CANCEL};
+ }
+ } else if(getEntityData().length > 0) {
+ return new String[]{BACK, FINISH, CANCEL};
+ }
+ return new String[]{FINISH, CANCEL, HELP};
+ }
+
+ public boolean isActionEnabled(String name) {
+ if(FINISH.equals(name) && getStepId() < getEntityData().length - 1) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public void action(String name) throws XModelException {
+ if(FINISH.equals(name)) {
+ execute();
+ setFinished(true);
+ } else if(CANCEL.equals(name)) {
+ setFinished(true);
+ } else if(BACK.equals(name)) {
+ if(getStepId() == 0) return;
+ setStepId(getStepId() - 1);
+ } else if(NEXT.equals(name)) {
+ if(getStepId() >= getEntityData().length - 1) return;
+ setStepId(getStepId() + 1);
+ } else if(HELP.equals(name)) {
+ help();
+ }
+ }
+
+ protected void execute() throws XModelException {
+ Properties p0 = extractStepData(0);
+ XModelObject bus = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), busEntity, p0);
+
+ Properties p1 = extractStepData(1);
+ if(filterEntity != null) {
+ XModelObject filter = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), filterEntity, p1);
+ bus.addChild(filter);
+ }
+
+ DefaultCreateHandler.addCreatedObject(getTarget(), bus, FindObjectHelper.EVERY_WHERE);
+ }
+
+ public boolean canBeProcessedByStandardWizard() {
+ return true;
+ }
+
+}
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddHibernateBusSupport.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java 2010-09-01 15:16:05 UTC (rev 24613)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java 2010-09-01 15:22:51 UTC (rev 24614)
@@ -84,6 +84,13 @@
provider.addChild(bus);
+ if(getStepId() == 2) {
+ Properties p2 = extractStepData(2);
+ String childEntity = getEntityData()[2].getModelEntity().getName();
+ XModelObject child = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), childEntity, p2);
+ bus.addChild(child);
+ }
+
DefaultCreateHandler.addCreatedObject(getTarget(), provider, FindObjectHelper.EVERY_WHERE);
}
14 years, 4 months
JBoss Tools SVN: r24613 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-01 11:16:05 -0400 (Wed, 01 Sep 2010)
New Revision: 24613
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/decorators/definition/FooBar.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6957
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/decorators/definition/FooBar.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/decorators/definition/FooBar.java 2010-09-01 15:09:08 UTC (rev 24612)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/decorators/definition/FooBar.java 2010-09-01 15:16:05 UTC (rev 24613)
@@ -25,7 +25,7 @@
* @author pmuir
*
*/
-public interface FooBar extends Foo, Bar
+public interface FooBar extends Foo, Bar, Boo
{
public static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(FooBar.class));
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2010-09-01 15:09:08 UTC (rev 24612)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2010-09-01 15:16:05 UTC (rev 24613)
@@ -39,6 +39,7 @@
assertContainsTypes(types,
"org.jboss.jsr299.tck.tests.decorators.definition.Foo",
"org.jboss.jsr299.tck.tests.decorators.definition.Bar",
+ "org.jboss.jsr299.tck.tests.decorators.definition.Baz",
"org.jboss.jsr299.tck.tests.decorators.definition.Baz");
}
14 years, 4 months
JBoss Tools SVN: r24612 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: editor/dialog and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-09-01 11:09:08 -0400 (Wed, 01 Sep 2010)
New Revision: 24612
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-6287 , enable/disable the icon depending on the selection.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-09-01 15:06:57 UTC (rev 24611)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-09-01 15:09:08 UTC (rev 24612)
@@ -2248,6 +2248,14 @@
return;
}
+ /*
+ * Enable/disable "Externalize strings" toolbar icon
+ */
+ updateExternalizeStringsToolbarIconState();
+
+ /*
+ * Update Text Formatting Toolbar state
+ */
if (editPart.getVisualMode() != VpeEditorPart.SOURCE_MODE) {
if (toolbarFormatControllerManager != null)
toolbarFormatControllerManager.selectionChanged();
@@ -2528,6 +2536,16 @@
visualEditor.updateShowSelectionBarItem(selectionBar.isVisible());
}
+ /**
+ * Update Externalize Strings toolbar icon state.
+ * <p>
+ * Enables the button when suitable text is selected.
+ * Disabled otherwise.
+ */
+ public void updateExternalizeStringsToolbarIconState() {
+ visualEditor.updateExternalizeStringsToolbarIconState();
+ }
+
public IZoomEventManager getZoomEventManager() {
return zoomEventManager;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-09-01 15:06:57 UTC (rev 24611)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-09-01 15:09:08 UTC (rev 24612)
@@ -166,11 +166,7 @@
propsKey = new Text(propsStringGroup, SWT.BORDER);
propsKey.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, 1));
propsKey.setText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_DEFAULT_KEY);
- propsKey.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- updateStatus();
- }
- });
+
/*
* Create Properties Value label
*/
@@ -184,11 +180,6 @@
propsValue.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, 1));
propsValue.setText(Constants.EMPTY);
propsValue.setEditable(false);
- propsValue.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- updateStatus();
- }
- });
/*
* Create New File Checkbox
@@ -206,22 +197,6 @@
gd.heightHint = 300;
propsFilesGroup.setLayoutData(gd);
propsFilesGroup.setText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP);
-
- /*
- * Add selection listener to New File button
- */
- newFile.addSelectionListener( new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- boolean selected = ((Button)e.getSource()).getSelection();
- if (selected) {
- enableBundleGroup(false);
- } else {
- enableBundleGroup(true);
- }
- updateStatus();
- }
- });
/*
* Create Resource Bundles List label
@@ -234,14 +209,6 @@
*/
rbCombo = new Combo(propsFilesGroup, SWT.NONE);
rbCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, 1));
- rbCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- setResourceBundlePath(rbCombo.getText());
- updateDuplicateKeyStatus();
- updateStatus();
- }
- });
/*
* Create Properties File label
@@ -279,7 +246,7 @@
/*
* Initialize all fields with real values.
*/
- initializeTextFields();
+ initializeFieldsAndAddLIsteners();
/*
* Wizard Page control should be initialized.
@@ -291,7 +258,7 @@
* Initialize dialog's controls.
* Fill in appropriate text and make validation.
*/
- private void initializeTextFields() {
+ private void initializeFieldsAndAddLIsteners() {
ISelection sel = editor.getSelectionProvider().getSelection();
if (isSelectionCorrect(sel)) {
String text = Constants.EMPTY;
@@ -302,7 +269,7 @@
text = textSelection.getText();
Object selectedElement = structuredSelection.getFirstElement();
/*
- * When selected text in empty
+ * When selected text is empty
* parse selected element and find a string to replace..
*/
if ((text.trim().length() == 0)) {
@@ -393,15 +360,52 @@
}
/*
* Set the new key text
- * Update the key status
*/
propsKey.setText(newKey);
updateDuplicateKeyStatus();
}
/*
- * Update status message.
+ * https://jira.jboss.org/browse/JBIDE-6945
+ * Set the greeting message only.
+ * All the validation will take place in the fields' listeners
+ * after user enters some new values.
*/
- updateStatus();
+ setMessage(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_ENTER_KEY_NAME,
+ IMessageProvider.INFORMATION);
+
+ /*
+ * Add selection listeners to the fields
+ */
+ propsKey.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ updateStatus();
+ }
+ });
+ propsValue.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ updateStatus();
+ }
+ });
+ newFile.addSelectionListener( new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ boolean selected = ((Button)e.getSource()).getSelection();
+ if (selected) {
+ enableBundleGroup(false);
+ } else {
+ enableBundleGroup(true);
+ }
+ updateStatus();
+ }
+ });
+ rbCombo.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ setResourceBundlePath(rbCombo.getText());
+ updateDuplicateKeyStatus();
+ updateStatus();
+ }
+ });
} else {
VpePlugin.getDefault().logWarning(
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-09-01 15:06:57 UTC (rev 24611)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-09-01 15:09:08 UTC (rev 24612)
@@ -78,6 +78,7 @@
import org.jboss.tools.vpe.editor.toolbar.VpeToolBarManager;
import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager;
import org.jboss.tools.vpe.editor.toolbar.format.TextFormattingToolBar;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.DocTypeUtil;
import org.jboss.tools.vpe.editor.util.FileUtil;
import org.jboss.tools.vpe.editor.util.HTML;
@@ -98,6 +99,7 @@
import org.mozilla.interfaces.nsIHTMLInlineTableEditor;
import org.mozilla.interfaces.nsIHTMLObjectResizer;
import org.mozilla.interfaces.nsIPlaintextEditor;
+import org.w3c.dom.Attr;
public class MozillaEditor extends EditorPart implements IReusableEditor {
protected static final File INIT_FILE = new File(VpePlugin.getDefault().getResourcePath("ve"), "init.html"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -474,29 +476,16 @@
@Override
public void run() {
/*
- * Externalize strings action .
+ * Externalize strings action.
* Show a dialog to add properties key and value.
* When selection is correct show the dialog
- * otherwise show warning message.
+ * otherwise the toolbar icon will be disabled.
*/
- StructuredTextEditor editor = controller.getSourceEditor();
- ISelection sel = editor.getSelectionProvider().getSelection();
-
- if ((sel instanceof TextSelection)
- && (sel instanceof IStructuredSelection)
- && (((IStructuredSelection) sel).size() == 1)) {
- ExternalizeStringsDialog dlg = new ExternalizeStringsDialog(
- PlatformUI.getWorkbench().getDisplay().getActiveShell(),
- new ExternalizeStringsWizard(
- editor, controller.getPageContext().getBundle()));
- dlg.open();
- } else {
- MessageDialog.openWarning(
- PlatformUI.getWorkbench().getDisplay().getActiveShell(),
- VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE,
- VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_WRONG_SELECTION);
- }
-
+ ExternalizeStringsDialog dlg = new ExternalizeStringsDialog(
+ PlatformUI.getWorkbench().getDisplay().getActiveShell(),
+ new ExternalizeStringsWizard(controller.getSourceEditor(),
+ controller.getPageContext().getBundle()));
+ dlg.open();
}
};
externalizeStringsAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
@@ -521,6 +510,7 @@
showSelectionBarAction = null;
showTextFormattingAction = null;
showBundleAsELAction = null;
+ externalizeStringsAction = null;
}
});
return verBar;
@@ -1139,4 +1129,57 @@
public MozillaTooltipListener getTooltipListener() {
return tooltipListener;
}
+
+
+ /**
+ * Update Externalize Strings toolbar icon state.
+ * <p>
+ * Enables the button when suitable text is selected.
+ * Disabled otherwise.
+ */
+ public void updateExternalizeStringsToolbarIconState() {
+ StructuredTextEditor editor = controller.getSourceEditor();
+ ISelection sel = editor.getSelectionProvider().getSelection();
+ String stringToUpdate = Constants.EMPTY;
+ if ((sel instanceof TextSelection)
+ && (sel instanceof IStructuredSelection)
+ && (((IStructuredSelection) sel).size() == 1)) {
+ String text = Constants.EMPTY;
+ TextSelection textSelection = null;
+ IStructuredSelection structuredSelection = (IStructuredSelection) sel;
+ textSelection = (TextSelection) sel;
+ text = textSelection.getText();
+ Object selectedElement = structuredSelection.getFirstElement();
+ /*
+ * When selected text is empty parse selected element and find a
+ * string to replace..
+ */
+ if ((text.trim().length() == 0)) {
+ if (selectedElement instanceof org.w3c.dom.Text) {
+ /*
+ * ..it could be a plain text
+ */
+ org.w3c.dom.Text textNode = (org.w3c.dom.Text) selectedElement;
+ if (textNode.getNodeValue().trim().length() > 0) {
+ stringToUpdate = textNode.getNodeValue();
+ }
+ } else if (selectedElement instanceof Attr) {
+ /*
+ * ..or an attribute's value
+ */
+ Attr attrNode = (Attr) selectedElement;
+ if (attrNode.getNodeValue().trim().length() > 0) {
+ stringToUpdate = attrNode.getNodeValue();
+ }
+ }
+ } else {
+ stringToUpdate = text;
+ }
+ }
+ if ((stringToUpdate.length() > 0)) {
+ externalizeStringsAction.setEnabled(true);
+ } else {
+ externalizeStringsAction.setEnabled(false);
+ }
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-09-01 15:06:57 UTC (rev 24611)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-09-01 15:09:08 UTC (rev 24612)
@@ -185,6 +185,8 @@
public static String EXTERNALIZE_STRINGS_DIALOG_PROPERTY_NAME;
public static String EXTERNALIZE_STRINGS_DIALOG_PROPERTY_VALUE;
public static String EXTERNALIZE_STRINGS_DIALOG_KEY_ALREADY_EXISTS;
+ public static String EXTERNALIZE_STRINGS_DIALOG_ENTER_KEY_NAME;
+ public static String EXTERNALIZE_STRINGS_DIALOG_SELECT_RESOURCE_BUNDLE;
public static String COULD_NOT_OPEN_VPE_RESOURCES_DIALOG;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-09-01 15:06:57 UTC (rev 24611)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-09-01 15:09:08 UTC (rev 24612)
@@ -150,11 +150,11 @@
LIST_IS_EMPTY=List is empty
# Externalize Strings Dialog
-EXTERNALIZE_STRINGS_DIALOG_TITLE=Externalize Strings Dialog
+EXTERNALIZE_STRINGS_DIALOG_TITLE=Externalize Strings
EXTERNALIZE_STRINGS_DIALOG_DESCRIPTION=Externalize your strings via properties file
EXTERNALIZE_STRINGS_DIALOG_TEXT_STRING=Text string:
-EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_KEY=Properties key:
-EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE=Properties value:
+EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_KEY=Property key:
+EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE=Property value:
EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_FILE=Properties file:
EXTERNALIZE_STRINGS_DIALOG_RESOURCE_BUNDLE_LIST=Select resource bundle:
EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP=Externalize strings
@@ -173,6 +173,8 @@
EXTERNALIZE_STRINGS_DIALOG_PROPERTY_NAME=Property name
EXTERNALIZE_STRINGS_DIALOG_PROPERTY_VALUE=Property value
EXTERNALIZE_STRINGS_DIALOG_KEY_ALREADY_EXISTS=Such a key already exists
+EXTERNALIZE_STRINGS_DIALOG_ENTER_KEY_NAME=Please specify the property key
+EXTERNALIZE_STRINGS_DIALOG_SELECT_RESOURCE_BUNDLE=Please select the resource bundle
# Other messages
CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT=Cannot load taglibs from PageContext!
14 years, 4 months
JBoss Tools SVN: r24611 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core: validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-01 11:06:57 -0400 (Wed, 01 Sep 2010)
New Revision: 24611
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
https://jira.jboss.org/browse/JBIDE-6957
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java 2010-09-01 14:36:07 UTC (rev 24610)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java 2010-09-01 15:06:57 UTC (rev 24611)
@@ -10,8 +10,12 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
+import java.util.HashSet;
import java.util.Set;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IDecorator;
import org.jboss.tools.cdi.core.IParametedType;
@@ -30,8 +34,22 @@
* @see org.jboss.tools.cdi.core.IDecorator#getDecoratedTypes()
*/
public Set<IParametedType> getDecoratedTypes() {
- return getLegalTypes();
-// return ((TypeDefinition)definition).getInheritedTypes();
+ Set<IParametedType> result = new HashSet<IParametedType>();
+
+ Set<IParametedType> legalTypes = getLegalTypes();
+ for (IParametedType pt: legalTypes) {
+ IType t = pt.getType();
+ try {
+ if(!t.isInterface()) continue;
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ continue;
+ }
+ if(!"java.io.Serializable".equals(t.getFullyQualifiedName())) {
+ result.add(pt);
+ }
+ }
+ return result;
}
/*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-09-01 14:36:07 UTC (rev 24610)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-09-01 15:06:57 UTC (rev 24611)
@@ -82,6 +82,7 @@
import org.jboss.tools.cdi.core.ITypeDeclaration;
import org.jboss.tools.cdi.core.preferences.CDIPreferences;
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
+import org.jboss.tools.cdi.internal.core.impl.ParametedType;
import org.jboss.tools.cdi.internal.core.impl.Parameter;
import org.jboss.tools.cdi.internal.core.impl.SessionBean;
import org.jboss.tools.common.EclipseUtil;
@@ -1717,19 +1718,13 @@
}
private List<String> getSuppers(IParametedType type) {
- try {
- List<IType> types = EclipseJavaUtil.getSupperTypes(type.getType());
- List<String> signatures = new ArrayList<String>();
- for (IType iType : types) {
- IParametedType superType = cdiProject.getNature().getTypeFactory().newParametedType(iType);
- signatures.add(superType.getSignature());
- }
- signatures.add(type.getSignature());
- return signatures;
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
+ Set<IParametedType> types = ((ParametedType)type).getAllTypes();
+ List<String> signatures = new ArrayList<String>();
+ for (IParametedType superType : types) {
+ signatures.add(superType.getSignature());
}
- return Collections.emptyList();
+ signatures.add(type.getSignature());
+ return signatures;
}
/*
14 years, 4 months
JBoss Tools SVN: r24610 - in trunk/seam: tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-09-01 10:36:07 -0400 (Wed, 01 Sep 2010)
New Revision: 24610
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6876
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2010-09-01 14:18:09 UTC (rev 24609)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2010-09-01 14:36:07 UTC (rev 24610)
@@ -81,6 +81,16 @@
}
}
+ private IType getType(IJavaElement element){
+ IJavaElement elem = element;
+ while(elem != null){
+ if(elem instanceof IType)
+ return (IType)elem;
+ elem = elem.getParent();
+ }
+ return null;
+ }
+
private boolean checkImport(String text, String qualifiedName){
String name = getShortName(qualifiedName);
@@ -104,14 +114,18 @@
ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
- if(compilationUnit.getImport(annotationTypeName) == null){
- compilationUnit.createImport(annotationTypeName, null, new NullProgressMonitor());
+ IJavaElement javaElement = compilationUnit.getElementAt(start);
+ IType type = getType(javaElement);
+ if(type != null){
+ if(compilationUnit.getImport(annotationTypeName) == null){
+ compilationUnit.createImport(annotationTypeName, null, new NullProgressMonitor());
+ }
+
+ IBuffer buffer = compilationUnit.getBuffer();
+
+ buffer.replace(type.getSourceRange().getOffset(), 0, annotationString+'\n');
+ compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
}
-
- IBuffer buffer = compilationUnit.getBuffer();
-
- buffer.replace(start, 0, annotationString+' ');
- compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
}catch(CoreException ex){
SeamGuiPlugin.getPluginLog().logError(ex);
}
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java 2010-09-01 14:36:07 UTC (rev 24610)
@@ -0,0 +1,37 @@
+package org.domain.SeamWebWarTestProject.session;
+import javax.ejb.Stateless;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Destroy;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.log.Log;
+@Stateless @Name("StatelessClass")
+public class StatelessClass {
+
+ private String abc;
+
+ @Logger private Log log;
+
+
+ //seam-gen method
+ public String statefulComponent()
+ {
+ //implement your business logic here
+ log.info("statefulComponent.statefulComponent() action called");
+ return "success";
+ }
+
+ //add additional action methods
+ @Destroy
+ public void destroyMethod(){
+
+ }
+
+ public String getAbc() {
+ return abc;
+ }
+
+ public void setAbc(String abc) {
+ this.abc = abc;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2010-09-01 14:18:09 UTC (rev 24609)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2010-09-01 14:36:07 UTC (rev 24610)
@@ -100,6 +100,34 @@
assertTrue("The quickfix \"Delete @Destroy annotation\" doesn't exist.", found);
}
+ public void testDuplicateDestroyAnnotationResolution2() throws CoreException {
+ String TARGET_FILE_NAME = "src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java";
+ IFile file = project.getFile(TARGET_FILE_NAME);
+
+ assertTrue("File - "+TARGET_FILE_NAME+" must be exists",file.exists());
+
+ IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
+
+ boolean found = false;
+ for (int i = 0; i < markers.length; i++) {
+ IMarker marker = markers[i];
+ IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
+ .getResolutions(marker);
+ for (int j = 0; j < resolutions.length; j++) {
+ IMarkerResolution resolution = resolutions[j];
+ if (resolution instanceof DeleteAnnotaionMarkerResolution) {
+ assertEquals("org.jboss.seam.annotations.Destroy", ((DeleteAnnotaionMarkerResolution)resolution).getQualifiedName());
+ found = true;
+ break;
+ }
+ }
+ if (found) {
+ break;
+ }
+ }
+ assertTrue("The quickfix \"Delete @Destroy annotation\" doesn't exist.", found);
+ }
+
public void testDuplicateCreateAnnotationResolution() throws CoreException {
String TARGET_FILE_NAME = "src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateCreateComponent.java";
IFile file = project.getFile(TARGET_FILE_NAME);
14 years, 4 months
JBoss Tools SVN: r24609 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-01 10:18:09 -0400 (Wed, 01 Sep 2010)
New Revision: 24609
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java
Log:
[JBIDE-6880] changed camel case to _-separated words (maxs preference)
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java 2010-09-01 14:03:25 UTC (rev 24608)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java 2010-09-01 14:18:09 UTC (rev 24609)
@@ -34,11 +34,11 @@
* The identifier to be used for the value that determines this eclipse
* instance.
*/
- public static final String ECLIPSE_INSTANCE_ID = "eclipseInstanceId"; //$NON-NLS-1$
+ public static final String ECLIPSE_INSTANCE_ID = "eclipse_instance_id"; //$NON-NLS-1$
- public static final String FIRST_VISIT = "firstVisit";
+ public static final String FIRST_VISIT = "first_visit";
- public static final String LAST_VISIT = "lastVisit";
+ public static final String LAST_VISIT = "last_visit";
- public static final String VISIT_COUNT = "visitCount";
+ public static final String VISIT_COUNT = "visit_count";
}
14 years, 4 months