JBoss Tools SVN: r34978 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-22 18:49:23 -0400 (Thu, 22 Sep 2011)
New Revision: 34978
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java
Log:
https://issues.jboss.org/browse/JBIDE-9766 Refactor org.jboss.tools.jst.web.WebUtils.getWebRootFolders() to take into account derived resources and default web root folder
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java 2011-09-22 22:48:59 UTC (rev 34977)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java 2011-09-22 22:49:23 UTC (rev 34978)
@@ -12,6 +12,8 @@
import java.io.File;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -20,6 +22,7 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
@@ -30,6 +33,7 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.wst.common.componentcore.ComponentCore;
@@ -84,7 +88,7 @@
return (modelNature != null) ? WebProject.getInstance(modelNature.getModel()).getWebRootLocation() : null;
}
- public static IContainer[] getWebRootFolders(IProject project, boolean ignoreTarget) {
+ public static IContainer[] getWebRootFolders(IProject project, boolean ignoreDerived) {
IFacetedProject facetedProject = null;
try {
facetedProject = ProjectFacetsManager.create(project);
@@ -95,23 +99,54 @@
IVirtualComponent component = ComponentCore.createComponent(project);
if(component!=null) {
IVirtualFolder webRootVirtFolder = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
+
+ IPath defaultPath = getDefaultDeploymentDescriptorFolder(webRootVirtFolder);
+
IContainer[] folders = webRootVirtFolder.getUnderlyingFolders();
if(folders.length > 1){
ArrayList<IContainer> containers = new ArrayList<IContainer>();
for(IContainer container : folders){
- if(container.getFullPath().segmentCount() < 2 || !"target".equals(container.getFullPath().segment(1))) //$NON-NLS-1$
- containers.add(container);
+ if(!ignoreDerived || !container.isDerived(IResource.CHECK_ANCESTORS)) {
+ if(defaultPath!=null && defaultPath.equals(container.getFullPath())) {
+ containers.add(0, container); // Put default root folder to the first position of the list
+ } else {
+ containers.add(container);
+ }
+ }
}
- return containers.toArray(new IContainer[]{});
- }else
+ return containers.toArray(new IContainer[containers.size()]);
+ } else {
return folders;
+ }
}
}
return null;
}
+ private static boolean WTP_3_3_0 = false;
+
+ public static IPath getDefaultDeploymentDescriptorFolder(IVirtualFolder folder) {
+ if(!WTP_3_3_0) {
+ try {
+ Method getDefaultDeploymentDescriptorFolder = J2EEModuleVirtualComponent.class.getMethod("getDefaultDeploymentDescriptorFolder", IVirtualFolder.class);
+ return (IPath) getDefaultDeploymentDescriptorFolder.invoke(null, folder);
+ } catch (NoSuchMethodException nsme) {
+ // Not available in this WTP version, let's ignore it
+ WTP_3_3_0 = true;
+ } catch (IllegalArgumentException e) {
+ WebModelPlugin.getDefault().logError(e);
+ } catch (IllegalAccessException e) {
+ WebModelPlugin.getDefault().logError(e);
+ } catch (InvocationTargetException e) {
+ // Not available in this WTP version, let's ignore it
+ WTP_3_3_0 = true;
+ }
+ }
+ return null;
+ }
+
public static IContainer[] getWebRootFolders(IProject project) {
- return getWebRootFolders(project, false);
+ return getWebRootFolders(project, true);
}
public static String[] getServletLibraries(String natureId, String templateBase, String servletVersion) {
14 years, 6 months
JBoss Tools SVN: r34977 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-22 18:48:59 -0400 (Thu, 22 Sep 2011)
New Revision: 34977
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-9766 Refactor org.jboss.tools.jst.web.WebUtils.getWebRootFolders() to take into account derived resources and default web root folder
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java 2011-09-22 22:18:15 UTC (rev 34976)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java 2011-09-22 22:48:59 UTC (rev 34977)
@@ -261,7 +261,7 @@
}
IVirtualComponent component = ComponentCore.createComponent(project);
if (component != null) {
- IContainer[] folders = WebUtils.getWebRootFolders(project, false);
+ IContainer[] folders = WebUtils.getWebRootFolders(project);
if(folders == null || folders.length == 0)
return null;
IFolder webFolder = ResourcesPlugin.getWorkspace().getRoot()
14 years, 6 months
JBoss Tools SVN: r34976 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-22 18:18:15 -0400 (Thu, 22 Sep 2011)
New Revision: 34976
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF
Log:
fix for vpe tests to force install xulrunner optional plugins if they are available from local of remote repo
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF 2011-09-22 21:50:43 UTC (rev 34975)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF 2011-09-22 22:18:15 UTC (rev 34976)
@@ -8,10 +8,10 @@
org.eclipse.core.runtime;bundle-version="3.7.0",
org.mozilla.xpcom;bundle-version="1.9.1",
org.jboss.tools.common,
- org.mozilla.xulrunner.cocoa.macosx;resolution:=optional,
- org.mozilla.xulrunner.gtk.linux.x86;resolution:=optional,
- org.mozilla.xulrunner.gtk.linux.x86_64;resolution:=optional,
- org.mozilla.xulrunner.win32.win32.x86;resolution:=optional
+ org.mozilla.xulrunner.cocoa.macosx;resolution:=optional;x-installation:=greedy,
+ org.mozilla.xulrunner.gtk.linux.x86;resolution:=optional;x-installation:=greedy,
+ org.mozilla.xulrunner.gtk.linux.x86_64;resolution:=optional;x-installation:=greedy,
+ org.mozilla.xulrunner.win32.win32.x86;resolution:=optional;x-installation:=greedy
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.vpe.xulrunner;uses:="org.eclipse.jface.resource,org.eclipse.ui.plugin,org.osgi.framework",
org.jboss.tools.vpe.xulrunner.browser;uses:="org.mozilla.interfaces,org.eclipse.swt.widgets,org.mozilla.xpcom",
14 years, 6 months
JBoss Tools SVN: r34975 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-22 17:50:43 -0400 (Thu, 22 Sep 2011)
New Revision: 34975
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
Log:
Fixed Java Model Exception
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-09-22 21:50:26 UTC (rev 34974)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-09-22 21:50:43 UTC (rev 34975)
@@ -325,22 +325,24 @@
IAnnotation annotation = ((IAnnotatable)element).getAnnotation(qualifiedName);
if (!annotation.exists()) {
annotation = ((IAnnotatable)element).getAnnotation(name);
- }else{
+ } else {
return annotation;
}
- IType type=null;
- if(element instanceof IType){
- type = (IType)element;
- }else if(element instanceof IMember){
- type = ((IMember)element).getDeclaringType();
- }else if(element instanceof ITypeParameter){
- type = ((ITypeParameter)element).getDeclaringMember().getDeclaringType();
- }else if(element instanceof ILocalVariable){
- type = ((ILocalVariable)element).getDeclaringMember().getDeclaringType();
+ if(annotation.exists()) {
+ IType type=null;
+ if(element instanceof IType){
+ type = (IType)element;
+ }else if(element instanceof IMember){
+ type = ((IMember)element).getDeclaringType();
+ }else if(element instanceof ITypeParameter){
+ type = ((ITypeParameter)element).getDeclaringMember().getDeclaringType();
+ }else if(element instanceof ILocalVariable){
+ type = ((ILocalVariable)element).getDeclaringMember().getDeclaringType();
+ }
+ if (type != null && annotation != null && qualifiedName.equals(EclipseJavaUtil.resolveType(type, name))) {
+ return annotation;
+ }
}
- if (type != null && annotation != null && qualifiedName.equals(EclipseJavaUtil.resolveType(type, name))) {
- return annotation;
- }
}
return null;
}
14 years, 6 months
JBoss Tools SVN: r34974 - branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-09-22 17:50:26 -0400 (Thu, 22 Sep 2011)
New Revision: 34974
Modified:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Need_Info_Issues.xml
Log:
updated with new fixed issue and new need info question
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-09-22 20:49:22 UTC (rev 34973)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-09-22 21:50:26 UTC (rev 34974)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.1</edition>
- <pubsnumber>21</pubsnumber>
+ <pubsnumber>22</pubsnumber>
<abstract>
<para>
These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-09-22 20:49:22 UTC (rev 34973)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-09-22 21:50:26 UTC (rev 34974)
@@ -291,12 +291,14 @@
<ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-1013">TEIIDDES-1013</ulink>: A bug existed where the RESTful properties of <property>REST-METHOD</property> and <property>URI</property> that are required for RESTful procedures required the names to be all upper-case. This caused errors when users would provide these properties but not all letters were upper-case. Resolving this issue has seen the modification of the <classname>ModelObjectAnnotationHelper</classname> and <classname>GenerateRestWarAction</classname> classes to check that the properties exist regardless of the case-type used.
</para>
</listitem>
- <!-- To be completed -->
- <!-- <listitem>
+ <listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-992">TEIIDDES-992</ulink>: A new feature has been added that allows the use of <emphasis>Pushdown</emphasis> functions without Java programming.
+ <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-992">TEIIDDES-992</ulink>: A new feature has been added that allows the use of <emphasis>Pushdown</emphasis> functions without Java programming. A <emphasis>Pushdown</emphasis> function refers to SQL code that contains a function call as part of the final query, acts upon the actual source or database and is exposed in Teiid Designer as a <emphasis>Source Function</emphasis> (a function that exists or is known by a database source).
</para>
- </listitem> -->
+ <para>
+ The addition of this feature ensures that creating a <emphasis>Pushdown</emphasis> function is simpler than it was before, improving usability.
+ </para>
+ </listitem>
<listitem>
<para>
<ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-990">TEIIDDES-990</ulink>: Previously generated RESTEasy WARs accepted only a Uniform Resource e Identifier (URI) and XML parameters and produced only XML. JavaScript Object Notation (JSON) support as input and output has been added for this release and the URI for JSON methods contain <property>json</property> (for example, http://host:port/warname/modelname/json/pathinfo). To utilize XML instead, remove <property>json</property> from the path.
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Need_Info_Issues.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Need_Info_Issues.xml 2011-09-22 20:49:22 UTC (rev 34973)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Need_Info_Issues.xml 2011-09-22 21:50:26 UTC (rev 34974)
@@ -224,24 +224,18 @@
</itemizedlist>
</para>
</formalpara>-->
- <formalpara>
+<!-- <formalpara>
<title>Teiid Designer</title>
<para>
<itemizedlist>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-992">TEIIDDES-992</ulink>: <emphasis>Developer</emphasis>: Barry LaFond
+ <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-0000">TEIIDDES-0000</ulink>:
</para>
- <para>
- <emphasis>Title</emphasis>: Allow the use of pushdown functions without requiring Java programming
- </para>
- <para>
- <emphasis>Question</emphasis>: What is a 'pushdown' function?
- </para>
</listitem>
</itemizedlist>
</para>
- </formalpara>
+ </formalpara> -->
<!--<formalpara>
<title>Usage</title>
<para>
@@ -337,7 +331,7 @@
<emphasis>Title</emphasis>: All menus but one are missing on Ubuntu 11.04 (Unity).
</para>
<para>
- <emphasis>Question</emphasis>: The Release Notes text field indicates the workaround, but is this issue indeed fixed for JBDS 4.1.1 so that the workaround is no longer necessary? If so, where was the <code><</code> code missing from?
+ <remark>Updated</remark><emphasis>Question</emphasis>: How does the jbdevstudio-uniti script make it possible to negate those extra steps when using uniti? I'd like to let customers know so they can feel at ease with the script being run and not doing anything else to their systems.
</para>
</listitem>
</itemizedlist>
14 years, 6 months
JBoss Tools SVN: r34973 - in trunk/cdi/plugins: org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-22 16:49:22 -0400 (Thu, 22 Sep 2011)
New Revision: 34973
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/annotation.png
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.core/images/annotation.png
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta
trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java
Log:
https://issues.jboss.org/browse/JBIDE-9717 Icons for CDI Tools UI Elements
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/annotation.png
===================================================================
(Binary files differ)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java 2011-09-22 19:39:17 UTC (rev 34972)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java 2011-09-22 20:49:22 UTC (rev 34973)
@@ -23,7 +23,7 @@
public class CDIImages {
private static CDIImages INSTANCE;
-
+
static {
try {
INSTANCE = new CDIImages(new URL(CDICorePlugin.getDefault().getBundle().getEntry("/"), "images/")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -31,24 +31,24 @@
CDICorePlugin.getDefault().logError(e);
}
}
-
+
public static final Image CDI_BEAN_IMAGE = getImage("search/cdi_bean.gif"); //$NON-NLS-1$
public static final Image WELD_IMAGE = getImage("search/weld_icon_16x.gif"); //$NON-NLS-1$
-
+
public static final Image BEAN_CLASS_IMAGE = CDIXMLImages.BEAN_CLASS_IMAGE;
public static final Image BEAN_METHOD_IMAGE = getImage("bean_method.png"); //$NON-NLS-1$
public static final Image BEAN_FIELD_IMAGE = getImage("bean_field.png"); //$NON-NLS-1$
public static final Image INJECTION_POINT_IMAGE = getImage("injection_point.png"); //$NON-NLS-1$
- public static final Image ANNOTATION_IMAGE = getImage("annotation.png"); //$NON-NLS-1$
+ public static final Image ANNOTATION_IMAGE = CDIXMLImages.ANNOTATION_IMAGE;
public static final Image CDI_EVENT_IMAGE = getImage("event.png"); //$NON-NLS-1$
-
+
public static final Image QUICKFIX_ADD = getImage("quickfixes/cdi_add.png"); //$NON-NLS-1$
public static final Image QUICKFIX_REMOVE = getImage("quickfixes/cdi_remove.png"); //$NON-NLS-1$
public static final Image QUICKFIX_EDIT = getImage("quickfixes/cdi_edit.png"); //$NON-NLS-1$
public static final Image QUICKFIX_CHANGE = getImage("quickfixes/cdi_change.png"); //$NON-NLS-1$
-
+
public static final String WELD_WIZARD_IMAGE_PATH = "wizard/WeldWizBan.gif"; //$NON-NLS-1$
-
+
public static Image getImage(String key) {
return INSTANCE.createImageDescriptor(key).createImage();
}
@@ -60,14 +60,14 @@
public static void setImageDescriptors(IAction action, String iconName) {
action.setImageDescriptor(INSTANCE.createImageDescriptor(iconName));
}
-
+
public static CDIImages getInstance() {
return INSTANCE;
}
private URL baseUrl;
private CDIImages parentRegistry;
-
+
protected CDIImages(URL registryUrl, CDIImages parent){
if(registryUrl == null) throw new IllegalArgumentException(CDICoreMessages.CDI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL);
@@ -102,7 +102,6 @@
}
public static Image getImageByElement(ICDIElement element){
-
if(element instanceof IClassBean){
return BEAN_CLASS_IMAGE;
}else if(element instanceof IInjectionPoint){
@@ -118,5 +117,4 @@
}
return WELD_IMAGE;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-09-22 19:39:17 UTC (rev 34972)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-09-22 20:49:22 UTC (rev 34973)
@@ -183,7 +183,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard"
- icon="platform:/plugin/org.jboss.tools.cdi.core/images/annotation.png"
+ icon="platform:/plugin/org.jboss.tools.cdi.xml/images/annotation.png"
id="org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard"
name="Qualifier Annotation"
project="false">
@@ -198,7 +198,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard"
- icon="platform:/plugin/org.jboss.tools.cdi.core/images/annotation.png"
+ icon="platform:/plugin/org.jboss.tools.cdi.xml/images/annotation.png"
id="org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard"
name="Stereotype Annotation"
project="false">
@@ -213,7 +213,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard"
- icon="platform:/plugin/org.jboss.tools.cdi.core/images/annotation.png"
+ icon="platform:/plugin/org.jboss.tools.cdi.xml/images/annotation.png"
id="org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard"
name="Scope Annotation"
project="false">
@@ -228,7 +228,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard"
- icon="platform:/plugin/org.jboss.tools.cdi.core/images/annotation.png"
+ icon="platform:/plugin/org.jboss.tools.cdi.xml/images/annotation.png"
id="org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard"
name="Interceptor Binding Annotation"
project="false">
@@ -288,7 +288,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard"
- icon="platform:/plugin/org.jboss.tools.cdi.core/images/annotation.png"
+ icon="platform:/plugin/org.jboss.tools.cdi.xml/images/annotation.png"
id="org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard"
name="Annotation Literal"
project="false">
Added: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/annotation.png
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/annotation.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta 2011-09-22 19:39:17 UTC (rev 34972)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta 2011-09-22 20:49:22 UTC (rev 34973)
@@ -24,6 +24,7 @@
<GROUP name="cdi">
<ICON name="bean" path="plugin:org.jboss.tools.cdi.xml:images/bean_class.png"/>
<ICON name="file" path="plugin:org.jboss.tools.cdi.xml:images/beans_xml.png"/>
+ <ICON name="annotation" path="plugin:org.jboss.tools.cdi.xml:images/annotation.png"/>
</GROUP>
</GROUP>
</ICONS>
@@ -221,7 +222,7 @@
<XChildrenEntities/>
<XEntityRenderer>
<ICONS>
- <ICON info="main.cdi.bean" type="main"/>
+ <ICON info="main.cdi.annotation" type="main"/>
</ICONS>
</XEntityRenderer>
<XModelAttributes>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java 2011-09-22 19:39:17 UTC (rev 34972)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java 2011-09-22 20:49:22 UTC (rev 34973)
@@ -8,7 +8,6 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-
package org.jboss.tools.cdi.xml;
import java.net.MalformedURLException;
@@ -31,6 +30,7 @@
}
public static final Image BEAN_CLASS_IMAGE = getImage("bean_class.png"); //$NON-NLS-1$
+ public static final Image ANNOTATION_IMAGE = getImage("annotation.png"); //$NON-NLS-1$
public static Image getImage(String key) {
return INSTANCE.createImageDescriptor(key).createImage();
14 years, 6 months
JBoss Tools SVN: r34972 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-22 15:39:17 -0400 (Thu, 22 Sep 2011)
New Revision: 34972
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java
Log:
JBIDE-9763
https://issues.jboss.org/browse/JBIDE-9763
When building inheritance for parameted types, resolved parameters are reused from base types.
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java 2011-09-22 19:02:46 UTC (rev 34971)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java 2011-09-22 19:39:17 UTC (rev 34972)
@@ -180,7 +180,7 @@
sc = arrayPrefix + sc;
}
- superType = getFactory().getParametedType(type, sc);
+ superType = getFactory().getParametedType(type, this, sc);
if(superType != null) {
if(provider != null) {
String scn = type.getSuperclassName();
@@ -197,7 +197,7 @@
if(is != null) for (int i = 0; i < is.length; i++) {
String p = resolveParameters(is[i]);
if(arrayPrefix.length() > 0) p = arrayPrefix + p;
- ParametedType t = getFactory().getParametedType(type, p);
+ ParametedType t = getFactory().getParametedType(type, this, p);
if(t != null) {
if(provider != null) {
String scn = type.getSuperInterfaceNames()[i];
@@ -263,26 +263,39 @@
}
public String findParameterSignature(String paramName) {
- if(type == null) {
- return null;
- }
- ITypeParameter[] ps = null;
- try {
- ps = type.getTypeParameters();
- } catch (JavaModelException e) {
- return null;
- }
- if(ps != null) for (int i = 0; i < ps.length; i++) {
- if(ps[i].getElementName().equals(paramName)) {
+ buildParameters();
+ return signaturesByName.get(paramName);
+ }
+
+ Map<String, String> signaturesByName = null;
+ Map<String, ParametedType> parametersBySignature = null;
+
+ void buildParameters() {
+ if(signaturesByName == null && type != null) {
+ signaturesByName = new HashMap<String, String>();
+ parametersBySignature = new HashMap<String, ParametedType>();
+ ITypeParameter[] ps = null;
+ try {
+ ps = type.getTypeParameters();
+ } catch (JavaModelException e) {
+ return;
+ }
+ if(ps != null) for (int i = 0; i < ps.length; i++) {
+ String paramName = ps[i].getElementName();
if(parameterTypes.size() > i) {
ParametedType p = parameterTypes.get(i);
- return p.getSignature();
+ signaturesByName.put(paramName, p.getSignature());
+ parametersBySignature.put(p.getSignature(), p);
}
}
}
- return null;
}
+ public ParametedType findParameter(String signature) {
+ buildParameters();
+ return parametersBySignature.get(signature);
+ }
+
public Set<IParametedType> getAllTypes() {
if(allInheritedTypes == null) {
allInheritedTypes = buildAllTypes(new HashSet<String>(), this, new HashSet<IParametedType>());
@@ -365,13 +378,6 @@
primitives.put("Float", "float");
primitives.put("Double", "double");
primitives.put("Boolean", "boolean");
- primitives.put("Integer[]", "int[]");
- primitives.put("Short[]", "short[]");
- primitives.put("Long[]", "long[]");
- primitives.put("Character[]", "char[]");
- primitives.put("Float[]", "float[]");
- primitives.put("Double[]", "double[]");
- primitives.put("Boolean[]", "boolean[]");
}
/*
@@ -380,7 +386,18 @@
*/
public String getSimpleName() {
if(getSignature()!=null) {
- return isPrimitive()?primitives.get(Signature.getSignatureSimpleName(getSignature())):Signature.getSignatureSimpleName(getSignature());
+ if(isPrimitive()) {
+ int array = arrayPrefix.length();
+ StringBuilder result = new StringBuilder(primitives.get(Signature.getSignatureSimpleName(getSignature().substring(array))));
+ if(array > 0) {
+ for (int i = 0; i < array; i++) {
+ result.append("[]");
+ }
+ }
+ return result.toString();
+ } else {
+ return Signature.getSignatureSimpleName(getSignature());
+ }
}
return "";
}
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java 2011-09-22 19:02:46 UTC (rev 34971)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java 2011-09-22 19:39:17 UTC (rev 34972)
@@ -76,7 +76,15 @@
}
public ParametedType getParametedType(IMember context, String typeSignature) throws JavaModelException {
+ return getParametedType(context, null, typeSignature);
+ }
+
+ public ParametedType getParametedType(IMember context, IParametedType basetype, String typeSignature) throws JavaModelException {
if(typeSignature == null) return null;
+ if(basetype != null) {
+ ParametedType param = ((ParametedType)basetype).findParameter(typeSignature);
+ if(param != null) return param;
+ }
IType contextType = context instanceof IType ? (IType)context : context.getDeclaringType();
@@ -153,7 +161,7 @@
CommonPlugin.getDefault().logError(e);
}
if(paramSignatures != null) for (String paramSignature: paramSignatures) {
- ParametedType param = getParametedType(context, paramSignature);
+ ParametedType param = getParametedType(context, basetype, paramSignature);
if(param == null) {
param = new ParametedType();
param.setSignature(paramSignature);
14 years, 6 months
JBoss Tools SVN: r34971 - in trunk/vpe/tests: org.jboss.tools.vpe.spring.test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-22 15:02:46 -0400 (Thu, 22 Sep 2011)
New Revision: 34971
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml
Log:
fixed coverage reporting for vpe.docbook and vpe.spring tests
Modified: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml 2011-09-22 19:01:13 UTC (rev 34970)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml 2011-09-22 19:02:46 UTC (rev 34971)
@@ -11,6 +11,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools*</emma.filter>
+ <emma.filter>org.jboss.tools.vpe.docbook*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.vpe.docbook</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml 2011-09-22 19:01:13 UTC (rev 34970)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml 2011-09-22 19:02:46 UTC (rev 34971)
@@ -12,6 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools*</emma.filter>
- </properties>
+ <emma.filter>org.jboss.tools.vpe.spring*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.vpe.spring</emma.instrument.bundles>
+ </properties>
</project>
14 years, 6 months
JBoss Tools SVN: r34970 - workspace/dgolovin/new-releng/parent.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-22 15:01:13 -0400 (Thu, 22 Sep 2011)
New Revision: 34970
Modified:
workspace/dgolovin/new-releng/parent/pom.xml
Log:
added
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86</arch>
</environment>
Modified: workspace/dgolovin/new-releng/parent/pom.xml
===================================================================
--- workspace/dgolovin/new-releng/parent/pom.xml 2011-09-22 18:24:16 UTC (rev 34969)
+++ workspace/dgolovin/new-releng/parent/pom.xml 2011-09-22 19:01:13 UTC (rev 34970)
@@ -33,6 +33,11 @@
<arch>x86</arch>
</environment>
<environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
@@ -62,6 +67,11 @@
<ignoreTychoRepositories>true</ignoreTychoRepositories>
<environments>
<environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
14 years, 6 months
JBoss Tools SVN: r34969 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-22 14:24:16 -0400 (Thu, 22 Sep 2011)
New Revision: 34969
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SAXValidator.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLUtilities.java
Log:
fixed PMD violations OptimizableToArrayCall
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SAXValidator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SAXValidator.java 2011-09-22 18:22:17 UTC (rev 34968)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SAXValidator.java 2011-09-22 18:24:16 UTC (rev 34969)
@@ -140,7 +140,7 @@
} finally {
// Thread.currentThread().setContextClassLoader(cc);
}
- return h.errors.toArray(new String[0]);
+ return h.errors.toArray(new String[h.errors.size()]);
}
/**
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLUtilities.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLUtilities.java 2011-09-22 18:22:17 UTC (rev 34968)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLUtilities.java 2011-09-22 18:24:16 UTC (rev 34969)
@@ -61,7 +61,7 @@
al.add((Element)n);
}
}
- return al.toArray(new Element[0]);
+ return al.toArray(new Element[al.size()]);
}
public static Element getUniqueChild(Element parent, String name){
@@ -282,7 +282,7 @@
return new String[]{Messages.XMLUtilities_SAXExceptionMessage+":0:0",e.toString()}; //$NON-NLS-1$
}
}
- return h.errors.toArray(new String[0]);
+ return h.errors.toArray(new String[h.errors.size()]);
}
public static final void serialize(Element element, String filename) throws IOException {
14 years, 6 months