Attachment #58851 for bug #167374

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




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;

		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)

	 */
	public IValidationReport validateRouterType(RouterType rt)
	{
		if(rt == null)
			return null;
		// Check for routerclass
		String routerClass = rt.getJavaRouterClass();


		}

		// Check for persistence class
		if(rt.getPersistence() != null)
		if (persistenceClass != null && persistenceClass.trim().length() != 0)
		{
			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);
				_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_);
			_consolidatedReport.addValidationMessage(message);
			if (_ce != null)
				_ce
						.reportProblemNoQuickfix(Messages.INVALID_PERSISTENCE_CLASS_ERROR_);
		}
		// Validate Additional jars for any invalid file path
		validateAdditionalJars();





			TableItem[] items = rtTable.getItems();
			if (items == null || items.length == 0)
				return;
			/*for (int i = 0; i < items.length; i++)
			{
				ResourceTypeTypeImpl rtImpl = (ResourceTypeTypeImpl) items[i]
						.getData();

											.getWsdlFile())
									+ Messages.CSL_ERROR_MSG3_PART2); //$NON-NLS-1$
					rtTable.select(i);
					//ActionPerformer.performMrtDeleteAction(_editor);
					return;
				}
			}*/
		}
		else if (src.equals(_editor.getTblCapabilities()))
		{




								+ Messages.LU_ERROR_MSG1_PART2); //$NON-NLS-1$

				// Remove all the Initial Instances attached with this MRT
				/*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);*/

				//return;
			}
			ManageableResourceType mrt = DdeUtil
					.loadMrtFile((IFile) selectedFile);

Lines 28-33 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/editor/dde/internal/DescriptorModelWizard.java (+3 lines)
28	import org.apache.ws.muse.descriptor.DocumentRoot;	28	import org.apache.ws.muse.descriptor.DocumentRoot;
29	import org.apache.ws.muse.descriptor.MuseType;	29	import org.apache.ws.muse.descriptor.MuseType;
30	import org.apache.ws.muse.descriptor.RootType;	30	import org.apache.ws.muse.descriptor.RootType;
		31	import org.apache.ws.muse.descriptor.RouterType;
31	import org.eclipse.core.resources.IContainer;	32	import org.eclipse.core.resources.IContainer;
32	import org.eclipse.core.resources.IFile;	33	import org.eclipse.core.resources.IFile;
33	import org.eclipse.core.resources.IFolder;	34	import org.eclipse.core.resources.IFolder;
Lines 202-207 Link Here
202	DocumentRoot root = DescriptorFactory.eINSTANCE.createDocumentRoot();	203	DocumentRoot root = DescriptorFactory.eINSTANCE.createDocumentRoot();
203	RootType rootType = DescriptorFactory.eINSTANCE.createRootType();	204	RootType rootType = DescriptorFactory.eINSTANCE.createRootType();
204	MuseType muse = DescriptorFactory.eINSTANCE.createMuseType();	205	MuseType muse = DescriptorFactory.eINSTANCE.createMuseType();
		206	RouterType rt = DescriptorFactory.eINSTANCE.createRouterType();
		207	muse.setRouter(rt);
205	AdditionalJarsType jars = DescriptorFactory.eINSTANCE	208	AdditionalJarsType jars = DescriptorFactory.eINSTANCE
206	.createAdditionalJarsType();	209	.createAdditionalJarsType();
207	rootType.setMuse(muse);	210	rootType.setMuse(muse);

Return to bug 167374

Lines 23-29 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/validation/dde/internal/DdeValidator.java (-18 / +40 lines)
23	import org.apache.ws.muse.descriptor.ResourceTypeType;	23	import org.apache.ws.muse.descriptor.ResourceTypeType;
24	import org.apache.ws.muse.descriptor.RootType;	24	import org.apache.ws.muse.descriptor.RootType;
25	import org.apache.ws.muse.descriptor.RouterType;	25	import org.apache.ws.muse.descriptor.RouterType;
		26	import org.eclipse.core.resources.IResource;
