[104393] fix for artifact edit to verify component type: committed for JL

plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java

diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java
index 1b5d1a8..8afe6a5 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java
@@ -195,8 +195,9 @@
 	public static ConnectorArtifactEdit getConnectorArtifactEditForRead(ComponentHandle aHandle) {
 		ConnectorArtifactEdit artifactEdit = null;
 		try {
-			artifactEdit = new ConnectorArtifactEdit(aHandle, true);
-		} catch (IllegalArgumentException iae) {
+			if (isValidConnectorModule(aHandle.createComponent()))
+				artifactEdit = new ConnectorArtifactEdit(aHandle, true);
+		} catch (Exception e) {
 			artifactEdit = null;
 		}
 		return artifactEdit;
@@ -226,8 +227,9 @@
 	public static ConnectorArtifactEdit getConnectorArtifactEditForWrite(ComponentHandle aHandle) {
 		ConnectorArtifactEdit artifactEdit = null;
 		try {
-			artifactEdit = new ConnectorArtifactEdit(aHandle, false);
-		} catch (IllegalArgumentException iae) {
+			if (isValidConnectorModule(aHandle.createComponent()))
+				artifactEdit = new ConnectorArtifactEdit(aHandle, false);
+		} catch (Exception e) {
 			artifactEdit = null;
 		}
 		return artifactEdit;

plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java

diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java
index b92ca25..69d1e76 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java
@@ -69,9 +69,9 @@
 	 * </p>
 	 */
 	public static final Class ADAPTER_TYPE = WebArtifactEdit.class;
-	public static final String WEB_CONTENT = "WebContent";
-	public static final String WEB_INF = "WEB-INF";
-	public static final String META_INF = "META-INF";
+	public static final String WEB_CONTENT = "WebContent"; //$NON-NLS-1$
+	public static final String WEB_INF = "WEB-INF"; //$NON-NLS-1$
+	public static final String META_INF = "META-INF"; //$NON-NLS-1$
 	
 	/**
 	 * <p>
@@ -126,8 +126,9 @@
 	public static WebArtifactEdit getWebArtifactEditForRead(ComponentHandle aHandle) {
 		WebArtifactEdit artifactEdit = null;
 		try {
-			artifactEdit = new WebArtifactEdit(aHandle, true);
-		} catch (IllegalArgumentException iae) {
+			if (isValidWebModule(aHandle.createComponent()))
+				artifactEdit = new WebArtifactEdit(aHandle, true);
+		} catch (Exception e) {
 			artifactEdit = null;
 		}
 		return artifactEdit;
@@ -155,8 +156,9 @@
 	public static WebArtifactEdit getWebArtifactEditForWrite(ComponentHandle aHandle) {
 		WebArtifactEdit artifactEdit = null;
 		try {
-			artifactEdit = new WebArtifactEdit(aHandle, false);
-		} catch (IllegalArgumentException iae) {
+			if (isValidWebModule(aHandle.createComponent()))
+				artifactEdit = new WebArtifactEdit(aHandle, false);
+		} catch (Exception e) {
 			artifactEdit = null;
 		}
 		return artifactEdit;
@@ -509,7 +511,7 @@
 		
 		StructureEdit moduleCore = null;
 		WorkbenchComponent wbComponent = null;
-		ComponentHandle handle = getComponentHandle();;
+		ComponentHandle handle = getComponentHandle();
 		try {
 			moduleCore = StructureEdit.getStructureEditForRead(handle.getProject());
 			wbComponent = moduleCore.findComponentByName(handle.getName());
@@ -542,7 +544,7 @@
 	public void setServerContextRoot(String contextRoot) {
 		StructureEdit moduleCore = null;
 		WorkbenchComponent wbComponent = null;
-		ComponentHandle handle = getComponentHandle();;
+		ComponentHandle handle = getComponentHandle();
 		try {
 			moduleCore = StructureEdit.getStructureEditForWrite(handle.getProject());
 			wbComponent = moduleCore.findComponentByName(handle.getName());

plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java

diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
index f72df8b..db24f9d 100644
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
+++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
@@ -206,8 +206,9 @@
 	public static AppClientArtifactEdit getAppClientArtifactEditForRead(ComponentHandle aHandle) {
 		AppClientArtifactEdit artifactEdit = null;
 		try {
-			artifactEdit = new AppClientArtifactEdit(aHandle, true);
-		} catch (IllegalArgumentException iae) {
+			if (isValidApplicationClientModule(aHandle.createComponent())) 
+				artifactEdit = new AppClientArtifactEdit(aHandle, true);
+		} catch (Exception e) {
 			artifactEdit = null;
 		}
 		return artifactEdit;
@@ -235,8 +236,9 @@
 	public static AppClientArtifactEdit getAppClientArtifactEditForWrite(ComponentHandle aHandle) {
 		AppClientArtifactEdit artifactEdit = null;
 		try {
-			artifactEdit = new AppClientArtifactEdit(aHandle, false);
-		} catch (IllegalArgumentException iae) {
+			if (isValidApplicationClientModule(aHandle.createComponent()))
+				artifactEdit = new AppClientArtifactEdit(aHandle, false);
+		} catch (Exception e) {
 			artifactEdit = null;
 		}
 		return artifactEdit;

plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java

diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
index bb227a7..b0c86fd 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
@@ -104,8 +104,9 @@
 	public static EARArtifactEdit getEARArtifactEditForRead(ComponentHandle aHandle) {
 		EARArtifactEdit artifactEdit = null;
 		try {
-			artifactEdit = new EARArtifactEdit(aHandle, true);
-		} catch (IllegalArgumentException iae) {
+			if (isValidEARModule(aHandle.createComponent()))
+				artifactEdit = new EARArtifactEdit(aHandle, true);
+		} catch (Exception iae) {
 			artifactEdit = null;
 		}
 		return artifactEdit;
@@ -134,8 +135,9 @@
 	public static EARArtifactEdit getEARArtifactEditForWrite(ComponentHandle aHandle) {
 		EARArtifactEdit artifactEdit = null;
 		try {
-			artifactEdit = new EARArtifactEdit(aHandle, false);
-		} catch (IllegalArgumentException iae) {
+			if (isValidEARModule(aHandle.createComponent()))
+				artifactEdit = new EARArtifactEdit(aHandle, false);
+		} catch (Exception iae) {
 			artifactEdit = null;
 		}
 		return artifactEdit;