Attachment #238171 for bug #423614

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 423614
Collapse All | Expand All

Lines 570-575 Link Here

(-)a/plugins/org.eclipse.jst.jee.ui/plugin.xml (-2 / +27 lines)
570	property="org.eclipse.wst.common.project.facet.core.projectFacet"	570	property="org.eclipse.wst.common.project.facet.core.projectFacet"
571	value="jst.ejb:3.1">	571	value="jst.ejb:3.1">
572	</test>	572	</test>
		573	<test
		574	forcePluginActivation="true"
		575	property="org.eclipse.wst.common.project.facet.core.projectFacet"
		576	value="jst.ejb:3.2">
		577	</test>
573	</or>	578	</or>
574	</adapt>	579	</adapt>
575	<instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode" />	580	<instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode" />
Lines 802-807 Link Here
802	property="org.eclipse.wst.common.project.facet.core.projectFacet"	807	property="org.eclipse.wst.common.project.facet.core.projectFacet"
803	value="jst.web:3.0">	808	value="jst.web:3.0">
804	</test>	809	</test>
		810	<test
		811	forcePluginActivation="true"
		812	property="org.eclipse.wst.common.project.facet.core.projectFacet"
		813	value="jst.web:3.1">
		814	</test>
805	</or>	815	</or>
806	</adapt>	816	</adapt>
807	<instanceof	817	<instanceof
Lines 987-998 Link Here
987	forcePluginActivation="true"	997	forcePluginActivation="true"
988	property="org.eclipse.wst.common.project.facet.core.projectFacet"	998	property="org.eclipse.wst.common.project.facet.core.projectFacet"
989	value="jst.ear:5.0">	999	value="jst.ear:5.0">
990	</test>	1000	</test>
991	<test	1001	<test
992	forcePluginActivation="true"	1002	forcePluginActivation="true"
993	property="org.eclipse.wst.common.project.facet.core.projectFacet"	1003	property="org.eclipse.wst.common.project.facet.core.projectFacet"
994	value="jst.ear:6.0">	1004	value="jst.ear:6.0">
995	</test>	1005	</test>
		1006	<test
		1007	forcePluginActivation="true"
		1008	property="org.eclipse.wst.common.project.facet.core.projectFacet"
		1009	value="jst.ear:7.0">
		1010	</test>
996	</or>	1011	</or>
997	</adapt>	1012	</adapt>
998	<instanceof	1013	<instanceof
Lines 1263-1268 Link Here
1263	property="org.eclipse.wst.common.project.facet.core.projectFacet"	1278	property="org.eclipse.wst.common.project.facet.core.projectFacet"
1264	value="jst.appclient:6.0">	1279	value="jst.appclient:6.0">
1265	</test>	1280	</test>
		1281	<test
		1282	forcePluginActivation="true"
		1283	property="org.eclipse.wst.common.project.facet.core.projectFacet"
		1284	value="jst.appclient:7.0">
		1285	</test>
1266	</or>	1286	</or>
1267	</adapt>	1287	</adapt>
1268	<instanceof	1288	<instanceof
Lines 1322-1327 Link Here
1322	property="org.eclipse.wst.common.project.facet.core.projectFacet"	1342	property="org.eclipse.wst.common.project.facet.core.projectFacet"
1323	value="jst.connector:1.6">	1343	value="jst.connector:1.6">
1324	</test>	1344	</test>
		1345	<test
		1346	forcePluginActivation="true"
		1347	property="org.eclipse.wst.common.project.facet.core.projectFacet"
		1348	value="jst.connector:1.7">
		1349	</test>
1325	</or>	1350	</or>
1326	</adapt>	1351	</adapt>
1327	<instanceof	1352	<instanceof




/***********************************************************************
 * Copyright (c) 2008, 2013 by SAP AG, Walldorf. 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *
 * Contributors:
 *     SAP AG - initial API and implementation
 *     IBM - Java EE 7 support
 ***********************************************************************/
package org.eclipse.jst.jee.ui.internal.navigator;


import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;

