Attachment #159894 for bug #241667

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





import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL;
import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL_BUSINESS_INTERFACE;
import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.NO_INTERFACE;
import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE;
import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE_BUSINESS_INTERFACE;
import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.STATE_TYPE;

	private Combo stateTypeCombo;
	private Button remoteCheckbox;
	private Button localCheckbox;
	private Button noInterfaceCheckbox;
	private Text remoteInterfaceName;
	private Text localInterfaceName;


		remoteCheckbox = new Button(group, SWT.CHECK);
		remoteCheckbox.setLayoutData(gdhspan(1));
		remoteCheckbox.setText(IEjbWizardConstants.REMOTE_BUSINESS_INTERFACE);
		GridData data2 = new GridData(GridData.FILL_HORIZONTAL);
		data2.horizontalSpan = 1;
		remoteInterfaceName = new Text(group, SWT.SINGLE | SWT.BORDER);
		synchHelper.synchCheckbox(remoteCheckbox, REMOTE, null);
		remoteInterfaceName = new Text(group, SWT.SINGLE | SWT.BORDER);
		remoteInterfaceName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		synchHelper.synchText(remoteInterfaceName, REMOTE_BUSINESS_INTERFACE, null);

		localCheckbox = new Button(group, SWT.CHECK);

		localCheckbox.setText(IEjbWizardConstants.LOCAL_BUSINESS_INTERFACE);
		synchHelper.synchCheckbox(localCheckbox, LOCAL, null);
		localInterfaceName = new Text(group, SWT.SINGLE | SWT.BORDER);
		localInterfaceName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		synchHelper.synchText(localInterfaceName, LOCAL_BUSINESS_INTERFACE, null);
		
		noInterfaceCheckbox = new Button(group, SWT.CHECK);
		noInterfaceCheckbox.setLayoutData(gdhspan(2));
		noInterfaceCheckbox.setText(IEjbWizardConstants.NO_INTERFACE);
		synchHelper.synchCheckbox(noInterfaceCheckbox, NO_INTERFACE, null);
	}

	private static GridData gdhspan(int span) {

		names.add(INTERFACES);
		names.add(LOCAL_BUSINESS_INTERFACE);
		names.add(REMOTE_BUSINESS_INTERFACE);
		names.add(NO_INTERFACE);
		
		return names.toArray(new String[0]);
	}

Lines 27-32 Link Here

(-)ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/IEjbWizardConstants.java (+1 lines)
27	public static final String REMOTE_BUSINESS_INTERFACE_LABEL = EJBUIMessages.REMOTE_BUSINESS_INTERFACE_LABEL;	27	public static final String REMOTE_BUSINESS_INTERFACE_LABEL = EJBUIMessages.REMOTE_BUSINESS_INTERFACE_LABEL;
28	public static final String LOCAL_BUSINESS_INTERFACE = EJBUIMessages.LOCAL_BUSINESS_INTERFACE;	28	public static final String LOCAL_BUSINESS_INTERFACE = EJBUIMessages.LOCAL_BUSINESS_INTERFACE;
29	public static final String LOCAL_BUSINESS_INTERFACE_LABEL = EJBUIMessages.LOCAL_BUSINESS_INTERFACE_LABEL;	29	public static final String LOCAL_BUSINESS_INTERFACE_LABEL = EJBUIMessages.LOCAL_BUSINESS_INTERFACE_LABEL;
		30	public static final String NO_INTERFACE = EJBUIMessages.NO_INTERFACE;
30	public static final String EJB_NAME = EJBUIMessages.EJB_NAME;	31	public static final String EJB_NAME = EJBUIMessages.EJB_NAME;
31		32
32	public final static String TRANSACTION_TYPE_CONTAINER = EJBUIMessages.TRANSACTION_TYPE_CONTAINER;	33	public final static String TRANSACTION_TYPE_CONTAINER = EJBUIMessages.TRANSACTION_TYPE_CONTAINER;

Lines 58-63 Link Here

(-)property_files/ejb_ui.properties (+1 lines)
58	REMOTE_HOME_INTERFACE_LABEL=Remote Home Interface:	58	REMOTE_HOME_INTERFACE_LABEL=Remote Home Interface:
59	LOCAL_BUSINESS_INTERFACE=&Local	59	LOCAL_BUSINESS_INTERFACE=&Local
60	LOCAL_BUSINESS_INTERFACE_LABEL=Local Business Interface:	60	LOCAL_BUSINESS_INTERFACE_LABEL=Local Business Interface:
		61	NO_INTERFACE=No-&interface
61	LOCAL_HOME_INTERFACE_LABEL=Local Home Interface:	62	LOCAL_HOME_INTERFACE_LABEL=Local Home Interface:
62	LOCAL_COMPONENT_INTERFACE_CODE=L	63	LOCAL_COMPONENT_INTERFACE_CODE=L
63	LOCAL_HOME_INTERFACE_CODE=LH	64	LOCAL_HOME_INTERFACE_CODE=LH

Lines 73-78 Link Here

(-)ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java (+1 lines)
73	public static String LOCAL_BUSINESS_INTERFACE;	73	public static String LOCAL_BUSINESS_INTERFACE;
74	public static String LOCAL_BUSINESS_INTERFACE_LABEL;	74	public static String LOCAL_BUSINESS_INTERFACE_LABEL;
75	public static String LOCAL_HOME_INTERFACE_LABEL;	75	public static String LOCAL_HOME_INTERFACE_LABEL;
		76	public static String NO_INTERFACE;
