Attachment #159188 for bug #299747

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 299747
Collapse All | Expand All

Lines 24-27 Link Here

(-)plugin.properties (-1 / +2 lines)
24	EJB_NAVIGATOR_CONTENT = JEE Navigator Content EJB	24	EJB_NAVIGATOR_CONTENT = JEE Navigator Content EJB
25	WEB_NAVIGATOR_CONTENT = JEE Navigator Content WEB	25	WEB_NAVIGATOR_CONTENT = JEE Navigator Content WEB
26	EAR_NAVIGATOR_CONTENT = JEE Navigator Content EAR	26	EAR_NAVIGATOR_CONTENT = JEE Navigator Content EAR
27	APP_CLIENT_NAVIGATOR_CONTENT = JEE Navigator Content Application Client	27	APP_CLIENT_NAVIGATOR_CONTENT = JEE Navigator Content Application Client
		28	CONNECTOR_NAVIGATOR_CONTENT = JEE Navigator Content Connector

Lines 477-483 Link Here

(-)plugin.xml (-6 / +59 lines)
477	<test	477	<test
478	forcePluginActivation="true"	478	forcePluginActivation="true"
479	property="org.eclipse.wst.common.project.facet.core.projectFacet"	479	property="org.eclipse.wst.common.project.facet.core.projectFacet"
480	value="jst.appclient:5.0">	480	value="jst.ejb:3.1">
481	</test>	481	</test>
482	</or>	482	</or>
483	</adapt>	483	</adapt>
Lines 706-711 Link Here
706	forcePluginActivation="true"	706	forcePluginActivation="true"
707	property="org.eclipse.wst.common.project.facet.core.projectFacet"	707	property="org.eclipse.wst.common.project.facet.core.projectFacet"
708	value="jst.web:2.5"/>	708	value="jst.web:2.5"/>
		709	<test
		710	forcePluginActivation="true"
		711	property="org.eclipse.wst.common.project.facet.core.projectFacet"
		712	value="jst.web:3.0">
		713	</test>
709	</or>	714	</or>
710	</adapt>	715	</adapt>
711	<instanceof	716	<instanceof
Lines 879-899 Link Here
879	<triggerPoints>	884	<triggerPoints>
880	<or>	885	<or>
881	<instanceof	886	<instanceof
882	value="org.eclipse.core.resources.IProject">	887	value="org.eclipse.jst.jee.ui.internal.navigator.ear..BundledNode">
883	</instanceof>
884	<instanceof
885	value="org.eclipse.jst.jee.ui.internal.navigator.ear.BundledNode">
886	</instanceof>	888	</instanceof>
887	<instanceof	889	<instanceof
888	value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">	890	value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
889	</instanceof>	891	</instanceof>
890	<adapt	892	<adapt
891	type="org.eclipse.core.resources.IProject">	893	type="org.eclipse.core.resources.IProject">
		894	<or>
892	<test	895	<test
893	forcePluginActivation="true"	896	forcePluginActivation="true"
894	property="org.eclipse.wst.common.project.facet.core.projectFacet"	897	property="org.eclipse.wst.common.project.facet.core.projectFacet"
895	value="jst.ear:5.0">	898	value="jst.ear:5.0">
896	</test>	899	</test>
		900	<test
		901	forcePluginActivation="true"
		902	property="org.eclipse.wst.common.project.facet.core.projectFacet"
		903	value="jst.ear:6.0">
		904	</test>
		905	</or>
897	</adapt>	906	</adapt>
898	<instanceof	907	<instanceof
899	value="org.eclipse.jst.jee.ui.internal.navigator.ear.ModulesNode">	908	value="org.eclipse.jst.jee.ui.internal.navigator.ear.ModulesNode">
Lines 1147-1153 Link Here
1147	id="org.eclipse.jst.jee.ui.appclient"	1156	id="org.eclipse.jst.jee.ui.appclient"
1148	labelProvider="org.eclipse.jst.jee.ui.internal.navigator.AppClient5LabelProvider"	1157	labelProvider="org.eclipse.jst.jee.ui.internal.navigator.AppClient5LabelProvider"
1149	name="%APP_CLIENT_NAVIGATOR_CONTENT"	1158	name="%APP_CLIENT_NAVIGATOR_CONTENT"
1150	priority="highest">	1159	priority="highest">
1151	<triggerPoints>	1160	<triggerPoints>
1152	<or>	1161	<or>
1153	<instanceof	1162	<instanceof
Lines 1155-1165 Link Here
1155	</instanceof>	1164	</instanceof>
1156	<adapt	1165	<adapt
1157	type="org.eclipse.core.resources.IProject">	1166	type="org.eclipse.core.resources.IProject">
		1167	<or>
