[jbosstools-commits] JBoss Tools SVN: r22261 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views.
Author: bfitzpat
Date: 2010-05-21 22:47:06 -0400 (Fri, 21 May 2010)
New Revision: 22261
Modified:
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 - updates to popup
menu enable/disable
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-22
02:27:29 UTC (rev 22260)
+++
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-05-22
02:47:06 UTC (rev 22261)
@@ -77,6 +77,7 @@
@SuppressWarnings("restriction")
public class JAXRSWSTestView extends ViewPart {
+ private static final String DEFAULT_TEXT_EDITOR_ID =
"org.eclipse.ui.DefaultTextEditor"; //$NON-NLS-1$
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$
@@ -120,6 +121,7 @@
private MenuItem openInXMLEditorAction;
private MenuItem openResponseTagInXMLEditor;
private Menu resultsTextMenu;
+ private MenuItem copyMenuAction;
/**
* The constructor.
@@ -289,7 +291,7 @@
Button sampleButton = new Button(buttonBar, SWT.PUSH);
sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_Label);
- sampleButton.setVisible(true);
+ sampleButton.setVisible(false);
sampleButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
@@ -315,7 +317,7 @@
resultsTextMenu = new Menu(resultsText.getShell(), SWT.POP_UP);
- MenuItem copyMenuAction = new MenuItem(resultsTextMenu, SWT.PUSH);
+ copyMenuAction = new MenuItem(resultsTextMenu, SWT.PUSH);
copyMenuAction.setText(JBossWSUIMessages.JAXRSWSTestView_CopyResultsMenu);
copyMenuAction.setAccelerator(SWT.CTRL + 'C');
copyMenuAction.addSelectionListener(new SelectionListener(){
@@ -417,8 +419,22 @@
setControlsForWSType(wsTypeCombo.getText());
setControlsForMethodType(methodCombo.getText());
setControlsForSelectedURL();
+ setMenusForCurrentState();
}
+ private void setMenusForCurrentState() {
+ if (resultsText!= null && !resultsText.isDisposed()){
+ boolean enabled = resultsText.getText().trim().length() > 0;
+ copyMenuAction.setEnabled(enabled);
+ openInXMLEditorAction.setEnabled(enabled);
+ if (wsTypeCombo.getText().equalsIgnoreCase(JAX_WS)) {
+ openResponseTagInXMLEditor.setEnabled(enabled);
+ } else if (wsTypeCombo.getText().equalsIgnoreCase(JAX_RS) ){
+ openResponseTagInXMLEditor.setEnabled(false);
+ }
+ }
+ }
+
private void openXMLEditor (String text){
IWorkbenchWindow window = getSite().getWorkbenchWindow();
IStorage storage = new ResultsXMLStorage(text);
@@ -426,8 +442,11 @@
IWorkbenchPage page = window.getActivePage();
if (page != null) {
try {
-// page.openEditor(input, "org.eclipse.ui.DefaultTextEditor");
- page.openEditor(input, XML_EDITOR_ID);
+ if (window.getWorkbench().getEditorRegistry().findEditor(XML_EDITOR_ID) != null) {
+ page.openEditor(input, XML_EDITOR_ID);
+ } else {
+ page.openEditor(input, DEFAULT_TEXT_EDITOR_ID);
+ }
} catch (PartInitException e) {
e.printStackTrace();
}
@@ -566,10 +585,6 @@
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);
@@ -580,10 +595,8 @@
parmsTab.getControl().setEnabled(true);
headerTab.getControl().setEnabled(true);
methodCombo.setText(GET);
- if (openResponseTagInXMLEditor != null &&
- !openResponseTagInXMLEditor.isDisposed())
- openResponseTagInXMLEditor.setEnabled(false);
}
+ setMenusForCurrentState();
}
/*
@@ -692,6 +705,7 @@
public void aboutToRun(IJobChangeEvent event) {};
});
+ setMenusForCurrentState();
}
/*