/**

				IFacetedProject facetedProject;
				try {
					facetedProject = ProjectFacetsManager.create(project);
					IProjectFacet earFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE);
					if (facetedProject != null && 
							(facetedProject.hasProjectFacet(earFacet.getVersion(J2EEVersionConstants.VERSION_5_0_TEXT)) 
							|| facetedProject.hasProjectFacet(earFacet.getVersion(J2EEVersionConstants.VERSION_6_0_TEXT))
							|| facetedProject.hasProjectFacet(earFacet.getVersion(J2EEVersionConstants.VERSION_7_0_TEXT)))) {
													ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
															J2EEVersionConstants.VERSION_6_0_TEXT)))) {
						AbstractGroupProvider element = getCachedContentProvider(project);
						if (element != null){
							children.add(element);	

Lines 1-5 Link Here

(-)a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java (-1 / +12 lines)
1	/***********************************************************************	1	/***********************************************************************
2	* Copyright (c) 2008, 2010 by SAP AG, Walldorf.	2	* Copyright (c) 2008, 2013 by SAP AG, Walldorf.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* SAP AG - initial API and implementation	9	* SAP AG - initial API and implementation
		10	* IBM - Java EE 7 support
10	***********************************************************************/	11	***********************************************************************/
11	package org.eclipse.jst.jee.ui.internal.navigator;	12	package org.eclipse.jst.jee.ui.internal.navigator;
12		13
Lines 48-53 Link Here
48		49
49	private Image ejb30Image;	50	private Image ejb30Image;
50	private Image ejb31Image;	51	private Image ejb31Image;
		52	private Image ejb32Image;
51	private Image sessionBeanImage;	53	private Image sessionBeanImage;
52	private Image mdbImage;	54	private Image mdbImage;
53	private Image cmpImage;	55	private Image cmpImage;
Lines 72-77 Link Here
72	return getEjb30Image();	74	return getEjb30Image();
73	} else if (J2EEVersionConstants.VERSION_3_1_TEXT.equals(version)) {	75	} else if (J2EEVersionConstants.VERSION_3_1_TEXT.equals(version)) {
74	return getEjb31Image();	76	return getEjb31Image();
		77	} else if (J2EEVersionConstants.VERSION_3_2_TEXT.equals(version)) {
		78	return getEjb32Image();
75	}	79	}
76	return getEjb30Image();	80	return getEjb30Image();
77	} else if(element instanceof AbstractDDNode) {	81	} else if(element instanceof AbstractDDNode) {
Lines 154-159 Link Here
154	}	158	}
155	return ejb31Image;	159	return ejb31Image;
156	}	160	}
		161
		162	private Image getEjb32Image() {
		163	if (ejb32Image == null) {
		164	ejb32Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_EJBEE7MODEL).createImage();
		165	}
		166	return ejb32Image;
		167	}
157		168
158	private Image getSessionBeanImage() {	169	private Image getSessionBeanImage() {
159	if (sessionBeanImage == null) {	170	if (sessionBeanImage == null) {

Lines 1-5 Link Here

(-)a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java (-2 / +12 lines)
1	/***********************************************************************	1	/***********************************************************************
2	* Copyright (c) 2008, 2010 by SAP AG, Walldorf.	2	* Copyright (c) 2008, 2013 by SAP AG, Walldorf.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* SAP AG - initial API and implementation	9	* SAP AG - initial API and implementation
		10	* IBM - Java EE 7 support
10	***********************************************************************/	11	***********************************************************************/
11	package org.eclipse.jst.jee.ui.internal.navigator.appclient;	12	package org.eclipse.jst.jee.ui.internal.navigator.appclient;
12		13
Lines 47-52 Link Here
47		48
48	private Image appClient50Image;	49	private Image appClient50Image;
49	private Image appClient60Image;	50	private Image appClient60Image;
		51	private Image appClient70Image;
50		52
51	private IFile ddFile;	53	private IFile ddFile;
52		54
Lines 85-90 Link Here
85	return getAppClient50Image();	87	return getAppClient50Image();
86	} else if (J2EEVersionConstants.VERSION_6_TEXT.equals(version)) {	88	} else if (J2EEVersionConstants.VERSION_6_TEXT.equals(version)) {
87	return getAppClient60Image();	89	return getAppClient60Image();
		90	} else if (J2EEVersionConstants.VERSION_7_TEXT.equals(version)) {
		91	return getAppClient70Image();
88	}	92	}
89	return getAppClient50Image();	93	return getAppClient50Image();
90	}	94	}
Lines 122-126 Link Here
122	}	126	}
123	return appClient60Image;	127	return appClient60Image;
124	}	128	}
125		129
		130	private Image getAppClient70Image() {
		131	if (appClient70Image == null) {
		132	appClient70Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.APP_CLIENT70).createImage();
		133	}
		134	return appClient70Image;
		135	}
126	}	136	}




/***********************************************************************
 * Copyright (c) 2008, 2013 by SAP AG, Walldorf. 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *
 * Contributors:
 *     SAP AG - initial API and implementation
 *     IBM - Java EE 7 support
 ***********************************************************************/
