[329393] [UI] Mechanism for displaying error/warning messages in the Deployment Assembly page needs to improve

2 files changed, 11 insertions, 3 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDependenciesPropertyPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDependenciesPropertyPage.java
index 80b20d561..b25a6cf27 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDependenciesPropertyPage.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDependenciesPropertyPage.java
@@ -300,12 +300,16 @@ public class J2EEModuleDependenciesPropertyPage extends
 	
 	@Override
 	protected void verify() {
+		propPage.refreshProblemsView();
+	}
+
+	@Override
+	public IStatus validate() {
 		ArrayList<ComponentResourceProxy> allMappings = new ArrayList<ComponentResourceProxy>();
 		allMappings.addAll(resourceMappings);
 		allMappings.addAll(hiddenMappings);
 		
-		IStatus status = J2EEModuleDeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged, currentClasspathEntries);
-		setErrorMessage(status);
+		return J2EEModuleDeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged, currentClasspathEntries);
 	}
 
 //	
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierHelper.java
index 2e078db64..c8b14682d 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierHelper.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierHelper.java
@@ -58,7 +58,11 @@ public class J2EEModuleDeploymentAssemblyVerifierHelper {
 				verifier = (IDeploymentAssemblyVerifier) ((IConfigurationElement) verifiers.get(i)).createExecutableExtension(VerifierRegistryReader.VERIFIER_CLASS);
 				J2EEModuleDeploymentAssemblyVerifierData data = new J2EEModuleDeploymentAssemblyVerifierData(component, runtime,currentReferences,resourceMappings,resourceMappingsChanged,currentClasspathEntries );
 				IStatus verifyStatus = verifier.verify(data);
-				masterStatus.add(verifyStatus);
+				if(verifyStatus != null && verifyStatus.isMultiStatus()) {
+					masterStatus.addAll(verifyStatus);
+				} else {
+					masterStatus.add(verifyStatus);
+				}
 			} catch (Exception e) {
 				ModuleCoreUIPlugin.log(e);
 				continue;