Attachment #60463 for bug #167374

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

Lines 204-209 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/LoaderUtil.java (+2 lines)
204	ResourceTypeTypeImpl rt, ManageableResourceType mrt)	204	ResourceTypeTypeImpl rt, ManageableResourceType mrt)
205	{	205	{
206	// Synchronize the context path	206	// Synchronize the context path
		207	if(rt == null \|\| mrt == null)
		208	return;
207	rt.setContextPath("/" + mrt.getIdentifier()); //$NON-NLS-1$	209	rt.setContextPath("/" + mrt.getIdentifier()); //$NON-NLS-1$
208	// Synchronize the namespace and wsdl-porttype	210	// Synchronize the namespace and wsdl-porttype
209	String wsdlPortType = (String) rt.getWsdl().getWsdlPortType();	211	String wsdlPortType = (String) rt.getWsdl().getWsdlPortType();

Lines 338-343 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/editor/dde/util/internal/DdeUtil.java (+2 lines)
338	*/	338	*/
339	public static ManageableResourceType loadMrtFile(IFile file)	339	public static ManageableResourceType loadMrtFile(IFile file)
340	{	340	{
		341	if(file == null)
		342	return null;
341	URI uri = URI.createPlatformResourceURI(file.getFullPath().toString());	343	URI uri = URI.createPlatformResourceURI(file.getFullPath().toString());
342	if (uri == null)	344	if (uri == null)
343	return null;	345	return null;




	 */
	public void contributeToToolBar(IToolBarManager toolBarManager)
	{
		
		toolBarManager.add(new Separator("descriptor-additions"));
	}

	/**

	 */
	public void contributeToMenu(IMenuManager 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);
	}

	/**

Return to bug 167374

Lines 185-192 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/editor/dde/internal/DescriptorActionBarContributor.java (-37 / +2 lines)
185	*/	185	*/
186	public void contributeToToolBar(IToolBarManager toolBarManager)	186	public void contributeToToolBar(IToolBarManager toolBarManager)
187	{	187	{
188	toolBarManager.add(new Separator("descriptor-settings"));	188
189	toolBarManager.add(new Separator("descriptor-additions"));
190	}	189	}
191		190
192	/**	191	/**
Lines 198-238 Link Here
198	*/	197	*/
199	public void contributeToMenu(IMenuManager menuManager)	198	public void contributeToMenu(IMenuManager menuManager)
200	{	199	{
201	super.contributeToMenu(menuManager);	200
202
203	IMenuManager submenuManager = new MenuManager(Activator.INSTANCE
204	.getString("_UI_DescriptorEditor_menu"),
205	"org.apache.ws.muse.descriptorMenuID");
206	menuManager.insertAfter("additions", submenuManager);
207	submenuManager.add(new Separator("settings"));
208	submenuManager.add(new Separator("actions"));
209	submenuManager.add(new Separator("additions"));
210	submenuManager.add(new Separator("additions-end"));
211
212	// Prepare for CreateChild item addition or removal.
213	//
214	createChildMenuManager = new MenuManager(Activator.INSTANCE
215	.getString("_UI_CreateChild_menu_item"));
216	submenuManager.insertBefore("additions", createChildMenuManager);
217
218	// Prepare for CreateSibling item addition or removal.
219	//
220	createSiblingMenuManager = new MenuManager(Activator.INSTANCE
221	.getString("_UI_CreateSibling_menu_item"));
222	submenuManager.insertBefore("additions", createSiblingMenuManager);
223
224	// Force an update because Eclipse hides empty menus now.
225	//
226	submenuManager.addMenuListener(new IMenuListener()
227	{
228
229	public void menuAboutToShow(IMenuManager menuManager)
230	{
231	menuManager.updateAll(true);
232	}
233	});
234
235	addGlobalActions(submenuManager);
236	}	201	}
237		202
238	/**	203	/**