package org.eclipse.jst.jee.ui.internal.navigator.ear;


import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;

/**

	public final static String EAR_DEFAULT_LIB = "lib"; //$NON-NLS-1$
	private static Image ear50Image;
	private static Image ear60Image;
	private static Image ear70Image;
	private EARVirtualComponent earComponent;
	private IFile ddFile;
	


		try {
			IFacetedProject facetedProject = ProjectFacetsManager.create(project);
			IProjectFacet earFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE);
			//EE6TODO
			if (facetedProject != null && 
					(facetedProject.hasProjectFacet(earFacet.getVersion(J2EEVersionConstants.VERSION_5_0_TEXT)) 
					|| facetedProject.hasProjectFacet(earFacet.getVersion(J2EEVersionConstants.VERSION_6_0_TEXT))
					|| facetedProject.hasProjectFacet(earFacet.getVersion(J2EEVersionConstants.VERSION_7_0_TEXT)))) {
											ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
													J2EEVersionConstants.VERSION_6_0_TEXT)))) {

				if (bundledLibsNode == null) {
					BundledNode bundledLibsDirectoryNode = new BundledNode(project, Messages.LIBRARY_DIRECTORY + ": " + EarUtilities.getEARLibDir(earComponent), null);//$NON-NLS-1$

			return getEar50Image();
		} else if (J2EEVersionConstants.VERSION_6_TEXT.equals(version)) {
			return getEar60Image();
		} else if (J2EEVersionConstants.VERSION_7_TEXT.equals(version)) {
			return getEar70Image();
		}
		return getEar50Image();
	}

		return ear60Image;
	}

	private Image getEar70Image() {
		if (ear70Image == null) {
			ear70Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.EAR7_IMAGE).createImage();
		}
		return ear70Image;
	}
}




/***********************************************************************
 * Copyright (c) 2010, 2013 by SAP AG, Walldorf. 
 * All rights reserved. This program and the accompanying materials
 * are 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:
 *     SAP AG - initial API and implementation
 *     IBM - Java EE 7 support
 ***********************************************************************/
package org.eclipse.jst.jee.ui.internal.navigator.ra;

import java.util.ArrayList;

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

	public Connector getConnector()
	{
		return (Connector) javaee;
	}
}




/***********************************************************************
 * Copyright (c) 2010, 2013 by SAP AG, Walldorf. 
 * All rights reserved. This program and the accompanying materials
 * are 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:
 *     SAP AG - initial API and implementation
 *     IBM - Java EE 7 support
 ***********************************************************************/
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.j2ee.internal.J2EEVersionConstants;
import org.eclipse.jst.javaee.core.JavaEEObject;
import org.eclipse.jst.javaee.jca.Connector;
import org.eclipse.jst.jee.ui.internal.Messages;


	private IProject project;
	private Image CONNECTOR_IMAGE;
	private Image CONNECTOR_17_IMAGE;

	public RaGroupContentProvider(JavaEEObject javaee, IProject project) {
		super(javaee);


	@Override
	public Image getImage() {
		// default to 1.7
		Image retVal = getConnector17Image();
		String version = ((Connector)javaee).getVersion();
		if (J2EEVersionConstants.VERSION_1_6_TEXT.equals(version)) {
			retVal = getConnector16Image();
		} else if (J2EEVersionConstants.VERSION_1_7_TEXT.equals(version)) {
			retVal = getConnector17Image();
		} 
		return retVal;
	}
	
	

		return NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, project.getName());
	}

	private Image getConnector16Image() {
		if (CONNECTOR_IMAGE == null) {
			CONNECTOR_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_CONNECTOR);
		}
		return CONNECTOR_IMAGE;
	}

	private Image getConnector17Image() {
		if (CONNECTOR_17_IMAGE == null) {
			CONNECTOR_17_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_EE7CONNECTOR);
		}
		return CONNECTOR_17_IMAGE;
	}
}

Lines 1-5 Link Here

(-)a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java (-1 / +12 lines)
1	/***********************************************************************	1	/***********************************************************************
2	* Copyright (c) 2008, 2010 by SAP AG, Walldorf.	2	* Copyright (c) 2008, 2013 by SAP AG, Walldorf.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* SAP AG - initial API and implementation	9	* SAP AG - initial API and implementation
		10	* IBM - Java EE 7 support
10	***********************************************************************/	11	***********************************************************************/
11	package org.eclipse.jst.jee.ui.internal.navigator.web;	12	package org.eclipse.jst.jee.ui.internal.navigator.web;
12		13
Lines 54-59 Link Here
54		55
55	private Image web25Image;	56	private Image web25Image;
56	private Image web30Image;	57	private Image web30Image;
		58	private Image web31Image;