1158	<test	1168	<test
1159	forcePluginActivation="true"	1169	forcePluginActivation="true"
1160	property="org.eclipse.wst.common.project.facet.core.projectFacet"	1170	property="org.eclipse.wst.common.project.facet.core.projectFacet"
1161	value="jst.appclient:5.0">	1171	value="jst.appclient:5.0">
1162	</test>	1172	</test>
		1173	<test
		1174	forcePluginActivation="true"
		1175	property="org.eclipse.wst.common.project.facet.core.projectFacet"
		1176	value="jst.appclient:6.0">
		1177	</test>
		1178	</or>
1163	</adapt>	1179	</adapt>
1164	<instanceof	1180	<instanceof
1165	value="org.eclipse.jst.javaee.core.JavaEEObject">	1181	value="org.eclipse.jst.javaee.core.JavaEEObject">
Lines 1184-1189 Link Here
1184	</or>	1200	</or>
1185	</possibleChildren>	1201	</possibleChildren>
1186	</navigatorContent>	1202	</navigatorContent>
		1203	<navigatorContent
		1204	activeByDefault="true"
		1205	contentProvider="org.eclipse.jst.jee.ui.internal.navigator.ConnectorContentProvider"
		1206	icon="icons/connectorgroup_obj.gif"
		1207	id="org.eclipse.jst.jee.ui.ra"
		1208	labelProvider="org.eclipse.jst.jee.ui.internal.navigator.ConnectorLabelProvider"
		1209	name="%CONNECTOR_NAVIGATOR_CONTENT"
		1210	priority="highest">
		1211	<possibleChildren>
		1212	<or>
		1213	<instanceof
		1214	value="org.eclipse.jst.javaee.core.JavaEEObject">
		1215	</instanceof>
		1216	<instanceof
		1217	value="org.eclipse.jst.jee.ui.internal.navigator.ra.AbstractConnectorGroupProvider">
		1218	</instanceof>
		1219	</or>
		1220	</possibleChildren>
		1221	<triggerPoints>
		1222	<or>
		1223	<adapt
		1224	type="org.eclipse.core.resources.IProject">
		1225	<or>
		1226	<test
		1227	forcePluginActivation="true"
		1228	property="org.eclipse.wst.common.project.facet.core.projectFacet"
		1229	value="jst.connector:1.6">
		1230	</test>
		1231	</or>
		1232	</adapt>
		1233	<instanceof
		1234	value="org.eclipse.jst.jee.ui.internal.navigator.ra.AbstractConnectorGroupProvider">
		1235	</instanceof>
		1236	</or>
		1237	</triggerPoints>
		1238
		1239	</navigatorContent>
1187	</extension>	1240	</extension>
1188	<extension	1241	<extension
1189	point="org.eclipse.core.runtime.adapters">	1242	point="org.eclipse.core.runtime.adapters">

Lines 16-21 Link Here

