Author: bfitzpat Date: 2010-05-21 17:15:03 -0400 (Fri, 21 May 2010) New Revision: 22248 Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/ResultsXMLStorage.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/ResultsXMLStorageInput.java Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossWSRuntimeListFieldEditor.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java Log: JBIDE-6326 - adding ability to open WS invoke results in the XML editor Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-05-21 15:14:04 UTC (rev 22247) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-05-21 21:15:03 UTC (rev 22248) @@ -71,6 +71,7 @@ JAXRSWSTestView_Action_URL_Label=Action URL: JAXRSWSTestView_Configure_Monitor_Button=Configure Monitor +JAXRSWSTestView_CopyResultsMenu=&Copy JAXRSWSTestView_Exception_Status=Exception: JAXRSWSTestView_HTTP_Method_Label=HTTP Method: JAXRSWSTestView_Invoke_Label=Invoke @@ -78,6 +79,8 @@ JAXRSWSTestView_JAXRS_Success_Status=Successful JAX-RS Web Service Execution JAXRSWSTestView_JAXWS_Success_Status=Successful JAX-WS Web Service Execution JAXRSWSTestView_Open_Monitor_Button=Open Monitor +JAXRSWSTestView_Open_Response_Tag_Contents_in_XML_Editor=Open &Response tag contents in XML Editor +JAXRSWSTestView_Open_Result_in_XML_Editor=&Open in XML Editor JAXRSWSTestView_Request_Body_Label=Request Body JAXRSWSTestView_Request_Header_Label=Request Header JAXRSWSTestView_Request_Parameters_Label=Request Parameters @@ -86,3 +89,4 @@ JAXRSWSTestView_Service_URL_Label=Service URL: JAXRSWSTestView_Set_Sample_Data_Label=Set Sample Data JAXRSWSTestView_Web_Service_Type_Label=Web Service Type: +ResultsXMLStorageInput_WS_Invocation_Results_Prefix=Web Service Invocation Results: Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-05-21 15:14:04 UTC (rev 22247) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-05-21 21:15:03 UTC (rev 22248) @@ -94,6 +94,7 @@ public static String JBossWS_DelimitedStringList_EditValue_Dialog_Message; public static String JAXRSWSTestView_Action_URL_Label; public static String JAXRSWSTestView_Configure_Monitor_Button; + public static String JAXRSWSTestView_CopyResultsMenu; public static String JAXRSWSTestView_Exception_Status; public static String JAXRSWSTestView_HTTP_Method_Label; public static String JAXRSWSTestView_Invoke_Label; @@ -101,6 +102,8 @@ public static String JAXRSWSTestView_JAXRS_Success_Status; public static String JAXRSWSTestView_JAXWS_Success_Status; public static String JAXRSWSTestView_Open_Monitor_Button; + public static String JAXRSWSTestView_Open_Response_Tag_Contents_in_XML_Editor; + public static String JAXRSWSTestView_Open_Result_in_XML_Editor; public static String JAXRSWSTestView_Request_Body_Label; public static String JAXRSWSTestView_Request_Header_Label; public static String JAXRSWSTestView_Request_Parameters_Label; @@ -109,6 +112,7 @@ public static String JAXRSWSTestView_Service_URL_Label; public static String JAXRSWSTestView_Set_Sample_Data_Label; public static String JAXRSWSTestView_Web_Service_Type_Label; + public static String ResultsXMLStorageInput_WS_Invocation_Results_Prefix; static { NLS.initializeMessages(BUNDLE_NAME, JBossWSUIMessages.class); Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossWSRuntimeListFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossWSRuntimeListFieldEditor.java 2010-05-21 15:14:04 UTC (rev 22247) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossWSRuntimeListFieldEditor.java 2010-05-21 21:15:03 UTC (rev 22248) @@ -1073,7 +1073,6 @@ setDefaultRuntime(); } - @SuppressWarnings("unchecked") private void removeRuntime(JBossWSRuntime r) { boolean used = JBossWSRuntimeManager.isRuntimeUsed(r.getName()); String title = JBossWSUIMessages.JBossWS_Runtime_Delete_Confirm_Title; @@ -1092,7 +1091,7 @@ if (added.contains(r)) { added.remove(r); } - ((List) getValue()).remove(r); + ((List<?>) getValue()).remove(r); } if (checkedElement == r) { checkedElement = null; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester.java 2010-05-21 15:14:04 UTC (rev 22247) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester.java 2010-05-21 21:15:03 UTC (rev 22248) @@ -34,6 +34,8 @@ // the response message to pass back private String resultBody; + private SOAPEnvelope resultSOAP; + // the result HTTP headers to pass back private HashMap<String, String> resultHeaders; @@ -63,6 +65,10 @@ return this.resultHeaders; } + public SOAPEnvelope getResultSOAP(){ + return this.resultSOAP; + } + /** * Invoke the JAX-WS service * @param endpointurl @@ -91,16 +97,16 @@ } Message message = new Message(document); - SOAPEnvelope envelope = null; + resultSOAP = null; this.resultBody = EMPTY_STRING; try { - envelope = call.invoke( message ); + resultSOAP = call.invoke( message ); // Get back the response message - if (envelope != null && envelope.getBody() != null) { - this.resultBody = envelope.getBody().toString(); + if (resultSOAP != null && resultSOAP.getBody() != null) { + this.resultBody = resultSOAP.getBody().toString(); } // Get back the response HTTP headers and pass back as a Map @@ -122,7 +128,7 @@ if (fault.getFaultString() != null) { this.resultBody = fault.getFaultString(); } - + // Get back the response HTTP headers and pass back as a Map if (fault.getHeaders() != null && !fault.getHeaders().isEmpty()) { Iterator<?> iter = fault.getHeaders().iterator(); Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/ResultsXMLStorage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/ResultsXMLStorage.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/ResultsXMLStorage.java 2010-05-21 21:15:03 UTC (rev 22248) @@ -0,0 +1,54 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.ws.ui.utils; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +import org.eclipse.core.resources.IStorage; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; + +/** + * Temporary in-memory storage for WS invocation results + * to pass to the XML editor. + * @author bfitzpat + * + */ +public class ResultsXMLStorage implements IStorage { + private String string; + + public ResultsXMLStorage(String input) { + this.string = input; + } + + public InputStream getContents() throws CoreException { + return new ByteArrayInputStream(string.getBytes()); + } + + public IPath getFullPath() { + return null; + } + + @SuppressWarnings("rawtypes") + public Object getAdapter(Class adapter) { + return null; + } + + public String getName() { + int len = Math.min(5, string.length()); + return string.substring(0, len).concat("..."); //$NON-NLS-1$ + } + + public boolean isReadOnly() { + return true; + } +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/ResultsXMLStorage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/ResultsXMLStorageInput.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/ResultsXMLStorageInput.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/ResultsXMLStorageInput.java 2010-05-21 21:15:03 UTC (rev 22248) @@ -0,0 +1,60 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.ws.ui.utils; + +import org.eclipse.core.resources.IStorage; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.IPersistableElement; +import org.eclipse.ui.IStorageEditorInput; +import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; + +/** + * Temporary in-memory storage for WS invocation results + * to pass to the XML editor. + * @author bfitzpat + */ +public class ResultsXMLStorageInput implements IStorageEditorInput { + + private IStorage storage; + + public ResultsXMLStorageInput(IStorage storage) { + this.storage = storage; + } + + public boolean exists() { + return true; + } + + public ImageDescriptor getImageDescriptor() { + return null; + } + + public String getName() { + return storage.getName(); + } + + public IPersistableElement getPersistable() { + return null; + } + + public IStorage getStorage() { + return storage; + } + + public String getToolTipText() { + return JBossWSUIMessages.ResultsXMLStorageInput_WS_Invocation_Results_Prefix + storage.getName(); + } + + @SuppressWarnings("rawtypes") + public Object getAdapter(Class adapter) { + return null; + } +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/ResultsXMLStorageInput.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-05-21 15:14:04 UTC (rev 22247) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-05-21 21:15:03 UTC (rev 22248) @@ -17,6 +17,10 @@ import java.util.Iterator; import java.util.Map.Entry; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; + +import org.eclipse.core.resources.IStorage; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -27,6 +31,8 @@ import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.KeyListener; import org.eclipse.swt.events.SelectionEvent; @@ -40,9 +46,14 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.IStorageEditorInput; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; @@ -52,7 +63,11 @@ import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; import org.jboss.tools.ws.ui.utils.JAXRSTester; import org.jboss.tools.ws.ui.utils.JAXWSTester; +import org.jboss.tools.ws.ui.utils.ResultsXMLStorage; +import org.jboss.tools.ws.ui.utils.ResultsXMLStorageInput; import org.jboss.tools.ws.ui.utils.WSTestUtils; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * View for testing web services (JAX-WS & JAX-RS) @@ -62,6 +77,7 @@ @SuppressWarnings("restriction") public class JAXRSWSTestView extends ViewPart { + private static final String XML_EDITOR_ID = "org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart"; //$NON-NLS-1$ private static final String TCPIP_VIEW_ID = "org.eclipse.wst.internet.monitor.view";//$NON-NLS-1$ private static final String DELETE = "DELETE";//$NON-NLS-1$ private static final String PUT = "PUT";//$NON-NLS-1$ @@ -100,6 +116,11 @@ private Button openTCPIPMonitorButton; private Button addTCPIPMonitorButton; + private SOAPEnvelope envelope; + private MenuItem openInXMLEditorAction; + private MenuItem openResponseTagInXMLEditor; + private Menu resultsTextMenu; + /** * The constructor. */ @@ -268,7 +289,7 @@ Button sampleButton = new Button(buttonBar, SWT.PUSH); sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_Label); - sampleButton.setVisible(false); + sampleButton.setVisible(true); sampleButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { @@ -291,7 +312,98 @@ resultTab.setText(JBossWSUIMessages.JAXRSWSTestView_Results_Body_Label); resultsText = new Text(resultTabGroup, SWT.BORDER | SWT.V_SCROLL | SWT.WRAP | SWT.READ_ONLY ); resultsText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + + resultsTextMenu = new Menu(resultsText.getShell(), SWT.POP_UP); + + MenuItem copyMenuAction = new MenuItem(resultsTextMenu, SWT.PUSH); + copyMenuAction.setText(JBossWSUIMessages.JAXRSWSTestView_CopyResultsMenu); + copyMenuAction.setAccelerator(SWT.CTRL + 'C'); + copyMenuAction.addSelectionListener(new SelectionListener(){ + + public void widgetDefaultSelected(SelectionEvent arg0) { + resultsText.selectAll(); + resultsText.copy(); + } + + public void widgetSelected(SelectionEvent arg0) { + widgetDefaultSelected(arg0); + } + }); + new MenuItem(resultsTextMenu, SWT.SEPARATOR); + + openInXMLEditorAction = new MenuItem(resultsTextMenu, SWT.PUSH); + openInXMLEditorAction.setText(JBossWSUIMessages.JAXRSWSTestView_Open_Result_in_XML_Editor); + openInXMLEditorAction.setAccelerator(SWT.CTRL + 'O'); + openInXMLEditorAction.addSelectionListener(new SelectionListener() { + + public void widgetSelected(SelectionEvent arg0) { + String string = resultsText.getText(); + openXMLEditor(string); + } + + public void widgetDefaultSelected(SelectionEvent arg0) { + widgetSelected(arg0); + } + }); + + openResponseTagInXMLEditor = new MenuItem(resultsTextMenu, SWT.PUSH); + openResponseTagInXMLEditor.setText(JBossWSUIMessages.JAXRSWSTestView_Open_Response_Tag_Contents_in_XML_Editor); + openResponseTagInXMLEditor.setAccelerator(SWT.CTRL + 'R'); + openResponseTagInXMLEditor.addSelectionListener(new SelectionListener() { + + public void widgetSelected(SelectionEvent arg0) { + String string = null; + if (envelope != null){ + try { + NodeList list = envelope.getBody().getChildNodes(); + for (int i = 0; i< list.getLength(); i++){ + Node node = list.item(i); + if (node.getNodeName().contains("Response")){ //$NON-NLS-1$ + NodeList list2 = node.getChildNodes(); + for (int j = 0; j<list2.getLength(); j++){ + Node node2 = list2.item(j); + if (node2.getNodeName().contains("Result")){ //$NON-NLS-1$ + Node node3 = node2.getChildNodes().item(0); + if (node3.getNodeType() == Node.TEXT_NODE) { + string = node3.getNodeValue(); + break; + } + } + } + if (string != null) break; + } + } + if (string != null){ + openXMLEditor(string); + } + } catch (SOAPException e) { + e.printStackTrace(); + } + } + } + + public void widgetDefaultSelected(SelectionEvent arg0) { + widgetSelected(arg0); + } + }); + + resultsText.setMenu(resultsTextMenu); + resultTab.setControl(resultsText); + + resultsText.addFocusListener(new FocusListener() { + + public void focusLost(FocusEvent arg0) { + } + + public void focusGained(FocusEvent arg0) { + if (resultsText.getText().trim().length() > 0){ + resultsTextMenu.setVisible(true); + } else { + resultsTextMenu.setVisible(false); + } + } + }); resultHeadersTab = new TabItem(resultTabGroup, SWT.NONE, 1); resultHeadersTab.setText(JBossWSUIMessages.JAXRSWSTestView_Results_Header_Label); @@ -306,6 +418,21 @@ setControlsForMethodType(methodCombo.getText()); setControlsForSelectedURL(); } + + private void openXMLEditor (String text){ + IWorkbenchWindow window = getSite().getWorkbenchWindow(); + IStorage storage = new ResultsXMLStorage(text); + IStorageEditorInput input = new ResultsXMLStorageInput(storage); + IWorkbenchPage page = window.getActivePage(); + if (page != null) { + try { +// page.openEditor(input, "org.eclipse.ui.DefaultTextEditor"); + page.openEditor(input, XML_EDITOR_ID); + } catch (PartInitException e) { + e.printStackTrace(); + } + } + } private void setControlsForSelectedURL() { if (urlCombo.getText().trim().length() > 0) { @@ -439,6 +566,10 @@ if (bodyText.getText().trim().length() == 0) { bodyText.setText(emptySOAP); } + + if (openResponseTagInXMLEditor != null && + !openResponseTagInXMLEditor.isDisposed()) + openResponseTagInXMLEditor.setEnabled(true); } else if (wsType.equalsIgnoreCase(JAX_RS)) { actionText.setEnabled(false); @@ -449,6 +580,9 @@ parmsTab.getControl().setEnabled(true); headerTab.getControl().setEnabled(true); methodCombo.setText(GET); + if (openResponseTagInXMLEditor != null && + !openResponseTagInXMLEditor.isDisposed()) + openResponseTagInXMLEditor.setEnabled(false); } } @@ -505,7 +639,7 @@ } else { urlCombo.add(urlCombo.getText()); } - + final String url = urlCombo.getText(); final String action = actionText.getText(); final String body = bodyText.getText(); @@ -531,7 +665,7 @@ aJob.setUser(true); aJob.schedule(); aJob.addJobChangeListener(new IJobChangeListener() { - + public void sleeping(IJobChangeEvent event) {}; public void scheduled(IJobChangeEvent event) {}; public void running(IJobChangeEvent event) {}; @@ -553,7 +687,7 @@ }); } } - + public void awake(IJobChangeEvent event) {}; public void aboutToRun(IJobChangeEvent event) {}; }); @@ -565,14 +699,16 @@ */ private IStatus handleWSTest(final IProgressMonitor monitor, String url, String action, String body) { try { - + + envelope = null; monitor.worked(10); JAXWSTester tester = new JAXWSTester(); tester.doTest(url, action, body); monitor.worked(70); String result = tester.getResultBody(); + envelope = tester.getResultSOAP(); String cleanedUp = WSTestUtils.addNLsToXML(result); - + WSTestStatus status = new WSTestStatus(IStatus.OK, JBossWSUIPlugin.PLUGIN_ID, JBossWSUIMessages.JAXRSWSTestView_JAXWS_Success_Status); @@ -656,10 +792,10 @@ // now actually call it try { - + // call the service tester.doTest(address, parameters, headers, method, body); - + String result = tester.getResultBody(); // put the results in the result text field @@ -691,7 +827,7 @@ status.setHeadersList(listText); monitor.worked(10); return status; - + } catch (Exception e) { String result = tester.getResultBody(); @@ -724,12 +860,12 @@ status.setHeadersList(listText); monitor.worked(10); return status; -// WSTestStatus status = new WSTestStatus(IStatus.ERROR, -// JBossWSUIPlugin.PLUGIN_ID, -// JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalizedMessage()); -// status.setResultsText(e.toString()); -// e.printStackTrace(); -// return status; + // WSTestStatus status = new WSTestStatus(IStatus.ERROR, + // JBossWSUIPlugin.PLUGIN_ID, + // JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalizedMessage()); + // status.setResultsText(e.toString()); + // e.printStackTrace(); + // return status; } } @@ -740,5 +876,5 @@ // set initial focus to the URL text combo urlCombo.setFocus(); } - + } \ No newline at end of file