57		59
58	private IProject prjct = null;	60	private IProject prjct = null;
59	private IFile ddFile = null;	61	private IFile ddFile = null;
Lines 99-104 Link Here
99	return getWeb25Image();	101	return getWeb25Image();
100	} else if (J2EEVersionConstants.VERSION_3_0_TEXT.equals(version)) {	102	} else if (J2EEVersionConstants.VERSION_3_0_TEXT.equals(version)) {
101	return getWeb30Image();	103	return getWeb30Image();
		104	} else if (J2EEVersionConstants.VERSION_3_1_TEXT.equals(version)) {
		105	return getWeb31Image();
102	}	106	}
103	return getWeb25Image();	107	return getWeb25Image();
104	}	108	}
Lines 144-147 Link Here
144	}	148	}
145	return web30Image;	149	return web30Image;
146	}	150	}
		151
		152	private Image getWeb31Image() {
		153	if (web31Image == null) {
		154	web31Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_WEBEE7MODEL).createImage();
		155	}
		156	return web31Image;
		157	}
147	}	158	}




/***********************************************************************
 * Copyright (c) 2008, 2013 by SAP AG, Walldorf. 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *
 * Contributors:
 *     SAP AG - initial API and implementation
 *     IBM - Java EE 7 support
 ***********************************************************************/
package org.eclipse.jst.jee.ui.plugin;



	public static String IMG_EJBEEMODEL = "30_ejbjar_obj"; //$NON-NLS-1$
	public static String IMG_EJBEE6MODEL = "31_ejbjar_obj"; //$NON-NLS-1$
	public static String IMG_EJBEE7MODEL = "32_ejbjar_obj"; //$NON-NLS-1$
	public static String IMG_WEBEEMODEL = "webapp_25"; //$NON-NLS-1$
	public static String IMG_WEBEE6MODEL = "webapp_30"; //$NON-NLS-1$
	public static String IMG_WEBEE7MODEL = "webapp_31"; //$NON-NLS-1$
	public static String IMG_CONNECTOR = "connection"; //$NON-NLS-1$
	public static String IMG_EE7CONNECTOR = "connector_17"; //$NON-NLS-1$
	public static String IMG_CONFIG_PROP = "config_prop_obj"; //$NON-NLS-1$
	public static String IMG_LICENSE = "license_obj"; //$NON-NLS-1$
	public static String IMG_RESOURCE_ADAPTER = "resource_adapter_obj"; //$NON-NLS-1$

	public static String LOCAL_HOME = "ovr/local_home_ovr"; //$NON-NLS-1$
	public static String EAR_IMAGE = "ear_50"; //$NON-NLS-1$
	public static String EAR6_IMAGE = "ear_60"; //$NON-NLS-1$
	public static String EAR7_IMAGE = "ear_70"; //$NON-NLS-1$
	public static String APP_CLIENT50 = "appclient_50"; //$NON-NLS-1$
	public static String APP_CLIENT60 = "appclient_60"; //$NON-NLS-1$
	public static String APP_CLIENT70 = "appclient_70"; //$NON-NLS-1$

}

Return to bug 423614

Lines 1-3 Link Here

(-)a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/GroupRaContentProvider.java (-2 / +17 lines)
		1	/***********************************************************************
		2	* Copyright (c) 2010, 2013 by SAP AG, Walldorf.
		3	* All rights reserved. This program and the accompanying materials
		4	* are made available under the terms of the Eclipse Public License v1.0
		5	* which accompanies this distribution, and is available at
		6	* http://www.eclipse.org/legal/epl-v10.html
		7	*
		8	* Contributors:
		9	* SAP AG - initial API and implementation
		10	* IBM - Java EE 7 support
		11	***********************************************************************/
1	package org.eclipse.jst.jee.ui.internal.navigator.ra;	12	package org.eclipse.jst.jee.ui.internal.navigator.ra;
2		13
3	import java.util.ArrayList;	14	import java.util.ArrayList;
Lines 62-66 Link Here
62	public String getText() {	73	public String getText() {
63	return Messages.GroupRaContentProvider_RESOURCE_ADAPTER;	74	return Messages.GroupRaContentProvider_RESOURCE_ADAPTER;
64	}	75	}
65		76
66	}	77	public Connector getConnector()
		78	{
		79	return (Connector) javaee;
		80	}
		81	}