(-)src/org/eclipse/jst/jee/ui/internal/Messages.java (+13 lines)
16	public class Messages extends NLS {	16	public class Messages extends NLS {
17		17
18	private static final String BUNDLE_NAME = "org.eclipse.jst.jee.ui.internal.messages"; //$NON-NLS-1$	18	private static final String BUNDLE_NAME = "org.eclipse.jst.jee.ui.internal.messages"; //$NON-NLS-1$
		19
19		20
20	private Messages() {	21	private Messages() {
21	// Do not instantiate	22	// Do not instantiate
Lines 27-32 Link Here
27	public static String SESSION_BEANS;	28	public static String SESSION_BEANS;
28	public static String ENTITY_BEANS;	29	public static String ENTITY_BEANS;
29	public static String MESSAGE_DRIVEN_BEANS;	30	public static String MESSAGE_DRIVEN_BEANS;
		31	public static String MessageAdapterNode_MESSAGE_ADAPTER;
		32	public static String MessageListenerNode_MessageListener;
		33	public static String ActicationSpecNode_ActivationSpec;
30	public static String ACTIVATION_CONFIG_PROPERTIES;	34	public static String ACTIVATION_CONFIG_PROPERTIES;
31	public static String ENTERPRISE_BEAN_CLASS_DESCRIPTION;	35	public static String ENTERPRISE_BEAN_CLASS_DESCRIPTION;
32		36
Lines 58-63 Link Here
58	public static String AddModuleToEarDropAssistant_Adding_module_to_ea_;	62	public static String AddModuleToEarDropAssistant_Adding_module_to_ea_;
59	public static String ImportJEEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts;	63	public static String ImportJEEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts;
60	public static String ImportJEEModuleDropAssistant_Could_not_recognize_extension_0_;	64	public static String ImportJEEModuleDropAssistant_Could_not_recognize_extension_0_;
		65	public static String InboundRaNode_Inbound_Resource_adapter;
		66
		67	public static String ConnectorLabelProvider_ADMIN_OBJECT;
		68	public static String ConnectorLabelProvider_CONFIG_PROPERTY;
		69	public static String ConnectorLabelProvider_ConnectionDefinition;
		70	public static String ConnectorLabelProvider_LICENSE_ARTIFACT;
		71	public static String ConnectorLabelProvider_RequiredConfigProperty;
		72	public static String GroupRaContentProvider_RESOURCE_ADAPTER;
		73	public static String OutboundRaNode_OutboundResourceAdapter;
61		74
62	static {	75	static {
63	NLS.initializeMessages(BUNDLE_NAME, Messages.class);	76	NLS.initializeMessages(BUNDLE_NAME, Messages.class);

Lines 4-9 Link Here

(-)src/org/eclipse/jst/jee/ui/internal/messages.properties (+12 lines)
4	SESSION_BEANS=Session Beans	4	SESSION_BEANS=Session Beans
5	ENTITY_BEANS=Entity Beans (1.x-2.x)	5	ENTITY_BEANS=Entity Beans (1.x-2.x)
6	MESSAGE_DRIVEN_BEANS=Message-Driven Beans	6	MESSAGE_DRIVEN_BEANS=Message-Driven Beans
		7	MessageAdapterNode_MESSAGE_ADAPTER=MessageAdapter
		8	MessageListenerNode_MessageListener=MessageListener
		9	ActicationSpecNode_ActivationSpec=ActivationSpec
7	ACTIVATION_CONFIG_PROPERTIES=Activation Config Properties	10	ACTIVATION_CONFIG_PROPERTIES=Activation Config Properties
8	ENTERPRISE_BEAN_CLASS_DESCRIPTION=Enterprise Bean Class -	11	ENTERPRISE_BEAN_CLASS_DESCRIPTION=Enterprise Bean Class -
9		12
Lines 32-34 Link Here
32	AddModuleToEarDropAssistant_Adding_module_to_ea_=Adding module to ear	35	AddModuleToEarDropAssistant_Adding_module_to_ea_=Adding module to ear
33	ImportJEEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts=Importing Java Enterprise Edition artifacts	36	ImportJEEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts=Importing Java Enterprise Edition artifacts
34	ImportJEEModuleDropAssistant_Could_not_recognize_extension_0_=Could not recognize extension	37	ImportJEEModuleDropAssistant_Could_not_recognize_extension_0_=Could not recognize extension
		38	InboundRaNode_Inbound_Resource_adapter=InboundResourceAdapter
		39
		40	ConnectorLabelProvider_ADMIN_OBJECT=AdminObject
		41	ConnectorLabelProvider_CONFIG_PROPERTY=ConfigProperty
		42	ConnectorLabelProvider_ConnectionDefinition=ConnectionDefinition
		43	ConnectorLabelProvider_LICENSE_ARTIFACT=License
		44	ConnectorLabelProvider_RequiredConfigProperty=RequiredConfigProperty
		45	GroupRaContentProvider_RESOURCE_ADAPTER=Resource Adapter
		46	OutboundRaNode_OutboundResourceAdapter=OutboundResourceAdapter




package org.eclipse.jst.jee.ui.internal.navigator;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.core.resources.IProject;
import org.eclipse.jst.javaee.jca.Connector;
import org.eclipse.jst.jee.ui.internal.navigator.ra.RaGroupContentProvider;

public class ConnectorContentProvider extends JEE5ContentProvider {

	public Object[] getChildren(Object aParentElement) {
		List<Object> children = new ArrayList<Object>();
		IProject project = null;
		if (IProject.class.isInstance(aParentElement)) {
			project = (IProject) aParentElement;
				AbstractGroupProvider cachedContentProvider = getCachedContentProvider(project);
				if (cachedContentProvider.isValid()){
					children.add(cachedContentProvider);
				}
		} else if (AbstractGroupProvider.class.isInstance(aParentElement)){
			AbstractGroupProvider abstractGroupProvider = (AbstractGroupProvider) aParentElement;
			if (abstractGroupProvider.hasChildren()){
				children.addAll(abstractGroupProvider.getChildren());
			}
		}
		return children.toArray();
	}

	public Object getParent(Object element) {
		return null;
	}

	public boolean hasChildren(Object element) {
		return true;
	}

	public Object[] getElements(Object inputElement) {
		return getChildren(inputElement);
	}

	@Override
	protected AbstractGroupProvider getNewContentProviderInstance(IProject project) {
		return new RaGroupContentProvider((Connector)getCachedModelProvider(project).getModelObject(), project);
	}

}




package org.eclipse.jst.jee.ui.internal.navigator;

import org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider;
import org.eclipse.jst.javaee.jca.ConfigProperty;
import org.eclipse.jst.javaee.jca.ConnectionDefinition;
import org.eclipse.jst.javaee.jca.RequiredConfigProperty;
import org.eclipse.jst.jee.ui.internal.Messages;
import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
import org.eclipse.swt.graphics.Image;

public class ConnectorLabelProvider extends J2EELabelProvider {

	private Image CONFIG_PROP_IMAGE;
	private Image LICENSE_IMAGE;

	@Override
	public String getText(Object element) {
		if (AbstractGroupProvider.class.isInstance(element)){
			return ((AbstractGroupProvider) element).getText();
		} else if (element instanceof org.eclipse.jst.javaee.jca.License){
			return Messages.ConnectorLabelProvider_LICENSE_ARTIFACT;
		}  else if (element instanceof ConfigProperty){
			return Messages.ConnectorLabelProvider_CONFIG_PROPERTY + ((ConfigProperty)element).getConfigPropertyName() != null ? ((ConfigProperty)element).getConfigPropertyName() : ""; //$NON-NLS-1$
		}  else if (element instanceof RequiredConfigProperty){
			return Messages.ConnectorLabelProvider_RequiredConfigProperty + ((RequiredConfigProperty)element).getConfigPropertyName() != null ? ((RequiredConfigProperty)element).getConfigPropertyName() : ""; //$NON-NLS-1$
		}  else if (element instanceof ConnectionDefinition){
			return Messages.ConnectorLabelProvider_ConnectionDefinition + ((ConnectionDefinition)element).getManagedconnectionfactoryClass() != null ?((ConnectionDefinition)element).getManagedconnectionfactoryClass() : ""; //$NON-NLS-1$
		}
		
		return super.getText(element);
	}

	@Override
	public Image getImage(Object element) {
		if (AbstractGroupProvider.class.isInstance(element)){
			return ((AbstractGroupProvider) element).getImage();
		}  else if (element instanceof ConfigProperty){
			if (CONFIG_PROP_IMAGE == null) {
				CONFIG_PROP_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_CONFIG_PROP);
			}
			return CONFIG_PROP_IMAGE;		
		} else if (element instanceof org.eclipse.jst.javaee.jca.License){
			if (LICENSE_IMAGE == null) {
				LICENSE_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_LICENSE);
			}
			return LICENSE_IMAGE;		
		}
		return super.getImage(element);
	}

	
	
}

Lines 111-119 Link Here

(-)src/org/eclipse/jst/jee/ui/internal/navigator/Ear5ContentProvider.java (-2 / +4 lines)
111	try {	111	try {
112	facetedProject = ProjectFacetsManager.create(project);	112	facetedProject = ProjectFacetsManager.create(project);
113	if (facetedProject != null &&	113	if (facetedProject != null &&
114	facetedProject.hasProjectFacet(	114	(facetedProject.hasProjectFacet(
115	ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(	115	ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
116	J2EEVersionConstants.VERSION_5_0_TEXT))) {	116	J2EEVersionConstants.VERSION_5_0_TEXT)) \|\| facetedProject.hasProjectFacet(
		117	ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
		118	J2EEVersionConstants.VERSION_6_0_TEXT)))) {
117	GroupEARProvider element = (GroupEARProvider) getCachedContentProvider(project);	119	GroupEARProvider element = (GroupEARProvider) getCachedContentProvider(project);
118	children.add(element);	120	children.add(element);
119	}	121	}

Lines 76-84 Link Here

(-)src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java (-2 / +4 lines)
76	IFacetedProject facetedProject = ProjectFacetsManager.create(project);	76	IFacetedProject facetedProject = ProjectFacetsManager.create(project);
77	//EE6TODO	77	//EE6TODO
78	if (facetedProject != null &&	78	if (facetedProject != null &&
79	facetedProject.hasProjectFacet(	79	(facetedProject.hasProjectFacet(
80	ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(	80	ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
81	J2EEVersionConstants.VERSION_5_0_TEXT))) {	81	J2EEVersionConstants.VERSION_5_0_TEXT)) \|\| facetedProject.hasProjectFacet(
		82	ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
		83	J2EEVersionConstants.VERSION_6_0_TEXT)))) {
82		84
83	if(bundledLibsNode == null){	85	if(bundledLibsNode == null){
84	BundledNode bundledLibsDirectoryNode = new BundledNode(project, Messages.LIBRARY_DIRECTORY + ": /" + EAR_DEFAULT_LIB, null);//$NON-NLS-1$	86	BundledNode bundledLibsDirectoryNode = new BundledNode(project, Messages.LIBRARY_DIRECTORY + ": /" + EAR_DEFAULT_LIB, null);//$NON-NLS-1$




package org.eclipse.jst.jee.ui.internal.navigator.ra;

import org.eclipse.jst.javaee.core.JavaEEObject;
import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;

public abstract class AbstractConnectorGroupProvider extends AbstractGroupProvider {

	public AbstractConnectorGroupProvider(JavaEEObject javaee) {
		super(javaee);
	}

}




package org.eclipse.jst.jee.ui.internal.navigator.ra;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.jst.javaee.core.JavaEEObject;
import org.eclipse.jst.javaee.jca.ActivationSpec;
import org.eclipse.jst.jee.ui.internal.Messages;
import org.eclipse.swt.graphics.Image;

public class ActicationSpecNode extends AbstractConnectorGroupProvider {

	public ActicationSpecNode(JavaEEObject javaee) {
		super(javaee);
	}

	@Override
	public String getText() {
		return Messages.ActicationSpecNode_ActivationSpec + (((ActivationSpec)javaee).getActivationspecClass() != null ? ((ActivationSpec)javaee).getActivationspecClass() :"");  //$NON-NLS-1$
	}

	@Override
	public boolean hasChildren() {
		return ((ActivationSpec)javaee).getRequiredConfigProperty() != null && ((ActivationSpec)javaee).getRequiredConfigProperty().size() > 0;
	}

	@Override
	public List getChildren() {
		List children = new ArrayList();
		children.addAll(((ActivationSpec)javaee).getRequiredConfigProperty());
		return children;
	}

	@Override
	public Image getImage() {
		return null;
	}

}




package org.eclipse.jst.jee.ui.internal.navigator.ra;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.jst.javaee.core.JavaEEObject;
import org.eclipse.jst.javaee.jca.AdminObject;
import org.eclipse.jst.jee.ui.internal.Messages;
import org.eclipse.swt.graphics.Image;

public class AdminObjectNode extends AbstractConnectorGroupProvider {

	public AdminObjectNode(JavaEEObject javaee) {
		super(javaee);
	}

	@Override
	public List getChildren() {
		List children = new ArrayList();
//		children.addAll(((AdminObject)javaee).getConfigProperty());
		return children;
	}
	
	

	@Override
	public boolean hasChildren() {
		return false;
	}

	@Override
	public Image getImage() {
		return null;
	}

	@Override
	public String getText() {
		return Messages.ConnectorLabelProvider_ADMIN_OBJECT + (((AdminObject)javaee).getAdminobjectInterface() != null ? ((AdminObject)javaee).getAdminobjectInterface() :""); //$NON-NLS-1$
	}
	
	

}




package org.eclipse.jst.jee.ui.internal.navigator.ra;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.jst.javaee.core.JavaEEObject;
import org.eclipse.jst.javaee.jca.Connector;
import org.eclipse.jst.javaee.jca.ResourceAdapter;
import org.eclipse.jst.jee.ui.internal.Messages;
import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
import org.eclipse.swt.graphics.Image;

public class GroupRaContentProvider extends AbstractConnectorGroupProvider {


	private Image RA_IMAGE;

	public GroupRaContentProvider(JavaEEObject javaee1) {
		super(javaee1);
	}

	@Override
	public List getChildren() {
		List children = new ArrayList();
		Connector connector = (Connector) javaee;
		ResourceAdapter ra = connector.getResourceadapter();
		if (ra == null){
			return children;
		}
		if (ra.getAdminobject() != null){
			for (Object object : ra.getAdminobject() ) {
				children.add(new AdminObjectNode((JavaEEObject) object));				
			}
		}
		if (ra.getConfigProperty() != null){
			children.addAll(ra.getConfigProperty());
		}
		
		if (ra.getSecurityPermission() != null){
			children.addAll(ra.getSecurityPermission());
		}
		if (ra.getInboundResourceadapter() != null){
			children.add(new InboundRaNode(ra.getInboundResourceadapter()));
		}
		if (ra.getOutboundResourceadapter()!= null){
			children.add(new OutboundRaNode(ra.getOutboundResourceadapter()));
			
		}
		return children;
	}

	@Override
	public Image getImage() {
		if (RA_IMAGE == null) {
			RA_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_RESOURCE_ADAPTER);
		}
		return RA_IMAGE;
	}

	@Override
	public String getText() {
		return Messages.GroupRaContentProvider_RESOURCE_ADAPTER;
	}
	
}




package org.eclipse.jst.jee.ui.internal.navigator.ra;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.jst.javaee.core.JavaEEObject;
import org.eclipse.jst.javaee.jca.InboundResourceAdapter;
import org.eclipse.jst.jee.ui.internal.Messages;
import org.eclipse.swt.graphics.Image;

public class InboundRaNode extends AbstractConnectorGroupProvider {

	public InboundRaNode(JavaEEObject javaee) {
		super(javaee);
	}

	@Override
	public List getChildren() {
		List children = new ArrayList();
		children.add(new MessageAdapterNode(((InboundResourceAdapter)javaee).getMessageadapter()));
		return children;
	}

	@Override
	public Image getImage() {
		return null;
	}

	@Override
	public String getText() {
		return Messages.InboundRaNode_Inbound_Resource_adapter;
	}

	@Override
	public boolean hasChildren() {
		return ((InboundResourceAdapter)javaee).getMessageadapter() != null;
	}
	
	

}




package org.eclipse.jst.jee.ui.internal.navigator.ra;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.jst.javaee.core.JavaEEObject;
import org.eclipse.jst.javaee.jca.MessageAdapter;
import org.eclipse.jst.javaee.jca.MessageListener;
import org.eclipse.jst.jee.ui.internal.Messages;
import org.eclipse.swt.graphics.Image;

public class MessageAdapterNode extends AbstractConnectorGroupProvider {

	public MessageAdapterNode(JavaEEObject javaee) {
		super(javaee);
	}

	@Override
	public List getChildren() {
		List children = new ArrayList();
		List<MessageListener> messagelistener = ((MessageAdapter)javaee).getMessagelistener();
		for (MessageListener messageListener2 : messagelistener) {
			children.add(new MessageListenerNode(messageListener2));	
		}
		return children;
	}

	@Override
	public Image getImage() {
		return null;
	}

	@Override
	public String getText() {
		return Messages.MessageAdapterNode_MESSAGE_ADAPTER;
	}

	@Override
	public boolean hasChildren() {
		List<MessageListener> messagelistener = ((MessageAdapter)javaee).getMessagelistener();
		return messagelistener != null && messagelistener.size()>0;
	}
	
	

}




package org.eclipse.jst.jee.ui.internal.navigator.ra;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.jst.javaee.core.JavaEEObject;
import org.eclipse.jst.javaee.jca.MessageListener;
import org.eclipse.jst.jee.ui.internal.Messages;
import org.eclipse.swt.graphics.Image;

public class MessageListenerNode extends AbstractConnectorGroupProvider {

	public MessageListenerNode(JavaEEObject javaee) {
		super(javaee);
	}



	@Override
	public List getChildren() {
		List children = new ArrayList();
		children.add(new ActicationSpecNode(((MessageListener)javaee).getActivationspec()));
		return children;
	}
	
	

	@Override
	public boolean hasChildren() {
		return ((MessageListener)javaee).getActivationspec() != null;
	}

	@Override
	public Image getImage() {
		return null;
	}

	@Override
	public String getText() {
		return Messages.MessageListenerNode_MessageListener + (((MessageListener)javaee).getMessagelistenerType() != null ? ((MessageListener)javaee).getMessagelistenerType() :"");  //$NON-NLS-1$
	}

}




package org.eclipse.jst.jee.ui.internal.navigator.ra;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.jst.javaee.core.JavaEEObject;
import org.eclipse.jst.javaee.jca.OutboundResourceAdapter;
import org.eclipse.jst.jee.ui.internal.Messages;
import org.eclipse.swt.graphics.Image;

public class OutboundRaNode extends AbstractConnectorGroupProvider {

	public OutboundRaNode(JavaEEObject javaee) {
		super(javaee);
	}

	@Override
	public List getChildren() {
		List children = new ArrayList();
		children.addAll(((OutboundResourceAdapter)javaee).getConnectionDefinition());
		return children;
	}
	@Override
	public Image getImage() {
		return null;
	}

	@Override
	public boolean hasChildren() {
		return ((OutboundResourceAdapter)javaee).getConnectionDefinition() != null && ((OutboundResourceAdapter)javaee).getConnectionDefinition().size() >0;
	}

	@Override
	public String getText() {
		return Messages.OutboundRaNode_OutboundResourceAdapter;
	}

	
	
}




package org.eclipse.jst.jee.ui.internal.navigator.ra;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.core.resources.IProject;
import org.eclipse.jst.javaee.core.JavaEEObject;
import org.eclipse.jst.javaee.jca.Connector;
import org.eclipse.jst.jee.ui.internal.Messages;
import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;

public class RaGroupContentProvider extends AbstractConnectorGroupProvider {

	private IProject project;
	private Image CONNECTOR_IMAGE;

	public RaGroupContentProvider(JavaEEObject javaee, IProject project) {
		super(javaee);
		this.project = project;
	}

	@Override
	public List getChildren() {
		List children = new ArrayList();
		children.add(new GroupRaContentProvider(javaee));
		if(((Connector)javaee).getLicense() != null){
			children.add(((Connector)javaee).getLicense());
		}
		return children;
	}

	@Override
	public Image getImage() {
		if (CONNECTOR_IMAGE == null) {
			CONNECTOR_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_CONNECTOR);
		}
		return CONNECTOR_IMAGE;
	}
	
	
	@Override
	public String getText() {
		return NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, project.getName());
	}

}





import java.net.URL;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
import org.eclipse.core.runtime.Platform;
import java.lang.Throwable;
import org.eclipse.core.runtime.CoreException;

/**
 * The activator class controls the plug-in life cycle

	public static void logError(CoreException exception) {
		Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
	}
	
	public Image getImage(String key){
		return getImageDescriptor(key).createImage();
	}
}

Lines 11-20 Link Here

(-)src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java (+6 lines)
11	package org.eclipse.jst.jee.ui.plugin;	11	package org.eclipse.jst.jee.ui.plugin;
12		12
13		13
		14
14	public class JEEUIPluginIcons {	15	public class JEEUIPluginIcons {
15		16
16	public static String IMG_EJBEEMODEL = "30_ejbjar_obj"; //$NON-NLS-1$	17	public static String IMG_EJBEEMODEL = "30_ejbjar_obj"; //$NON-NLS-1$
17	public static String IMG_WEBEEMODEL = "webapp_25"; //$NON-NLS-1$	18	public static String IMG_WEBEEMODEL = "webapp_25"; //$NON-NLS-1$
		19	public static String IMG_CONNECTOR = "connection"; //$NON-NLS-1$
		20	public static String IMG_CONFIG_PROP = "config_prop_obj"; //$NON-NLS-1$
		21	public static String IMG_LICENSE = "license_obj"; //$NON-NLS-1$
		22	public static String IMG_RESOURCE_ADAPTER = "resource_adapter_obj"; //$NON-NLS-1$
		23
18	public static String SERVLET_MAPPING = "webuiIcons/servlet_mapping"; //$NON-NLS-1$	24	public static String SERVLET_MAPPING = "webuiIcons/servlet_mapping"; //$NON-NLS-1$
19	public static String FILTER_MAPPING = "webuiIcons/filter"; //$NON-NLS-1$	25	public static String FILTER_MAPPING = "webuiIcons/filter"; //$NON-NLS-1$
20	public static String GROUP_FILTER_MAPPING = "webuiIcons/filter_mapping"; //$NON-NLS-1$	26	public static String GROUP_FILTER_MAPPING = "webuiIcons/filter_mapping"; //$NON-NLS-1$

Return to bug 299747

Added Link Here

(-)src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorContentProvider.java (+47 lines)
1	package org.eclipse.jst.jee.ui.internal.navigator;
2
3	import java.util.ArrayList;
4	import java.util.List;
5
6	import org.eclipse.core.resources.IProject;
7	import org.eclipse.jst.javaee.jca.Connector;
8	import org.eclipse.jst.jee.ui.internal.navigator.ra.RaGroupContentProvider;
9
10	public class ConnectorContentProvider extends JEE5ContentProvider {
11
12	public Object[] getChildren(Object aParentElement) {
13	List<Object> children = new ArrayList<Object>();
14	IProject project = null;
15	if (IProject.class.isInstance(aParentElement)) {
16	project = (IProject) aParentElement;
17	AbstractGroupProvider cachedContentProvider = getCachedContentProvider(project);
18	if (cachedContentProvider.isValid()){
19	children.add(cachedContentProvider);
20	}
21	} else if (AbstractGroupProvider.class.isInstance(aParentElement)){
22	AbstractGroupProvider abstractGroupProvider = (AbstractGroupProvider) aParentElement;
23	if (abstractGroupProvider.hasChildren()){
24	children.addAll(abstractGroupProvider.getChildren());
25	}
26	}
27	return children.toArray();
28	}
29
30	public Object getParent(Object element) {
31	return null;
32	}
33
34	public boolean hasChildren(Object element) {
35	return true;
36	}
37
38	public Object[] getElements(Object inputElement) {
39	return getChildren(inputElement);
40	}
41
42	@Override
43	protected AbstractGroupProvider getNewContentProviderInstance(IProject project) {
44	return new RaGroupContentProvider((Connector)getCachedModelProvider(project).getModelObject(), project);
45	}
46
47	}

Added Link Here

(-)src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorLabelProvider.java (+54 lines)
1	package org.eclipse.jst.jee.ui.internal.navigator;
2
3	import org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider;
4	import org.eclipse.jst.javaee.jca.ConfigProperty;
5	import org.eclipse.jst.javaee.jca.ConnectionDefinition;
6	import org.eclipse.jst.javaee.jca.RequiredConfigProperty;
7	import org.eclipse.jst.jee.ui.internal.Messages;
8	import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
9	import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
10	import org.eclipse.swt.graphics.Image;
11
12	public class ConnectorLabelProvider extends J2EELabelProvider {
13
14	private Image CONFIG_PROP_IMAGE;
15	private Image LICENSE_IMAGE;
16
17	@Override
18	public String getText(Object element) {
19	if (AbstractGroupProvider.class.isInstance(element)){
20	return ((AbstractGroupProvider) element).getText();
21	} else if (element instanceof org.eclipse.jst.javaee.jca.License){
22	return Messages.ConnectorLabelProvider_LICENSE_ARTIFACT;
23	} else if (element instanceof ConfigProperty){
24	return Messages.ConnectorLabelProvider_CONFIG_PROPERTY + ((ConfigProperty)element).getConfigPropertyName() != null ? ((ConfigProperty)element).getConfigPropertyName() : ""; //$NON-NLS-1$
25	} else if (element instanceof RequiredConfigProperty){
26	return Messages.ConnectorLabelProvider_RequiredConfigProperty + ((RequiredConfigProperty)element).getConfigPropertyName() != null ? ((RequiredConfigProperty)element).getConfigPropertyName() : ""; //$NON-NLS-1$
27	} else if (element instanceof ConnectionDefinition){
28	return Messages.ConnectorLabelProvider_ConnectionDefinition + ((ConnectionDefinition)element).getManagedconnectionfactoryClass() != null ?((ConnectionDefinition)element).getManagedconnectionfactoryClass() : ""; //$NON-NLS-1$
29	}
30
31	return super.getText(element);
32	}
33
34	@Override
35	public Image getImage(Object element) {
36	if (AbstractGroupProvider.class.isInstance(element)){
37	return ((AbstractGroupProvider) element).getImage();
38	} else if (element instanceof ConfigProperty){
39	if (CONFIG_PROP_IMAGE == null) {
40	CONFIG_PROP_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_CONFIG_PROP);
41	}
42	return CONFIG_PROP_IMAGE;
43	} else if (element instanceof org.eclipse.jst.javaee.jca.License){
44	if (LICENSE_IMAGE == null) {
45	LICENSE_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_LICENSE);
46	}
47	return LICENSE_IMAGE;
48	}
49	return super.getImage(element);
50	}
51
52
53
54	}

Added Link Here

(-)src/org/eclipse/jst/jee/ui/internal/navigator/ra/AbstractConnectorGroupProvider.java (+12 lines)
1	package org.eclipse.jst.jee.ui.internal.navigator.ra;
2
3	import org.eclipse.jst.javaee.core.JavaEEObject;
4	import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
5
6	public abstract class AbstractConnectorGroupProvider extends AbstractGroupProvider {
7
8	public AbstractConnectorGroupProvider(JavaEEObject javaee) {
9	super(javaee);
10	}
11
12	}

Lines 12-26 Link Here

(-)src/org/eclipse/jst/jee/ui/plugin/JEEUIPlugin.java (-3 / +7 lines)
12		12
13	import java.net.URL;	13	import java.net.URL;
14		14
		15	import org.eclipse.core.runtime.CoreException;
15	import org.eclipse.core.runtime.IStatus;	16	import org.eclipse.core.runtime.IStatus;
		17	import org.eclipse.core.runtime.Platform;
16	import org.eclipse.core.runtime.Status;	18	import org.eclipse.core.runtime.Status;
17	import org.eclipse.jface.resource.ImageDescriptor;	19	import org.eclipse.jface.resource.ImageDescriptor;
18	import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;	20	import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
		21	import org.eclipse.swt.graphics.Image;
19	import org.eclipse.ui.plugin.AbstractUIPlugin;	22	import org.eclipse.ui.plugin.AbstractUIPlugin;
20	import org.osgi.framework.BundleContext;	23	import org.osgi.framework.BundleContext;
21	import org.eclipse.core.runtime.Platform;
22	import java.lang.Throwable;
23	import org.eclipse.core.runtime.CoreException;
24		24
25	/**	25	/**
26	* The activator class controls the plug-in life cycle	26	* The activator class controls the plug-in life cycle
Lines 145-148 Link Here
145	public static void logError(CoreException exception) {	145	public static void logError(CoreException exception) {
146	Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );	146	Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
147	}	147	}
		148
		149	public Image getImage(String key){
		150	return getImageDescriptor(key).createImage();
		151	}
148	}	152	}