Attachment 58851 Details for Bug 167374 – 167374 patch and error during build problem fixed

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

[patch] 167374 patch and error during build problem fixed

patch_167374_and_error_during_dd_build.txt (text/plain), 8.10 KB, created by Hariharan L Narayanan

on 2007-02-13 08:36:03 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Hariharan L Narayanan

Created: 2007-02-13 08:36:03 EST

Size: 8.10 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.wsdm.editor
>Index: src/org/eclipse/tptp/wsdm/tooling/validation/dde/internal/DdeValidator.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/validation/dde/internal/DdeValidator.java,v
>retrieving revision 1.1
>diff -u -r1.1 DdeValidator.java
>--- src/org/eclipse/tptp/wsdm/tooling/validation/dde/internal/DdeValidator.java	8 Feb 2007 19:40:14 -0000	1.1
>+++ src/org/eclipse/tptp/wsdm/tooling/validation/dde/internal/DdeValidator.java	13 Feb 2007 10:29:31 -0000
>@@ -23,7 +23,9 @@
> import org.apache.ws.muse.descriptor.ResourceTypeType;
> import org.apache.ws.muse.descriptor.RootType;
> import org.apache.ws.muse.descriptor.RouterType;
>+import org.eclipse.core.resources.IResource;
> import org.eclipse.osgi.util.NLS;
>+import org.eclipse.tptp.wsdm.tooling.editor.dde.util.internal.DdeUtil;
> import org.eclipse.tptp.wsdm.tooling.nls.messages.dde.internal.Messages;
> import org.eclipse.tptp.wsdm.tooling.validation.builders.internal.WsdmCollectErrors;
> import org.eclipse.tptp.wsdm.tooling.validation.provisional.EmptyValidationReport;
>@@ -101,6 +103,21 @@
> 		for (int i = 0; i < rtt.length; i++)
> 		{
> 			ResourceTypeType rt = rtt[i];
>+			String fileName = DdeUtil.getMrtFileName(rt.getWsdl().getWsdlFile());
>+			IResource selectedFile = DdeUtil.getIFileFromName(fileName,
>+					"mrt");
>+			if(selectedFile == null)
>+			{
>+				String msg = Messages.LU_ERROR_MSG1_PART1 + fileName + Messages.LU_ERROR_MSG1_PART2;
>+				IValidationMessage message = ValidationUtils
>+				.createNewErrorMessage(Messages.COMMON_ERROR_TITLE
>+						+ "\n" + msg);
>+				_consolidatedReport.addValidationMessage(message);
>+				if (_ce != null)
>+					_ce	.reportProblemNoQuickfix(Messages.INVALID_ROUTER_CLASS_ERROR_
>+							+ "\n" + msg);
>+				
>+			}
> 			validateInitParam(rt.getInitParam());
> 			List capList = rt.getCapability();
> 			if (capList == null || capList.size() == 0)
>@@ -124,6 +141,8 @@
> 	 */
> 	public IValidationReport validateRouterType(RouterType rt)
> 	{
>+		if(rt == null)
>+			return null;
> 		// Check for routerclass
> 		String routerClass = rt.getJavaRouterClass();
> 
>@@ -157,32 +176,35 @@
> 		}
> 
> 		// Check for persistence class
>-		String persistenceClass = rt.getPersistence().getJavaPersistenceClass();
>-		if (persistenceClass != null && persistenceClass.trim().length() != 0)
>+		if(rt.getPersistence() != null)
> 		{
>-			String msg = validateJavaIdentifier(persistenceClass);
>-			if (msg != null)
>+			String persistenceClass = rt.getPersistence().getJavaPersistenceClass();
>+			if (persistenceClass != null && persistenceClass.trim().length() != 0)
>+			{
>+				String msg = validateJavaIdentifier(persistenceClass);
>+				if (msg != null)
>+				{
>+					IValidationMessage message = ValidationUtils
>+							.createNewErrorMessage(Messages.INVALID_PERSISTENCE_CLASS_ERROR_
>+									+ "\n" + msg);
>+					_consolidatedReport.addValidationMessage(message);
>+					if (_ce != null)
>+						_ce
>+								.reportProblemNoQuickfix(Messages.INVALID_PERSISTENCE_CLASS_ERROR_
>+										+ "\n" + msg);
>+				}
>+			}
>+			// Fix for defect 60319 Make sure that persistence class is not empty
>+			else
> 			{
> 				IValidationMessage message = ValidationUtils
>-						.createNewErrorMessage(Messages.INVALID_PERSISTENCE_CLASS_ERROR_
>-								+ "\n" + msg);
>+						.createNewErrorMessage(Messages.INVALID_PERSISTENCE_CLASS_ERROR_);
> 				_consolidatedReport.addValidationMessage(message);
> 				if (_ce != null)
> 					_ce
>-							.reportProblemNoQuickfix(Messages.INVALID_PERSISTENCE_CLASS_ERROR_
>-									+ "\n" + msg);
>+							.reportProblemNoQuickfix(Messages.INVALID_PERSISTENCE_CLASS_ERROR_);
> 			}
> 		}
>-		// Fix for defect 60319 Make sure that persistence class is not empty
>-		else
>-		{
>-			IValidationMessage message = ValidationUtils
>-					.createNewErrorMessage(Messages.INVALID_PERSISTENCE_CLASS_ERROR_);
>-			_consolidatedReport.addValidationMessage(message);
>-			if (_ce != null)
>-				_ce
>-						.reportProblemNoQuickfix(Messages.INVALID_PERSISTENCE_CLASS_ERROR_);
>-		}
> 		// Validate Additional jars for any invalid file path
> 		validateAdditionalJars();
> 
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/dde/listeners/internal/ComponentSelectionListener.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/editor/dde/listeners/internal/ComponentSelectionListener.java,v
>retrieving revision 1.1
>diff -u -r1.1 ComponentSelectionListener.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/dde/listeners/internal/ComponentSelectionListener.java	8 Feb 2007 19:40:12 -0000	1.1
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/dde/listeners/internal/ComponentSelectionListener.java	13 Feb 2007 10:29:31 -0000
>@@ -289,7 +289,7 @@
> 			TableItem[] items = rtTable.getItems();
> 			if (items == null || items.length == 0)
> 				return;
>-			for (int i = 0; i < items.length; i++)
>+			/*for (int i = 0; i < items.length; i++)
> 			{
> 				ResourceTypeTypeImpl rtImpl = (ResourceTypeTypeImpl) items[i]
> 						.getData();
>@@ -304,10 +304,10 @@
> 											.getWsdlFile())
> 									+ Messages.CSL_ERROR_MSG3_PART2); //$NON-NLS-1$
> 					rtTable.select(i);
>-					ActionPerformer.performMrtDeleteAction(_editor);
>+					//ActionPerformer.performMrtDeleteAction(_editor);
> 					return;
> 				}
>-			}
>+			}*/
> 		}
> 		else if (src.equals(_editor.getTblCapabilities()))
> 		{
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/LoaderUtil.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/LoaderUtil.java,v
>retrieving revision 1.1
>diff -u -r1.1 LoaderUtil.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/LoaderUtil.java	8 Feb 2007 19:40:13 -0000	1.1
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/LoaderUtil.java	13 Feb 2007 10:29:31 -0000
>@@ -179,16 +179,16 @@
> 								+ Messages.LU_ERROR_MSG1_PART2); //$NON-NLS-1$
> 
> 				// Remove all the Initial Instances attached with this MRT
>-				InitialInstancesType[] initInstances = DdeUtil
>+				/*InitialInstancesType[] initInstances = DdeUtil
> 						.getInitialInstances(editor.getRootType(), resourceType);
> 				for (int j = 0; j < initInstances.length; j++)
> 					editor.getRootType().getInitialInstances().remove(
> 							initInstances[j]);
> 
> 				// Remove the resource type
>-				resourceTypeList.remove(resourceType);
>+				resourceTypeList.remove(resourceType);*/
> 
>-				return;
>+				//return;
> 			}
> 			ManageableResourceType mrt = DdeUtil
> 					.loadMrtFile((IFile) selectedFile);
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/dde/internal/DescriptorModelWizard.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/editor/dde/internal/DescriptorModelWizard.java,v
>retrieving revision 1.2
>diff -u -r1.2 DescriptorModelWizard.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/dde/internal/DescriptorModelWizard.java	9 Feb 2007 13:06:01 -0000	1.2
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/dde/internal/DescriptorModelWizard.java	13 Feb 2007 10:29:30 -0000
>@@ -28,6 +28,7 @@
> import org.apache.ws.muse.descriptor.DocumentRoot;
> import org.apache.ws.muse.descriptor.MuseType;
> import org.apache.ws.muse.descriptor.RootType;
>+import org.apache.ws.muse.descriptor.RouterType;
> import org.eclipse.core.resources.IContainer;
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IFolder;
>@@ -202,6 +203,8 @@
> 		DocumentRoot root = DescriptorFactory.eINSTANCE.createDocumentRoot();
> 		RootType rootType = DescriptorFactory.eINSTANCE.createRootType();
> 		MuseType muse = DescriptorFactory.eINSTANCE.createMuseType();
>+		RouterType rt = DescriptorFactory.eINSTANCE.createRouterType();
>+		muse.setRouter(rt);
> 		AdditionalJarsType jars = DescriptorFactory.eINSTANCE
> 				.createAdditionalJarsType();
> 		rootType.setMuse(muse);

Actions: View | Diff

Attachments on bug 167374: 55650 | 58851 | 60463