summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulio Cesar Chavez2014-04-02 12:07:19 (EDT)
committerRoberto Sanchez2014-04-02 12:07:19 (EDT)
commitfab6d1ac17df0fa451da0e1f699b8d779f53a65d (patch)
tree9c6a5ae0aeee3b5ddcca99a7f0989adaa27586d4
parentc44828ddccf0f801a41f71123f5d4bd6bf8d1dcf (diff)
downloadwebtools.ejb-fab6d1ac17df0fa451da0e1f699b8d779f53a65d.zip
webtools.ejb-fab6d1ac17df0fa451da0e1f699b8d779f53a65d.tar.gz
webtools.ejb-fab6d1ac17df0fa451da0e1f699b8d779f53a65d.tar.bz2
[431674] EJB Timer wizard does not refresh when the Project changesv201404021630
[431668] Incorrect warning message in the EJB - Session Bean Creation Wizard is displayed
-rw-r--r--plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddEjbTimerDataModelProvider.java11
-rw-r--r--plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java2
2 files changed, 12 insertions, 1 deletions
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddEjbTimerDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddEjbTimerDataModelProvider.java
index 8693993..768f35d 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddEjbTimerDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddEjbTimerDataModelProvider.java
@@ -24,6 +24,7 @@ import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
import org.eclipse.jst.j2ee.internal.common.operations.NewJavaEEArtifactClassOperation;
import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
@@ -117,4 +118,14 @@ public class AddEjbTimerDataModelProvider extends
IStatus status = super.validate(propertyName);
return status;
}
+
+ @Override
+ public boolean propertySet(String propertyName, Object propertyValue) {
+ boolean result = super.propertySet(propertyName, propertyValue);
+
+ if (PROJECT_NAME.equals(propertyName)) {
+ getDataModel().notifyPropertyChange(NON_PERSISTENT, IDataModel.DEFAULT_CHG);
+ }
+ return result;
+ }
}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java
index 548d9af..a8d35e5 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java
@@ -405,7 +405,7 @@ public class NewSessionBeanClassDataModelProvider extends NewEnterpriseBeanClass
protected IStatus validateAsynchronous() {
IStatus retVal = Status.OK_STATUS;
if (getBooleanProperty(ASYNC)) {
- if (ejb3xOrLater(J2EEVersionConstants.VERSION_3_1)) {
+ if (ejb3xOrLater(J2EEVersionConstants.VERSION_3_1) && !ejb3xOrLater(J2EEVersionConstants.VERSION_3_2)) {
retVal = new Status(IStatus.WARNING, EjbPlugin.PLUGIN_ID, EJBCreationResourceHandler.WRN_EJB31_ASYNC_NOT_SUPPORTED);
}
}