76	public static String EJB_NAME;	77	public static String EJB_NAME;
77	public static String TRANSACTION_TYPE_CONTAINER;	78	public static String TRANSACTION_TYPE_CONTAINER;
78	public static String TRANSACTION_TYPE_BEAN;	79	public static String TRANSACTION_TYPE_BEAN;




	 * business interface. The default is false.
	 */
	public static final String REMOTE = "INewSessionBeanClassDataModelProperties.REMOTE"; //$NON-NLS-1$

	/**
	 * Optional, boolean property used to specify whether to generate a local
	 * business interface. The default is true for EJB 3.0 projects, otherwise -
	 * false.
	 */
	public static final String LOCAL = "INewSessionBeanClassDataModelProperties.LOCAL"; //$NON-NLS-1$

	/**
	 * Optional, boolean property used to specify whether to generate a
	 * no-interface client view. The default is true for EJB 3.1 projects and
	 * later, otherwise - false.
	 * 
	 * @since 3.2
	 */
	public static final String NO_INTERFACE = "INewSessionBeanClassDataModelProperties.NO_INTERFACE"; //$NON-NLS-1$
	
	/**
	 * Optional, boolean property used to specify whether to generate a EJB 2.x




  protected final String TEXT_22 = ", "; //$NON-NLS-1$
  protected final String TEXT_23 = ".class"; //$NON-NLS-1$
  protected final String TEXT_24 = " })"; //$NON-NLS-1$
  protected final String TEXT_25 = NL + "@LocalBean"; //$NON-NLS-1$
  protected final String TEXT_26 = NL + "@LocalHome("; //$NON-NLS-1$
  protected final String TEXT_27 = ".class)"; //$NON-NLS-1$
  protected final String TEXT_28 = NL + "@RemoteHome("; //$NON-NLS-1$
  protected final String TEXT_29 = ".class)"; //$NON-NLS-1$
  protected final String TEXT_30 = NL + "public "; //$NON-NLS-1$
  protected final String TEXT_31 = "abstract "; //$NON-NLS-1$
  protected final String TEXT_32 = "final "; //$NON-NLS-1$
  protected final String TEXT_33 = "class "; //$NON-NLS-1$
  protected final String TEXT_34 = " extends "; //$NON-NLS-1$
  protected final String TEXT_35 = " implements "; //$NON-NLS-1$
  protected final String TEXT_36 = ", "; //$NON-NLS-1$
  protected final String TEXT_37 = " {"; //$NON-NLS-1$
  protected final String TEXT_38 = NL + NL + "    /**" + NL + "     * Default constructor. " + NL + "     */" + NL + "    public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
  protected final String TEXT_39 = "() {" + NL + "        // TODO Auto-generated constructor stub" + NL + "    }";  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
  protected final String TEXT_40 = NL + "       " + NL + "    /**" + NL + "     * @see "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
  protected final String TEXT_41 = "#"; //$NON-NLS-1$
  protected final String TEXT_42 = "("; //$NON-NLS-1$
  protected final String TEXT_43 = ")" + NL + "     */" + NL + "    public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
  protected final String TEXT_44 = "("; //$NON-NLS-1$
  protected final String TEXT_45 = ") {" + NL + "        super("; //$NON-NLS-1$ //$NON-NLS-2$
  protected final String TEXT_46 = ");" + NL + "        // TODO Auto-generated constructor stub" + NL + "    }";  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
  protected final String TEXT_47 = NL + NL + "\t/**" + NL + "     * @see ";  //$NON-NLS-1$//$NON-NLS-2$
  protected final String TEXT_48 = "#"; //$NON-NLS-1$
  protected final String TEXT_49 = "("; //$NON-NLS-1$
  protected final String TEXT_50 = ")" + NL + "     */" + NL + "    public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
  protected final String TEXT_51 = " "; //$NON-NLS-1$
  protected final String TEXT_52 = "("; //$NON-NLS-1$
  protected final String TEXT_53 = ") {" + NL + "        // TODO Auto-generated method stub"; //$NON-NLS-1$ //$NON-NLS-2$
  protected final String TEXT_54 = NL + "\t\t\treturn "; //$NON-NLS-1$
  protected final String TEXT_55 = ";"; //$NON-NLS-1$
  protected final String TEXT_56 = NL + "    }"; //$NON-NLS-1$
  protected final String TEXT_57 = NL + NL + "}"; //$NON-NLS-1$
  protected final String TEXT_58 = NL;

  public String generate(Object argument)
  {

    
	}
	
	if (model.isNoInterfaceChecked()) {

    stringBuffer.append(TEXT_25);
    
	}
		
	if (model.isLocalHomeChecked()) {

    stringBuffer.append(TEXT_26);
    stringBuffer.append(model.getLocalHomeClassSimpleName());
    stringBuffer.append(TEXT_27);
    
	}

	if (model.isRemoteHomeChecked()) {

    stringBuffer.append(TEXT_27);
    stringBuffer.append(model.getRemoteHomeClassSimpleName());
    stringBuffer.append(TEXT_28);
    stringBuffer.append(model.getRemoteHomeClassSimpleName());
    stringBuffer.append(TEXT_29);
    
	}

    
	if (model.isPublic()) { 

    stringBuffer.append(TEXT_30);
     
	} 

	if (model.isAbstract()) { 

    stringBuffer.append(TEXT_31);
    
	}

	if (model.isFinal()) {

    stringBuffer.append(TEXT_32);
    
	}

    stringBuffer.append(TEXT_33);
    stringBuffer.append( model.getClassName() );
    
	String superClass = model.getSuperclassName();
 	if (superClass != null && superClass.length() > 0) {

    stringBuffer.append(TEXT_34);
    stringBuffer.append( superClass );
    
	}

	List<String> interfaces = model.getInterfaces(); 
 	if ( interfaces.size() > 0) { 

    stringBuffer.append(TEXT_35);
    
	}
	

   		String INTERFACE = interfaces.get(i);
   		if (i > 0) {

    stringBuffer.append(TEXT_36);
    
		}


    
	}

    stringBuffer.append(TEXT_37);
     
	if (!model.hasEmptySuperclassConstructor()) { 

    stringBuffer.append(TEXT_37);
    stringBuffer.append( model.getClassName() );
    stringBuffer.append(TEXT_38);
    stringBuffer.append( model.getClassName() );
    stringBuffer.append(TEXT_39);
     
	} 


		for (Constructor constructor : constructors) {
			if (constructor.isPublic() || constructor.isProtected()) { 

    stringBuffer.append(TEXT_39);
    stringBuffer.append( model.getSuperclassName() );
    stringBuffer.append(TEXT_40);
    stringBuffer.append( model.getSuperclassName() );
    stringBuffer.append(TEXT_41);
    stringBuffer.append( model.getSuperclassName() );
    stringBuffer.append(TEXT_42);
    stringBuffer.append( constructor.getParamsForJavadoc() );
    stringBuffer.append(TEXT_43);
    stringBuffer.append( model.getClassName() );
    stringBuffer.append(TEXT_44);
    stringBuffer.append( constructor.getParamsForDeclaration() );
    stringBuffer.append(TEXT_45);
    stringBuffer.append( constructor.getParamsForCall() );
    stringBuffer.append(TEXT_46);
    
			} 
		} 

	if (model.shouldImplementAbstractMethods()) {
		for (Method method : model.getUnimplementedMethods()) { 

    stringBuffer.append(TEXT_46);
    stringBuffer.append( method.getContainingJavaClass() );
    stringBuffer.append(TEXT_47);
    stringBuffer.append( method.getContainingJavaClass() );
    stringBuffer.append(TEXT_48);
    stringBuffer.append( method.getName() );
    stringBuffer.append(TEXT_49);
    stringBuffer.append( method.getParamsForJavadoc() );
    stringBuffer.append(TEXT_50);
    stringBuffer.append( method.getReturnType() );
    stringBuffer.append(TEXT_51);
    stringBuffer.append( method.getName() );
    stringBuffer.append(TEXT_52);
    stringBuffer.append( method.getParamsForDeclaration() );
    stringBuffer.append(TEXT_53);
     
			String defaultReturnValue = method.getDefaultReturnValue();
			if (defaultReturnValue != null) { 

    stringBuffer.append(TEXT_53);
    stringBuffer.append( defaultReturnValue );
    stringBuffer.append(TEXT_54);
    stringBuffer.append( defaultReturnValue );
    stringBuffer.append(TEXT_55);
    
			} 

    stringBuffer.append(TEXT_56);
     
		}
	} 

    stringBuffer.append(TEXT_56);
    stringBuffer.append(TEXT_57);
    stringBuffer.append(TEXT_58);
    return stringBuffer.toString();
  }
}




