Attachment #125764 for bug #256130

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

Lines 42-48 Link Here

(-)property_files/ejb_ui.properties (-2 / +3 lines)
42	GroupedEJBJarItemProvider_UI_2=Message	42	GroupedEJBJarItemProvider_UI_2=Message
43	NewEJBModuleAction_UI_0=EJB Project	43	NewEJBModuleAction_UI_0=EJB Project
44	pageTitle=EJB Module	44	pageTitle=EJB Module
45	pageDescription=Configure ejb module settings.	45	pageDescription=Configure EJB module settings.
46	configFolderLabel=Config Folder	46	configFolderLabel=Config Folder
47		47
48	NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC=Specify class file destination.	48	NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC=Specify class file destination.
Lines 88-91 Link Here
88	DESTINATION_NAME_LABEL=Destination name:	88	DESTINATION_NAME_LABEL=Destination name:
89	MESSAGE_LISTENER_INTERFACE_HYPERLINK=Message listener interface: {0}	89	MESSAGE_LISTENER_INTERFACE_HYPERLINK=Message listener interface: {0}
90	MESSAGE_LISTENER_INTERFACE_HYPERLINK_TOOLTIP=Set message listener interface	90	MESSAGE_LISTENER_INTERFACE_HYPERLINK_TOOLTIP=Set message listener interface
91	CLICK_TO_SELECT=<click to select>	91	CLICK_TO_SELECT=<click to select>
		92	EJB_CLIENT_JAR_GROUP=EJB Client JAR





import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
import org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties;
import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
import org.eclipse.swt.SWT;

import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;



public class EjbFacetInstallPage extends J2EEModuleFacetInstallPage 
	implements IEjbFacetInstallDataModelProperties {

    private static final String MODULE_NAME_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.NAME_LABEL);
    

		final Composite composite = new Composite(parent, SWT.NONE);
		composite.setLayout(new GridLayout(1, false));

		Composite ejbClientComposite = createEjbClientComposite(composite);
		createEJBClientGroup(ejbClientComposite);
		createProjectNameGroup(ejbClientComposite);
		createClientJarURISection(ejbClientComposite);
		
		new Label(composite, SWT.NONE); // pad
		createProjectNameGroup( composite );
		createClientJarURISection( composite );
		
        createGenerateDescriptorControl( composite );
        registerFacetVersionChangeListener();

        final IProjectFacetVersion fv = (IProjectFacetVersion) this.model.getProperty( FACET_VERSION );
        this.addDD.setVisible( fv == EJB_30 );
    }
    
    private Composite createEjbClientComposite(Composite parent) {
    	Group group = new Group(parent, SWT.NONE);
    	group.setLayout(new GridLayout(2, false));
    	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
    	group.setText(EJBUIMessages.EJB_CLIENT_JAR_GROUP);
    	return group;
    }

	private void createEJBClientGroup(Composite parent) {
		// Create Add Client checkbox
		new Label(parent, SWT.NONE);
		addClient = new Button(parent, SWT.CHECK);
		addClient.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.CREATE_EJB_CLIENT_JAR));
		synchHelper.synchCheckbox(addClient, CREATE_CLIENT, null);

        data = new GridData(GridData.FILL_HORIZONTAL);
        //data.widthHint = SIZING_TEXT_FIELD_WIDTH;
        clientNameText.setLayoutData(data);
        new Label(parent, SWT.NONE); // pad
        synchHelper.synchText(clientNameText, CLIENT_NAME, new Control[]{projectNameLabel});
        clientNameText.setFocus();
    }

        data = new GridData(GridData.FILL_HORIZONTAL);
        //data.widthHint = SIZING_TEXT_FIELD_WIDTH;
        clientJarURI.setLayoutData(data);
        new Label(parent, SWT.NONE); // pad
		synchHelper.synchText(clientJarURI, CLIENT_URI, new Control[]{clientJarURILabel});
    }    
}

Lines 104-109 Link Here

(-)ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java (+1 lines)
104	public static String LOCAL_HOME_INTERFACE_TOOLTIP;	104	public static String LOCAL_HOME_INTERFACE_TOOLTIP;
105	public static String REMOTE_COMPONENT_INTERFACE_TOOLTIP;	105	public static String REMOTE_COMPONENT_INTERFACE_TOOLTIP;
106	public static String REMOTE_HOME_INTERFACE_TOOLTIP;	106	public static String REMOTE_HOME_INTERFACE_TOOLTIP;
		107	public static String EJB_CLIENT_JAR_GROUP;