26	import org.eclipse.osgi.util.NLS;	27	import org.eclipse.osgi.util.NLS;
		28	import org.eclipse.tptp.wsdm.tooling.editor.dde.util.internal.DdeUtil;
27	import org.eclipse.tptp.wsdm.tooling.nls.messages.dde.internal.Messages;	29	import org.eclipse.tptp.wsdm.tooling.nls.messages.dde.internal.Messages;
28	import org.eclipse.tptp.wsdm.tooling.validation.builders.internal.WsdmCollectErrors;	30	import org.eclipse.tptp.wsdm.tooling.validation.builders.internal.WsdmCollectErrors;
29	import org.eclipse.tptp.wsdm.tooling.validation.provisional.EmptyValidationReport;	31	import org.eclipse.tptp.wsdm.tooling.validation.provisional.EmptyValidationReport;
Lines 101-106 Link Here
101	for (int i = 0; i < rtt.length; i++)	103	for (int i = 0; i < rtt.length; i++)
102	{	104	{
103	ResourceTypeType rt = rtt[i];	105	ResourceTypeType rt = rtt[i];
		106	String fileName = DdeUtil.getMrtFileName(rt.getWsdl().getWsdlFile());
		107	IResource selectedFile = DdeUtil.getIFileFromName(fileName,
		108	"mrt");
		109	if(selectedFile == null)
		110	{
		111	String msg = Messages.LU_ERROR_MSG1_PART1 + fileName + Messages.LU_ERROR_MSG1_PART2;
		112	IValidationMessage message = ValidationUtils
		113	.createNewErrorMessage(Messages.COMMON_ERROR_TITLE
		114	+ "\n" + msg);
		115	_consolidatedReport.addValidationMessage(message);
		116	if (_ce != null)
		117	_ce .reportProblemNoQuickfix(Messages.INVALID_ROUTER_CLASS_ERROR_
		118	+ "\n" + msg);
		119
		120	}
104	validateInitParam(rt.getInitParam());	121	validateInitParam(rt.getInitParam());
105	List capList = rt.getCapability();	122	List capList = rt.getCapability();
106	if (capList == null \|\| capList.size() == 0)	123	if (capList == null \|\| capList.size() == 0)
Lines 124-129 Link Here
124	*/	141	*/
125	public IValidationReport validateRouterType(RouterType rt)	142	public IValidationReport validateRouterType(RouterType rt)
126	{	143	{
		144	if(rt == null)
		145	return null;
127	// Check for routerclass	146	// Check for routerclass
128	String routerClass = rt.getJavaRouterClass();	147	String routerClass = rt.getJavaRouterClass();
129		148
Lines 157-188 Link Here
157	}	176	}
158		177
159	// Check for persistence class	178	// Check for persistence class
160	String persistenceClass = rt.getPersistence().getJavaPersistenceClass();	179	if(rt.getPersistence() != null)
161	if (persistenceClass != null && persistenceClass.trim().length() != 0)
162	{	180	{
163	String msg = validateJavaIdentifier(persistenceClass);	181	String persistenceClass = rt.getPersistence().getJavaPersistenceClass();
164	if (msg != null)	182	if (persistenceClass != null && persistenceClass.trim().length() != 0)
		183	{
		184	String msg = validateJavaIdentifier(persistenceClass);
		185	if (msg != null)
		186	{
		187	IValidationMessage message = ValidationUtils
		188	.createNewErrorMessage(Messages.INVALID_PERSISTENCE_CLASS_ERROR_
		189	+ "\n" + msg);
		190	_consolidatedReport.addValidationMessage(message);
		191	if (_ce != null)
		192	_ce
		193	.reportProblemNoQuickfix(Messages.INVALID_PERSISTENCE_CLASS_ERROR_
		194	+ "\n" + msg);
		195	}
		196	}
		197	// Fix for defect 60319 Make sure that persistence class is not empty
		198	else
165	{	199	{
166	IValidationMessage message = ValidationUtils	200	IValidationMessage message = ValidationUtils
167	.createNewErrorMessage(Messages.INVALID_PERSISTENCE_CLASS_ERROR_	201	.createNewErrorMessage(Messages.INVALID_PERSISTENCE_CLASS_ERROR_);
168	+ "\n" + msg);
169	_consolidatedReport.addValidationMessage(message);	202	_consolidatedReport.addValidationMessage(message);
170	if (_ce != null)	203	if (_ce != null)
171	_ce	204	_ce
172	.reportProblemNoQuickfix(Messages.INVALID_PERSISTENCE_CLASS_ERROR_	205	.reportProblemNoQuickfix(Messages.INVALID_PERSISTENCE_CLASS_ERROR_);
173	+ "\n" + msg);
174	}	206	}
175	}	207	}
176	// Fix for defect 60319 Make sure that persistence class is not empty
177	else
178	{
179	IValidationMessage message = ValidationUtils
180	.createNewErrorMessage(Messages.INVALID_PERSISTENCE_CLASS_ERROR_);
181	_consolidatedReport.addValidationMessage(message);
182	if (_ce != null)
183	_ce
184	.reportProblemNoQuickfix(Messages.INVALID_PERSISTENCE_CLASS_ERROR_);
185	}
186	// Validate Additional jars for any invalid file path	208	// Validate Additional jars for any invalid file path
187	validateAdditionalJars();	209	validateAdditionalJars();
188		210

Lines 289-295 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/editor/dde/listeners/internal/ComponentSelectionListener.java (-3 / +3 lines)
289	TableItem[] items = rtTable.getItems();	289	TableItem[] items = rtTable.getItems();
290	if (items == null \|\| items.length == 0)	290	if (items == null \|\| items.length == 0)
291	return;	291	return;
292	for (int i = 0; i < items.length; i++)	292	/*for (int i = 0; i < items.length; i++)
293	{	293	{
294	ResourceTypeTypeImpl rtImpl = (ResourceTypeTypeImpl) items[i]	294	ResourceTypeTypeImpl rtImpl = (ResourceTypeTypeImpl) items[i]
295	.getData();	295	.getData();
Lines 304-313 Link Here
304	.getWsdlFile())	304	.getWsdlFile())
305	+ Messages.CSL_ERROR_MSG3_PART2); //$NON-NLS-1$	305	+ Messages.CSL_ERROR_MSG3_PART2); //$NON-NLS-1$
306	rtTable.select(i);	306	rtTable.select(i);
307	ActionPerformer.performMrtDeleteAction(_editor);	307	//ActionPerformer.performMrtDeleteAction(_editor);
308	return;	308	return;
309	}	309	}
310	}	310	}*/
311	}	311	}
312	else if (src.equals(_editor.getTblCapabilities()))	312	else if (src.equals(_editor.getTblCapabilities()))
313	{	313	{

Lines 179-194 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/LoaderUtil.java (-3 / +3 lines)
179	+ Messages.LU_ERROR_MSG1_PART2); //$NON-NLS-1$	179	+ Messages.LU_ERROR_MSG1_PART2); //$NON-NLS-1$
180		180
181	// Remove all the Initial Instances attached with this MRT	181	// Remove all the Initial Instances attached with this MRT
182	InitialInstancesType[] initInstances = DdeUtil	182	/*InitialInstancesType[] initInstances = DdeUtil
183	.getInitialInstances(editor.getRootType(), resourceType);	183	.getInitialInstances(editor.getRootType(), resourceType);
184	for (int j = 0; j < initInstances.length; j++)	184	for (int j = 0; j < initInstances.length; j++)
185	editor.getRootType().getInitialInstances().remove(	185	editor.getRootType().getInitialInstances().remove(
186	initInstances[j]);	186	initInstances[j]);
187		187
188	// Remove the resource type	188	// Remove the resource type
189	resourceTypeList.remove(resourceType);	189	resourceTypeList.remove(resourceType);*/
190		190
191	return;	191	//return;
192	}	192	}
193	ManageableResourceType mrt = DdeUtil	193	ManageableResourceType mrt = DdeUtil
194	.loadMrtFile((IFile) selectedFile);	194	.loadMrtFile((IFile) selectedFile);