import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL_COMPONENT_INTERFACE;
import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL_HOME;
import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL_HOME_INTERFACE;
import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.NO_INTERFACE;
import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE;
import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE_BUSINESS_INTERFACE;
import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE_COMPONENT_INTERFACE;


import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.IJavaProject;

import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;

public class NewSessionBeanClassDataModelProvider extends NewEnterpriseBeanClassDataModelProvider {


		propertyNames.add(LOCAL_BUSINESS_INTERFACE);
		propertyNames.add(REMOTE);
		propertyNames.add(LOCAL);
		propertyNames.add(NO_INTERFACE);
		propertyNames.add(STATE_TYPE);
		propertyNames.add(REMOTE_HOME);
		propertyNames.add(LOCAL_HOME);

		else if (propertyName.equals(REMOTE))
			return Boolean.FALSE;
		else if (propertyName.equals(LOCAL))
			return new Boolean(!ejb31OrLater());
		else if (propertyName.equals(NO_INTERFACE)) 
			return new Boolean(ejb31OrLater());
		else if (propertyName.equals(STATE_TYPE))
			return StateType.STATELESS.toString(); 
		else if (propertyName.equals(INTERFACES)) {
			List<BusinessInterface> listResult = new ArrayList<BusinessInterface>();
			String className = getStringProperty(QUALIFIED_CLASS_NAME);
			if (getBooleanProperty(REMOTE) && className.length() > 0) {
				BusinessInterface remoteInterface = new BusinessInterface(getStringProperty(REMOTE_BUSINESS_INTERFACE), BusinessInterfaceType.REMOTE);
				listResult.add(remoteInterface);
			}
			if (getBooleanProperty(LOCAL) && className.length() > 0) {
				BusinessInterface localInterface = new BusinessInterface(getStringProperty(LOCAL_BUSINESS_INTERFACE), BusinessInterfaceType.LOCAL);
				listResult.add(localInterface);
			}

		// Call super to set the property on the data model
		boolean result = super.propertySet(propertyName, propertyValue);

		if (PROJECT_NAME.equals(propertyName)) {
			IDataModel dataModel = getDataModel();
			dataModel.notifyPropertyChange(REMOTE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(LOCAL, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(NO_INTERFACE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(REMOTE_BUSINESS_INTERFACE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(LOCAL_BUSINESS_INTERFACE, IDataModel.DEFAULT_CHG);
		} else if (CLASS_NAME.equals(propertyName) || JAVA_PACKAGE.equals(propertyName)) {
			IDataModel dataModel = getDataModel();
			dataModel.notifyPropertyChange(REMOTE_BUSINESS_INTERFACE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(LOCAL_BUSINESS_INTERFACE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(REMOTE_HOME_INTERFACE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(LOCAL_HOME_INTERFACE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(REMOTE_COMPONENT_INTERFACE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(LOCAL_COMPONENT_INTERFACE, IDataModel.DEFAULT_CHG);
		} else if (propertyName.equals(REMOTE)) {
			if (!getDataModel().isPropertySet(INTERFACES)) {
				getDataModel().notifyPropertyChange(INTERFACES, IDataModel.DEFAULT_CHG);
			} else {

			}
			getDataModel().notifyPropertyChange(REMOTE_BUSINESS_INTERFACE, IDataModel.ENABLE_CHG);

		} else if (propertyName.equals(LOCAL)) {
		if (propertyName.equals(LOCAL)) {
			if (!getDataModel().isPropertySet(INTERFACES)) {
				getDataModel().notifyPropertyChange(INTERFACES, IDataModel.DEFAULT_CHG);
			} else {
				updateBusinessInterfaces(LOCAL);
			}
			getDataModel().notifyPropertyChange(LOCAL_BUSINESS_INTERFACE, IDataModel.ENABLE_CHG);
		} else if (REMOTE_BUSINESS_INTERFACE.equals(propertyName)) {
		if (REMOTE_BUSINESS_INTERFACE.equals(propertyName))
		{
			if(getRemoteProperty() != null){
				getRemoteProperty().setFullyQualifiedName(propertyValue.toString());
			}
		} else if (LOCAL_BUSINESS_INTERFACE.equals(propertyName)) {
		else if (LOCAL_BUSINESS_INTERFACE.equals(propertyName))
		{
			if(getLocalProperty() != null){
				getLocalProperty().setFullyQualifiedName(propertyValue.toString());
			}
		} 
		else if (CLASS_NAME.equals(propertyName) || JAVA_PACKAGE.equals(propertyName))
		{
			IDataModel dataModel = getDataModel();
			dataModel.notifyPropertyChange(REMOTE_BUSINESS_INTERFACE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(LOCAL_BUSINESS_INTERFACE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(REMOTE_HOME_INTERFACE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(LOCAL_HOME_INTERFACE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(REMOTE_COMPONENT_INTERFACE, IDataModel.DEFAULT_CHG);
			dataModel.notifyPropertyChange(LOCAL_COMPONENT_INTERFACE, IDataModel.DEFAULT_CHG);
		}

		return result;
	}

		return super.getValidPropertyDescriptors(propertyName);
	}

	private boolean ejb31OrLater() {
		IProject project = getTargetProject();
		IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.EJB);
		int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
		int ejb31version = J2EEVersionUtil.convertVersionStringToInt(IJ2EEFacetConstants.EJB_31.getVersionString());
		return version >= ejb31version;
	}

	private void updateBusinessInterfaces(String propertyName) {
		List<BusinessInterface> list = (List<BusinessInterface>) getProperty(INTERFACES);
		if (propertyName.equals(REMOTE)) {

	public IStatus validate(String propertyName) {
		if (STATE_TYPE.equals(propertyName)) {
			return validateStateType();			
		} else if (NO_INTERFACE.equals(propertyName)) {
			if (getBooleanProperty(NO_INTERFACE)) {
				return validateNoInterface();
			}
		} else if (LOCAL_BUSINESS_INTERFACE.equals(propertyName)) {
			if (getBooleanProperty(LOCAL)) {
				return validateEjbInterface(getStringProperty(propertyName));

	protected IStatus validateStateType() {
		String value = getStringProperty(STATE_TYPE);
		if (StateType.SINGLETON.toString().equals(value) && !ejb31OrLater()) {
			return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.ERR_SINGLETON_NOT_ALLOWED);
		}
		return Status.OK_STATUS;
	}

	protected IStatus validateNoInterface() {
		if (!ejb31OrLater()) {
			return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.ERR_NO_INTERFACE_NOT_ALLOWED);
		}
		return Status.OK_STATUS;
	}


	protected IStatus validateInterfacesList() {
		List<BusinessInterface> list = (List<BusinessInterface>) getProperty(INTERFACES);
		if (list.isEmpty() && !ejb31OrLater()) {
			return new Status(IStatus.WARNING, EjbPlugin.PLUGIN_ID, EJBCreationResourceHandler.WRN_NO_CLIENT_VIEW); 
		}
		return Status.OK_STATUS;
	}

		}
		return WTPCommonPlugin.OK_STATUS;
	}
	
	private boolean isEJB30Project() {
		try {
			return ProjectFacetsManager.create(getTargetProject()).hasProjectFacet(IJ2EEFacetConstants.EJB_30);
		} catch (CoreException e) {
			return false;
		}
	}

	private boolean ejb31OrLater() {
		IProject project = getTargetProject();
		IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.EJB);
		int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
		int ejb31version = J2EEVersionUtil.convertVersionStringToInt(IJ2EEFacetConstants.EJB_31.getVersionString());
		return version >= ejb31version;
	}
	
}

Lines 68-73 Link Here

(-)templates/sessionBean_classHeader.template (+6 lines)
68	<%	68	<%
69	}	69	}
70		70
		71	if (model.isNoInterfaceChecked()) {
		72	%>
		73	@LocalBean
		74	<%
		75	}
		76
71	if (model.isLocalHomeChecked()) {	77	if (model.isLocalHomeChecked()) {
72	%>	78	%>
73	@LocalHome(<%=model.getLocalHomeClassSimpleName()%>.class)	79	@LocalHome(<%=model.getLocalHomeClassSimpleName()%>.class)

Lines 1-6 Link Here

(-)templates/messageDrivenBean_classHeader.template (-1 lines)
1	/**	1	/**
2	* Message-Driven Bean implementation class for: <%=model.getClassName()%>	2	* Message-Driven Bean implementation class for: <%=model.getClassName()%>
3	*
4	*/	3	*/
5	@MessageDriven	4	@MessageDriven
6	<%	5	<%

Lines 148-152 Link Here

(-)property_files/ejbcreation.properties (-2 / +3 lines)
148	ERR_REMOTE_HOME_NOT_INTERFACE=The specified Remote Home interface is not valid.	148	ERR_REMOTE_HOME_NOT_INTERFACE=The specified Remote Home interface is not valid.
149	ERR_BEAN_ALREADY_EXISTS=Enterprise bean with the same Ejb Name already exists.	149	ERR_BEAN_ALREADY_EXISTS=Enterprise bean with the same Ejb Name already exists.
150	WRN_BEAN_NAME_IS_EMPTY=Bean name is empty, the containter will use the name of the bean class.	150	WRN_BEAN_NAME_IS_EMPTY=Bean name is empty, the containter will use the name of the bean class.
151	WRN_NO_BUSINESS_INTERFACE=No business interface configured. Clients will not be able to access this bean.	151	WRN_NO_CLIENT_VIEW=No client view configured. Clients will not be able to access this bean.
152	ERR_SINGLETON_ALLOWED_ONLY_FOR_31_AND_LATER=The 'Singleton' state type is allowed only for EJB projects with version 3.1 and later.	152	ERR_SINGLETON_NOT_ALLOWED=The 'Singleton' state type is allowed only for EJB projects with version 3.1 or later.
		153	ERR_NO_INTERFACE_NOT_ALLOWED=The no-interface client view is allowed only for EJB projects with version 3.1 or later.

Lines 163-170 Link Here

(-)ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBCreationResourceHandler.java (-2 / +3 lines)
163	public static String ERR_REMOTE_HOME_NOT_INTERFACE;	163	public static String ERR_REMOTE_HOME_NOT_INTERFACE;
164	public static String ERR_NO_MESSAGE_LISTENER_INTERFACE;	164	public static String ERR_NO_MESSAGE_LISTENER_INTERFACE;
165	public static String WRN_BEAN_NAME_IS_EMPTY;	165	public static String WRN_BEAN_NAME_IS_EMPTY;
166	public static String WRN_NO_BUSINESS_INTERFACE;	166	public static String WRN_NO_CLIENT_VIEW;
167	public static String ERR_SINGLETON_ALLOWED_ONLY_FOR_31_AND_LATER;	167	public static String ERR_SINGLETON_NOT_ALLOWED;
		168	public static String ERR_NO_INTERFACE_NOT_ALLOWED;
168		169
169		170
170	static {	171	static {

Return to bug 241667

Lines 39-77 Link Here

(-)ejb/org/eclipse/jst/j2ee/ejb/internal/operations/SessionBeanTemplate.java (-64 / +71 lines)
39	protected final String TEXT_22 = ", "; //$NON-NLS-1$	39	protected final String TEXT_22 = ", "; //$NON-NLS-1$
40	protected final String TEXT_23 = ".class"; //$NON-NLS-1$	40	protected final String TEXT_23 = ".class"; //$NON-NLS-1$
41	protected final String TEXT_24 = " })"; //$NON-NLS-1$	41	protected final String TEXT_24 = " })"; //$NON-NLS-1$
42	protected final String TEXT_25 = NL + "@LocalHome("; //$NON-NLS-1$	42	protected final String TEXT_25 = NL + "@LocalBean"; //$NON-NLS-1$
43	protected final String TEXT_26 = ".class)"; //$NON-NLS-1$	43	protected final String TEXT_26 = NL + "@LocalHome("; //$NON-NLS-1$
44	protected final String TEXT_27 = NL + "@RemoteHome("; //$NON-NLS-1$	44	protected final String TEXT_27 = ".class)"; //$NON-NLS-1$
45	protected final String TEXT_28 = ".class)"; //$NON-NLS-1$	45	protected final String TEXT_28 = NL + "@RemoteHome("; //$NON-NLS-1$
46	protected final String TEXT_29 = NL + "public "; //$NON-NLS-1$	46	protected final String TEXT_29 = ".class)"; //$NON-NLS-1$
47	protected final String TEXT_30 = "abstract "; //$NON-NLS-1$	47	protected final String TEXT_30 = NL + "public "; //$NON-NLS-1$
48	protected final String TEXT_31 = "final "; //$NON-NLS-1$	48	protected final String TEXT_31 = "abstract "; //$NON-NLS-1$
49	protected final String TEXT_32 = "class "; //$NON-NLS-1$	49	protected final String TEXT_32 = "final "; //$NON-NLS-1$
50	protected final String TEXT_33 = " extends "; //$NON-NLS-1$	50	protected final String TEXT_33 = "class "; //$NON-NLS-1$
51	protected final String TEXT_34 = " implements "; //$NON-NLS-1$	51	protected final String TEXT_34 = " extends "; //$NON-NLS-1$
52	protected final String TEXT_35 = ", "; //$NON-NLS-1$	52	protected final String TEXT_35 = " implements "; //$NON-NLS-1$
53	protected final String TEXT_36 = " {"; //$NON-NLS-1$	53	protected final String TEXT_36 = ", "; //$NON-NLS-1$
54	protected final String TEXT_37 = NL + NL + " /*" + NL + " Default constructor. " + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$	54	protected final String TEXT_37 = " {"; //$NON-NLS-1$
55	protected final String TEXT_38 = "() {" + NL + " // TODO Auto-generated constructor stub" + NL + " }"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	55	protected final String TEXT_38 = NL + NL + " /*" + NL + " Default constructor. " + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
56	protected final String TEXT_39 = NL + " " + NL + " /*" + NL + " @see "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	56	protected final String TEXT_39 = "() {" + NL + " // TODO Auto-generated constructor stub" + NL + " }"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
57	protected final String TEXT_40 = "#"; //$NON-NLS-1$	57	protected final String TEXT_40 = NL + " " + NL + " /*" + NL + " @see "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
58	protected final String TEXT_41 = "("; //$NON-NLS-1$	58	protected final String TEXT_41 = "#"; //$NON-NLS-1$
59	protected final String TEXT_42 = ")" + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	59	protected final String TEXT_42 = "("; //$NON-NLS-1$
60	protected final String TEXT_43 = "("; //$NON-NLS-1$	60	protected final String TEXT_43 = ")" + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
61	protected final String TEXT_44 = ") {" + NL + " super("; //$NON-NLS-1$ //$NON-NLS-2$	61	protected final String TEXT_44 = "("; //$NON-NLS-1$
62	protected final String TEXT_45 = ");" + NL + " // TODO Auto-generated constructor stub" + NL + " }"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	62	protected final String TEXT_45 = ") {" + NL + " super("; //$NON-NLS-1$ //$NON-NLS-2$
63	protected final String TEXT_46 = NL + NL + "\t/*" + NL + " @see "; //$NON-NLS-1$ //$NON-NLS-2$	63	protected final String TEXT_46 = ");" + NL + " // TODO Auto-generated constructor stub" + NL + " }"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
64	protected final String TEXT_47 = "#"; //$NON-NLS-1$	64	protected final String TEXT_47 = NL + NL + "\t/*" + NL + " @see "; //$NON-NLS-1$//$NON-NLS-2$
65	protected final String TEXT_48 = "("; //$NON-NLS-1$	65	protected final String TEXT_48 = "#"; //$NON-NLS-1$
66	protected final String TEXT_49 = ")" + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	66	protected final String TEXT_49 = "("; //$NON-NLS-1$
67	protected final String TEXT_50 = " "; //$NON-NLS-1$	67	protected final String TEXT_50 = ")" + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
68	protected final String TEXT_51 = "("; //$NON-NLS-1$	68	protected final String TEXT_51 = " "; //$NON-NLS-1$
69	protected final String TEXT_52 = ") {" + NL + " // TODO Auto-generated method stub"; //$NON-NLS-1$ //$NON-NLS-2$	69	protected final String TEXT_52 = "("; //$NON-NLS-1$
70	protected final String TEXT_53 = NL + "\t\t\treturn "; //$NON-NLS-1$	70	protected final String TEXT_53 = ") {" + NL + " // TODO Auto-generated method stub"; //$NON-NLS-1$ //$NON-NLS-2$
71	protected final String TEXT_54 = ";"; //$NON-NLS-1$	71	protected final String TEXT_54 = NL + "\t\t\treturn "; //$NON-NLS-1$
72	protected final String TEXT_55 = NL + " }"; //$NON-NLS-1$	72	protected final String TEXT_55 = ";"; //$NON-NLS-1$
73	protected final String TEXT_56 = NL + NL + "}"; //$NON-NLS-1$	73	protected final String TEXT_56 = NL + " }"; //$NON-NLS-1$
74	protected final String TEXT_57 = NL;	74	protected final String TEXT_57 = NL + NL + "}"; //$NON-NLS-1$
		75	protected final String TEXT_58 = NL;
75		76
76	public String generate(Object argument)	77	public String generate(Object argument)
77	{	78	{
Lines 188-235 Link Here
188		189
189	}	190	}
190		191
191	if (model.isLocalHomeChecked()) {	192	if (model.isNoInterfaceChecked()) {
192		193
193	stringBuffer.append(TEXT_25);	194	stringBuffer.append(TEXT_25);
194	stringBuffer.append(model.getLocalHomeClassSimpleName());	195
		196	}
		197
		198	if (model.isLocalHomeChecked()) {
		199
195	stringBuffer.append(TEXT_26);	200	stringBuffer.append(TEXT_26);
		201	stringBuffer.append(model.getLocalHomeClassSimpleName());
		202	stringBuffer.append(TEXT_27);
196		203
197	}	204	}
198		205
199	if (model.isRemoteHomeChecked()) {	206	if (model.isRemoteHomeChecked()) {
200		207
201	stringBuffer.append(TEXT_27);
202	stringBuffer.append(model.getRemoteHomeClassSimpleName());
203	stringBuffer.append(TEXT_28);	208	stringBuffer.append(TEXT_28);
		209	stringBuffer.append(model.getRemoteHomeClassSimpleName());
		210	stringBuffer.append(TEXT_29);
204		211
205	}	212	}
206		213
207		214
208	if (model.isPublic()) {	215	if (model.isPublic()) {
209		216
210	stringBuffer.append(TEXT_29);	217	stringBuffer.append(TEXT_30);
211		218
212	}	219	}
213		220
214	if (model.isAbstract()) {	221	if (model.isAbstract()) {
215		222
216	stringBuffer.append(TEXT_30);	223	stringBuffer.append(TEXT_31);
217		224
218	}	225	}
219		226
220	if (model.isFinal()) {	227	if (model.isFinal()) {
221		228
222	stringBuffer.append(TEXT_31);	229	stringBuffer.append(TEXT_32);
223		230
224	}	231	}
225		232
226	stringBuffer.append(TEXT_32);	233	stringBuffer.append(TEXT_33);
227	stringBuffer.append( model.getClassName() );	234	stringBuffer.append( model.getClassName() );
228		235
229	String superClass = model.getSuperclassName();	236	String superClass = model.getSuperclassName();
230	if (superClass != null && superClass.length() > 0) {	237	if (superClass != null && superClass.length() > 0) {
231		238
232	stringBuffer.append(TEXT_33);	239	stringBuffer.append(TEXT_34);
233	stringBuffer.append( superClass );	240	stringBuffer.append( superClass );
234		241
235	}	242	}
Lines 237-243 Link Here
237	List<String> interfaces = model.getInterfaces();	244	List<String> interfaces = model.getInterfaces();
238	if ( interfaces.size() > 0) {	245	if ( interfaces.size() > 0) {
239		246
240	stringBuffer.append(TEXT_34);	247	stringBuffer.append(TEXT_35);
241		248
242	}	249	}
243		250
Lines 245-251 Link Here
245	String INTERFACE = interfaces.get(i);	252	String INTERFACE = interfaces.get(i);
246	if (i > 0) {	253	if (i > 0) {
247		254
248	stringBuffer.append(TEXT_35);	255	stringBuffer.append(TEXT_36);
249		256
250	}	257	}
251		258
Lines 253-265 Link Here
253		260
254	}	261	}
255		262
256	stringBuffer.append(TEXT_36);	263	stringBuffer.append(TEXT_37);
257		264
258	if (!model.hasEmptySuperclassConstructor()) {	265	if (!model.hasEmptySuperclassConstructor()) {
259		266
260	stringBuffer.append(TEXT_37);
261	stringBuffer.append( model.getClassName() );
262	stringBuffer.append(TEXT_38);	267	stringBuffer.append(TEXT_38);
		268	stringBuffer.append( model.getClassName() );
		269	stringBuffer.append(TEXT_39);
263		270
264	}	271	}
265		272
Lines 268-286 Link Here
268	for (Constructor constructor : constructors) {	275	for (Constructor constructor : constructors) {
269	if (constructor.isPublic() \|\| constructor.isProtected()) {	276	if (constructor.isPublic() \|\| constructor.isProtected()) {
270		277
271	stringBuffer.append(TEXT_39);
272	stringBuffer.append( model.getSuperclassName() );
273	stringBuffer.append(TEXT_40);	278	stringBuffer.append(TEXT_40);
274	stringBuffer.append( model.getSuperclassName() );	279	stringBuffer.append( model.getSuperclassName() );
275	stringBuffer.append(TEXT_41);	280	stringBuffer.append(TEXT_41);
276	stringBuffer.append( constructor.getParamsForJavadoc() );	281	stringBuffer.append( model.getSuperclassName() );
277	stringBuffer.append(TEXT_42);	282	stringBuffer.append(TEXT_42);
278	stringBuffer.append( model.getClassName() );	283	stringBuffer.append( constructor.getParamsForJavadoc() );
279	stringBuffer.append(TEXT_43);	284	stringBuffer.append(TEXT_43);
280	stringBuffer.append( constructor.getParamsForDeclaration() );	285	stringBuffer.append( model.getClassName() );
281	stringBuffer.append(TEXT_44);	286	stringBuffer.append(TEXT_44);
282	stringBuffer.append( constructor.getParamsForCall() );	287	stringBuffer.append( constructor.getParamsForDeclaration() );
283	stringBuffer.append(TEXT_45);	288	stringBuffer.append(TEXT_45);
		289	stringBuffer.append( constructor.getParamsForCall() );
		290	stringBuffer.append(TEXT_46);
284		291
285	}	292	}
286	}	293	}
Lines 290-325 Link Here
290	if (model.shouldImplementAbstractMethods()) {	297	if (model.shouldImplementAbstractMethods()) {
291	for (Method method : model.getUnimplementedMethods()) {	298	for (Method method : model.getUnimplementedMethods()) {
292		299
293	stringBuffer.append(TEXT_46);
294	stringBuffer.append( method.getContainingJavaClass() );
295	stringBuffer.append(TEXT_47);	300	stringBuffer.append(TEXT_47);
296	stringBuffer.append( method.getName() );	301	stringBuffer.append( method.getContainingJavaClass() );
297	stringBuffer.append(TEXT_48);	302	stringBuffer.append(TEXT_48);
298	stringBuffer.append( method.getParamsForJavadoc() );	303	stringBuffer.append( method.getName() );
299	stringBuffer.append(TEXT_49);	304	stringBuffer.append(TEXT_49);
300	stringBuffer.append( method.getReturnType() );	305	stringBuffer.append( method.getParamsForJavadoc() );
301	stringBuffer.append(TEXT_50);	306	stringBuffer.append(TEXT_50);
302	stringBuffer.append( method.getName() );	307	stringBuffer.append( method.getReturnType() );
303	stringBuffer.append(TEXT_51);	308	stringBuffer.append(TEXT_51);
304	stringBuffer.append( method.getParamsForDeclaration() );	309	stringBuffer.append( method.getName() );
305	stringBuffer.append(TEXT_52);	310	stringBuffer.append(TEXT_52);
		311	stringBuffer.append( method.getParamsForDeclaration() );
		312	stringBuffer.append(TEXT_53);
306		313
307	String defaultReturnValue = method.getDefaultReturnValue();	314	String defaultReturnValue = method.getDefaultReturnValue();
308	if (defaultReturnValue != null) {	315	if (defaultReturnValue != null) {
309		316
310	stringBuffer.append(TEXT_53);
311	stringBuffer.append( defaultReturnValue );
312	stringBuffer.append(TEXT_54);	317	stringBuffer.append(TEXT_54);
		318	stringBuffer.append( defaultReturnValue );
		319	stringBuffer.append(TEXT_55);
313		320
314	}	321	}
315		322
316	stringBuffer.append(TEXT_55);	323	stringBuffer.append(TEXT_56);
317		324
318	}	325	}
319	}	326	}
320		327
321	stringBuffer.append(TEXT_56);
322	stringBuffer.append(TEXT_57);	328	stringBuffer.append(TEXT_57);
		329	stringBuffer.append(TEXT_58);
323	return stringBuffer.toString();	330	return stringBuffer.toString();
324	}	331	}
325	}	332	}

Lines 12-17 Link Here

(-)ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewSessionBeanClassWizardPage.java (-6 / +11 lines)
12		12
13	import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL;	13	import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL;
14	import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL_BUSINESS_INTERFACE;	14	import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.LOCAL_BUSINESS_INTERFACE;
		15	import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.NO_INTERFACE;
15	import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE;	16	import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE;
16	import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE_BUSINESS_INTERFACE;	17	import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.REMOTE_BUSINESS_INTERFACE;
17	import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.STATE_TYPE;	18	import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.STATE_TYPE;
Lines 38-43 Link Here
38	private Combo stateTypeCombo;	39	private Combo stateTypeCombo;
39	private Button remoteCheckbox;	40	private Button remoteCheckbox;
40	private Button localCheckbox;	41	private Button localCheckbox;
		42	private Button noInterfaceCheckbox;
41	private Text remoteInterfaceName;	43	private Text remoteInterfaceName;
42	private Text localInterfaceName;	44	private Text localInterfaceName;
43		45
Lines 79-90 Link Here
79	remoteCheckbox = new Button(group, SWT.CHECK);	81	remoteCheckbox = new Button(group, SWT.CHECK);
80	remoteCheckbox.setLayoutData(gdhspan(1));	82	remoteCheckbox.setLayoutData(gdhspan(1));
81	remoteCheckbox.setText(IEjbWizardConstants.REMOTE_BUSINESS_INTERFACE);	83	remoteCheckbox.setText(IEjbWizardConstants.REMOTE_BUSINESS_INTERFACE);
82	GridData data2 = new GridData(GridData.FILL_HORIZONTAL);
83	data2.horizontalSpan = 1;
84	remoteInterfaceName = new Text(group, SWT.SINGLE \| SWT.BORDER);
85	synchHelper.synchCheckbox(remoteCheckbox, REMOTE, null);	84	synchHelper.synchCheckbox(remoteCheckbox, REMOTE, null);
86		85	remoteInterfaceName = new Text(group, SWT.SINGLE \| SWT.BORDER);
87	remoteInterfaceName.setLayoutData(data2);	86	remoteInterfaceName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
88	synchHelper.synchText(remoteInterfaceName, REMOTE_BUSINESS_INTERFACE, null);	87	synchHelper.synchText(remoteInterfaceName, REMOTE_BUSINESS_INTERFACE, null);
89		88
90	localCheckbox = new Button(group, SWT.CHECK);	89	localCheckbox = new Button(group, SWT.CHECK);
Lines 92-99 Link Here
92	localCheckbox.setText(IEjbWizardConstants.LOCAL_BUSINESS_INTERFACE);	91	localCheckbox.setText(IEjbWizardConstants.LOCAL_BUSINESS_INTERFACE);
93	synchHelper.synchCheckbox(localCheckbox, LOCAL, null);	92	synchHelper.synchCheckbox(localCheckbox, LOCAL, null);
94	localInterfaceName = new Text(group, SWT.SINGLE \| SWT.BORDER);	93	localInterfaceName = new Text(group, SWT.SINGLE \| SWT.BORDER);
95	localInterfaceName.setLayoutData(data2);	94	localInterfaceName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
96	synchHelper.synchText(localInterfaceName, LOCAL_BUSINESS_INTERFACE, null);	95	synchHelper.synchText(localInterfaceName, LOCAL_BUSINESS_INTERFACE, null);
		96
		97	noInterfaceCheckbox = new Button(group, SWT.CHECK);
		98	noInterfaceCheckbox.setLayoutData(gdhspan(2));
		99	noInterfaceCheckbox.setText(IEjbWizardConstants.NO_INTERFACE);
		100	synchHelper.synchCheckbox(noInterfaceCheckbox, NO_INTERFACE, null);
97	}	101	}
98		102
99	private static GridData gdhspan(int span) {	103	private static GridData gdhspan(int span) {
Lines 111-116 Link Here
111	names.add(INTERFACES);	115	names.add(INTERFACES);
112	names.add(LOCAL_BUSINESS_INTERFACE);	116	names.add(LOCAL_BUSINESS_INTERFACE);
113	names.add(REMOTE_BUSINESS_INTERFACE);	117	names.add(REMOTE_BUSINESS_INTERFACE);
		118	names.add(NO_INTERFACE);
114		119
115	return names.toArray(new String[0]);	120	return names.toArray(new String[0]);
116	}	121	}

Lines 29-40 Link Here

(-)ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewSessionBeanClassDataModelProperties.java (-2 / +12 lines)
29	* business interface. The default is false.	29	* business interface. The default is false.
30	*/	30	*/
31	public static final String REMOTE = "INewSessionBeanClassDataModelProperties.REMOTE"; //$NON-NLS-1$	31	public static final String REMOTE = "INewSessionBeanClassDataModelProperties.REMOTE"; //$NON-NLS-1$
32		32
33	/**	33	/**
34	* Optional, boolean property used to specify whether to generate a local	34	* Optional, boolean property used to specify whether to generate a local
35	* business interface. The default is true.	35	* business interface. The default is true for EJB 3.0 projects, otherwise -
		36	* false.
36	*/	37	*/
37	public static final String LOCAL = "INewSessionBeanClassDataModelProperties.LOCAL"; //$NON-NLS-1$	38	public static final String LOCAL = "INewSessionBeanClassDataModelProperties.LOCAL"; //$NON-NLS-1$
		39
		40	/**
		41	* Optional, boolean property used to specify whether to generate a
		42	* no-interface client view. The default is true for EJB 3.1 projects and
		43	* later, otherwise - false.
		44	*
		45	* @since 3.2
		46	*/
		47	public static final String NO_INTERFACE = "INewSessionBeanClassDataModelProperties.NO_INTERFACE"; //$NON-NLS-1$
38		48
39	/**	49	/**
40	* Optional, boolean property used to specify whether to generate a EJB 2.x	50	* Optional, boolean property used to specify whether to generate a EJB 2.x