Attachment 125764 Details for Bug 256130 – patch

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

[patch] patch

256130_patch.txt (text/plain), 6.57 KB, created by Kaloyan Raev

on 2009-02-16 05:03:18 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kaloyan Raev

Created: 2009-02-16 05:03:18 EST

Size: 6.57 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ejb.ui
>Index: property_files/ejb_ui.properties
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.ejb.ui/property_files/ejb_ui.properties,v
>retrieving revision 1.19
>diff -u -r1.19 ejb_ui.properties
>--- property_files/ejb_ui.properties	14 Jan 2009 13:16:23 -0000	1.19
>+++ property_files/ejb_ui.properties	16 Feb 2009 10:05:04 -0000
>@@ -42,7 +42,7 @@
> GroupedEJBJarItemProvider_UI_2=Message
> NewEJBModuleAction_UI_0=EJB Project
> pageTitle=EJB Module
>-pageDescription=Configure ejb module settings.
>+pageDescription=Configure EJB module settings.
> configFolderLabel=Config Folder
> 
> NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC=Specify class file destination.
>@@ -88,4 +88,5 @@
> DESTINATION_NAME_LABEL=Destination name:
> MESSAGE_LISTENER_INTERFACE_HYPERLINK=Message listener interface: {0}
> MESSAGE_LISTENER_INTERFACE_HYPERLINK_TOOLTIP=Set message listener interface
>-CLICK_TO_SELECT=<click to select>
>\ No newline at end of file
>+CLICK_TO_SELECT=<click to select>
>+EJB_CLIENT_JAR_GROUP=EJB Client JAR
>\ No newline at end of file
>Index: ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java,v
>retrieving revision 1.12
>diff -u -r1.12 EjbFacetInstallPage.java
>--- ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java	2 Feb 2009 20:14:39 -0000	1.12
>+++ ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java	16 Feb 2009 10:05:04 -0000
>@@ -12,8 +12,8 @@
> 
> 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;
>@@ -22,6 +22,7 @@
> 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;
>@@ -29,7 +30,7 @@
> 
> 
> public class EjbFacetInstallPage extends J2EEModuleFacetInstallPage 
>-	implements IEjbFacetInstallDataModelProperties{
>+	implements IEjbFacetInstallDataModelProperties {
> 
>     private static final String MODULE_NAME_UI = J2EEUIMessages.getResourceString(J2EEUIMessages.NAME_LABEL);
>     
>@@ -54,11 +55,12 @@
> 		final Composite composite = new Composite(parent, SWT.NONE);
> 		composite.setLayout(new GridLayout(1, false));
> 
>-		//setupEarControl(composite);
>+		Composite ejbClientComposite = createEjbClientComposite(composite);
>+		createEJBClientGroup(ejbClientComposite);
>+		createProjectNameGroup(ejbClientComposite);
>+		createClientJarURISection(ejbClientComposite);
> 		
>-		createEJBClientGroup( composite );
>-		createProjectNameGroup( composite );
>-		createClientJarURISection( composite );
>+		new Label(composite, SWT.NONE); // pad
> 		
>         createGenerateDescriptorControl( composite );
>         registerFacetVersionChangeListener();
>@@ -73,10 +75,16 @@
>         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);
>@@ -97,7 +105,6 @@
>         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();
>     }
>@@ -113,7 +120,6 @@
>         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});
>     }    
> }
>Index: ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java,v
>retrieving revision 1.14
>diff -u -r1.14 EJBUIMessages.java
>--- ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java	30 Jun 2008 14:31:42 -0000	1.14
>+++ ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java	16 Feb 2009 10:05:04 -0000
>@@ -104,6 +104,7 @@
> 	public static String LOCAL_HOME_INTERFACE_TOOLTIP;
> 	public static String REMOTE_COMPONENT_INTERFACE_TOOLTIP;
> 	public static String REMOTE_HOME_INTERFACE_TOOLTIP;
>+	public static String EJB_CLIENT_JAR_GROUP;
> 	
> 
> 	static {
>#P org.eclipse.jst.j2ee.ui
>Index: property_files/j2ee_ui.properties
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties,v
>retrieving revision 1.53
>diff -u -r1.53 j2ee_ui.properties
>--- property_files/j2ee_ui.properties	21 Jan 2009 09:46:55 -0000	1.53
>+++ property_files/j2ee_ui.properties	16 Feb 2009 10:05:08 -0000
>@@ -93,7 +93,7 @@
> 81=Information
> 82=The chosen operation is not currently available.
> 
>-90=Create an EJB Client JAR module to hold the client interfaces and classes.
>+90=Create an EJB Client JAR module to hold the client interfaces and classes
> 91=Generate an annotated bean class
> 92=Add support for annotated Java classes
> 93=B&rowse...

Actions: View | Diff

Attachments on bug 256130: 125764