Attachment 96227 Details for Bug 220156 – patch

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

[patch] patch

220156_patch.txt (text/plain), 4.37 KB, created by Kaloyan Raev

on 2008-04-16 05:56:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kaloyan Raev

Created: 2008-04-16 05:56:35 EDT

Size: 4.37 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee.ejb
>Index: ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java,v
>retrieving revision 1.26
>diff -u -r1.26 EjbFacetInstallDataModelProvider.java
>--- ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java	17 Jan 2008 03:25:54 -0000	1.26
>+++ ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java	16 Apr 2008 09:55:35 -0000
>@@ -69,9 +69,12 @@
> 			String projectName = model.getStringProperty(FACET_PROJECT_NAME).replace(' ', '_');
> 			return projectName + IJ2EEModuleConstants.JAR_EXT; 
> 		} else if (propertyName.equals(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)) {
>+			if (getBooleanProperty(CREATE_CLIENT)) {
>+				return Boolean.TRUE;
>+			}
> 			IProjectFacetVersion facetVersion = (IProjectFacetVersion)getProperty(FACET_VERSION);
>-			if(facetVersion == EJB_30){
>-				return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EJB_GENERATE_DD));
>+			if (facetVersion == EJB_30) {
>+				return J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EJB_GENERATE_DD);
> 			}
> 			return Boolean.TRUE;
> 		}
>@@ -88,12 +91,14 @@
> 	}
> 		
> 	public boolean isPropertyEnabled(String propertyName) {
>-		if ( CLIENT_NAME.equals(propertyName )) {
>+		if (CLIENT_NAME.equals(propertyName)) {
> 			return getBooleanProperty(CREATE_CLIENT);
>-		}else if( CLIENT_URI.equals(propertyName )){
>+		} else if (CLIENT_URI.equals(propertyName)) {
> 			return getBooleanProperty(CREATE_CLIENT);
>-		}else if(CREATE_CLIENT.equals(propertyName)){
>+		} else if (CREATE_CLIENT.equals(propertyName)) {
> 			return getBooleanProperty(ADD_TO_EAR);
>+		} else if (GENERATE_DD.equals(propertyName)) {
>+			return !getBooleanProperty(CREATE_CLIENT);
> 		}
> 		return super.isPropertyEnabled(propertyName);
> 	}
>@@ -102,23 +107,34 @@
> 	public boolean propertySet(String propertyName, Object propertyValue) {
> 		boolean status = super.propertySet(propertyName, propertyValue);
> 		
>-		if (propertyName.equals(CREATE_CLIENT)){
>+		if (propertyName.equals(CREATE_CLIENT)) {
> 	    	model.notifyPropertyChange(CLIENT_NAME, IDataModel.ENABLE_CHG);
> 	    	model.notifyPropertyChange(CLIENT_URI, IDataModel.ENABLE_CHG);
>-	    }else if (propertyName.equals(FACET_PROJECT_NAME)){
>-	    	model.setStringProperty(CLIENT_NAME, (String)model.getDefaultProperty(CLIENT_NAME));
>-	    	model.setStringProperty(CLIENT_URI, (String)model.getDefaultProperty(CLIENT_URI));
>-	    }else if(propertyName.equals(ADD_TO_EAR)){
>-	    	boolean addToEar = ((Boolean)propertyValue).booleanValue();
>-	    	if(!addToEar && isPropertySet(CREATE_CLIENT)){
>+	    	model.notifyPropertyChange(GENERATE_DD, IDataModel.ENABLE_CHG);
>+	    	if ((Boolean) propertyValue && isPropertySet(GENERATE_DD)) {
>+    			model.setBooleanProperty(GENERATE_DD, true);
>+    		} else {
>+    	    	model.notifyPropertyChange(GENERATE_DD, IDataModel.DEFAULT_CHG);
>+    		}
>+	    } else if (propertyName.equals(FACET_PROJECT_NAME)) {
>+	    	model.setStringProperty(CLIENT_NAME, (String) model.getDefaultProperty(CLIENT_NAME));
>+	    	model.setStringProperty(CLIENT_URI, (String) model.getDefaultProperty(CLIENT_URI));
>+	    } else if (propertyName.equals(ADD_TO_EAR)) {
>+	    	boolean addToEar = (Boolean) propertyValue;
>+	    	if (!addToEar && isPropertySet(CREATE_CLIENT)) {
> 	    		model.setBooleanProperty(CREATE_CLIENT, false);
> 	    	} else {
> 	    		model.notifyPropertyChange(CREATE_CLIENT, IDataModel.DEFAULT_CHG);
> 		    	model.notifyPropertyChange(CLIENT_NAME, IDataModel.ENABLE_CHG);
> 		    	model.notifyPropertyChange(CLIENT_URI, IDataModel.ENABLE_CHG);
>+		    	model.notifyPropertyChange(GENERATE_DD, IDataModel.ENABLE_CHG);
>+		    	if ((Boolean) getProperty(CREATE_CLIENT) && isPropertySet(GENERATE_DD)) {
>+	    			model.setBooleanProperty(GENERATE_DD, true);
>+	    		} else {
>+	    	    	model.notifyPropertyChange(GENERATE_DD, IDataModel.DEFAULT_CHG);
>+	    		}
> 	    	}
> 	    	model.notifyPropertyChange(CREATE_CLIENT, IDataModel.ENABLE_CHG);
>-
> 	    }
> 
> 		return status;

Actions: View | Diff

Attachments on bug 220156: 96227