107		108
108		109
109	static {	110	static {

Lines 93-99 Link Here

(-)property_files/j2ee_ui.properties (-1 / +1 lines)
93	81=Information	93	81=Information
94	82=The chosen operation is not currently available.	94	82=The chosen operation is not currently available.
95		95
96	90=Create an EJB Client JAR module to hold the client interfaces and classes.	96	90=Create an EJB Client JAR module to hold the client interfaces and classes
97	91=Generate an annotated bean class	97	91=Generate an annotated bean class
98	92=Add support for annotated Java classes	98	92=Add support for annotated Java classes
99	93=B&rowse...	99	93=B&rowse...

Return to bug 256130

Lines 12-19 Link Here

(-)ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java (-10 / +16 lines)
12		12
13	import org.eclipse.jface.dialogs.Dialog;	13	import org.eclipse.jface.dialogs.Dialog;
14	import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;	14	import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
		15	import org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties;
15	import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;	16	import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
16	import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
17	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;	17	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
18	import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;	18	import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
19	import org.eclipse.swt.SWT;	19	import org.eclipse.swt.SWT;
Lines 22-27 Link Here
22	import org.eclipse.swt.widgets.Button;	22	import org.eclipse.swt.widgets.Button;
23	import org.eclipse.swt.widgets.Composite;	23	import org.eclipse.swt.widgets.Composite;
24	import org.eclipse.swt.widgets.Control;	24	import org.eclipse.swt.widgets.Control;
		25	import org.eclipse.swt.widgets.Group;
25	import org.eclipse.swt.widgets.Label;	26	import org.eclipse.swt.widgets.Label;
26	import org.eclipse.swt.widgets.Text;	27	import org.eclipse.swt.widgets.Text;
27	import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;	28	import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
Lines 29-35 Link Here
29		30
30		31
31	public class EjbFacetInstallPage extends J2EEModuleFacetInstallPage	32	public class EjbFacetInstallPage extends J2EEModuleFacetInstallPage
32	implements IEjbFacetInstallDataModelProperties{	33	implements IEjbFacetInstallDataModelProperties {
33		34
34	private static final String MODULE_NAME_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.NAME_LABEL);	35	private static final String MODULE_NAME_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.NAME_LABEL);
35		36
Lines 54-64 Link Here
54	final Composite composite = new Composite(parent, SWT.NONE);	55	final Composite composite = new Composite(parent, SWT.NONE);
55	composite.setLayout(new GridLayout(1, false));	56	composite.setLayout(new GridLayout(1, false));
56		57
57	//setupEarControl(composite);	58	Composite ejbClientComposite = createEjbClientComposite(composite);
		59	createEJBClientGroup(ejbClientComposite);
		60	createProjectNameGroup(ejbClientComposite);
		61	createClientJarURISection(ejbClientComposite);
58		62
59	createEJBClientGroup( composite );	63	new Label(composite, SWT.NONE); // pad
60	createProjectNameGroup( composite );
61	createClientJarURISection( composite );
62		64
63	createGenerateDescriptorControl( composite );	65	createGenerateDescriptorControl( composite );
64	registerFacetVersionChangeListener();	66	registerFacetVersionChangeListener();
Lines 73-82 Link Here
73	final IProjectFacetVersion fv = (IProjectFacetVersion) this.model.getProperty( FACET_VERSION );	75	final IProjectFacetVersion fv = (IProjectFacetVersion) this.model.getProperty( FACET_VERSION );
74	this.addDD.setVisible( fv == EJB_30 );	76	this.addDD.setVisible( fv == EJB_30 );
75	}	77	}
		78
		79	private Composite createEjbClientComposite(Composite parent) {
		80	Group group = new Group(parent, SWT.NONE);
		81	group.setLayout(new GridLayout(2, false));
		82	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		83	group.setText(EJBUIMessages.EJB_CLIENT_JAR_GROUP);
		84	return group;
		85	}
76		86
77	private void createEJBClientGroup(Composite parent) {	87	private void createEJBClientGroup(Composite parent) {
78	// Create Add Client checkbox
79	new Label(parent, SWT.NONE);
80	addClient = new Button(parent, SWT.CHECK);	88	addClient = new Button(parent, SWT.CHECK);
81	addClient.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.CREATE_EJB_CLIENT_JAR));	89	addClient.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.CREATE_EJB_CLIENT_JAR));
82	synchHelper.synchCheckbox(addClient, CREATE_CLIENT, null);	90	synchHelper.synchCheckbox(addClient, CREATE_CLIENT, null);
Lines 97-103 Link Here
97	data = new GridData(GridData.FILL_HORIZONTAL);	105	data = new GridData(GridData.FILL_HORIZONTAL);
98	//data.widthHint = SIZING_TEXT_FIELD_WIDTH;	106	//data.widthHint = SIZING_TEXT_FIELD_WIDTH;
99	clientNameText.setLayoutData(data);	107	clientNameText.setLayoutData(data);
100	new Label(parent, SWT.NONE); // pad
101	synchHelper.synchText(clientNameText, CLIENT_NAME, new Control[]{projectNameLabel});	108	synchHelper.synchText(clientNameText, CLIENT_NAME, new Control[]{projectNameLabel});
102	clientNameText.setFocus();	109	clientNameText.setFocus();
103	}	110	}
Lines 113-119 Link Here
113	data = new GridData(GridData.FILL_HORIZONTAL);	120	data = new GridData(GridData.FILL_HORIZONTAL);
114	//data.widthHint = SIZING_TEXT_FIELD_WIDTH;	121	//data.widthHint = SIZING_TEXT_FIELD_WIDTH;
115	clientJarURI.setLayoutData(data);	122	clientJarURI.setLayoutData(data);
116	new Label(parent, SWT.NONE); // pad
117	synchHelper.synchText(clientJarURI, CLIENT_URI, new Control[]{clientJarURILabel});	123	synchHelper.synchText(clientJarURI, CLIENT_URI, new Control[]{clientJarURILabel});
118	}	124	}
119	}	125	}