Attachment 60463 Details for Bug 167374 – Patch for DDE validation if mrt is deleted

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

[patch] Patch for DDE validation if mrt is deleted

Defect_167374_on_09_March_07.txt (text/plain), 3.94 KB, created by Hariharan L Narayanan

on 2007-03-09 02:44:18 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Hariharan L Narayanan

Created: 2007-03-09 02:44:18 EST

Size: 3.94 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.wsdm.editor
>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.3
>diff -u -r1.3 LoaderUtil.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/LoaderUtil.java	1 Mar 2007 06:56:57 -0000	1.3
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/LoaderUtil.java	9 Mar 2007 07:33:59 -0000
>@@ -204,6 +204,8 @@
> 			ResourceTypeTypeImpl rt, ManageableResourceType mrt)
> 	{
> 		// Synchronize the context path
>+		if(rt == null || mrt == null)
>+			return;
> 		rt.setContextPath("/" + mrt.getIdentifier()); //$NON-NLS-1$
> 		// Synchronize the namespace and wsdl-porttype
> 		String wsdlPortType = (String) rt.getWsdl().getWsdlPortType();
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/DdeUtil.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/DdeUtil.java,v
>retrieving revision 1.3
>diff -u -r1.3 DdeUtil.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/DdeUtil.java	19 Feb 2007 19:39:13 -0000	1.3
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/DdeUtil.java	9 Mar 2007 07:33:59 -0000
>@@ -338,6 +338,8 @@
> 	 */
> 	public static ManageableResourceType loadMrtFile(IFile file)
> 	{
>+		if(file == null)
>+			return null;
> 		URI uri = URI.createPlatformResourceURI(file.getFullPath().toString());
> 		if (uri == null)
> 			return null;
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/dde/internal/DescriptorActionBarContributor.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/editor/dde/internal/DescriptorActionBarContributor.java,v
>retrieving revision 1.1
>diff -u -r1.1 DescriptorActionBarContributor.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/dde/internal/DescriptorActionBarContributor.java	8 Feb 2007 19:40:12 -0000	1.1
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/dde/internal/DescriptorActionBarContributor.java	9 Mar 2007 07:33:59 -0000
>@@ -185,8 +185,7 @@
> 	 */
> 	public void contributeToToolBar(IToolBarManager toolBarManager)
> 	{
>-		toolBarManager.add(new Separator("descriptor-settings"));
>-		toolBarManager.add(new Separator("descriptor-additions"));
>+		
> 	}
> 
> 	/**
>@@ -198,41 +197,7 @@
> 	 */
> 	public void contributeToMenu(IMenuManager menuManager)
> 	{
>-		super.contributeToMenu(menuManager);
>-
>-		IMenuManager submenuManager = new MenuManager(Activator.INSTANCE
>-				.getString("_UI_DescriptorEditor_menu"),
>-				"org.apache.ws.muse.descriptorMenuID");
>-		menuManager.insertAfter("additions", submenuManager);
>-		submenuManager.add(new Separator("settings"));
>-		submenuManager.add(new Separator("actions"));
>-		submenuManager.add(new Separator("additions"));
>-		submenuManager.add(new Separator("additions-end"));
>-
>-		// Prepare for CreateChild item addition or removal.
>-		//
>-		createChildMenuManager = new MenuManager(Activator.INSTANCE
>-				.getString("_UI_CreateChild_menu_item"));
>-		submenuManager.insertBefore("additions", createChildMenuManager);
>-
>-		// Prepare for CreateSibling item addition or removal.
>-		//
>-		createSiblingMenuManager = new MenuManager(Activator.INSTANCE
>-				.getString("_UI_CreateSibling_menu_item"));
>-		submenuManager.insertBefore("additions", createSiblingMenuManager);
>-
>-		// Force an update because Eclipse hides empty menus now.
>-		//
>-		submenuManager.addMenuListener(new IMenuListener()
>-		{
>-
>-			public void menuAboutToShow(IMenuManager menuManager)
>-			{
>-				menuManager.updateAll(true);
>-			}
>-		});
>-
>-		addGlobalActions(submenuManager);
>+		
> 	}
> 
> 	/**

Actions: View | Diff

Attachments on bug 167374: 55650 | 58851 | 60463