[jbosstools-commits] JBoss Tools SVN: r23058 - in trunk/ws/plugins/org.jboss.tools.ws.ui: src/org/jboss/tools/ws/ui/messages and 2 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jun 25 18:25:53 EDT 2010
Author: bfitzpat
Date: 2010-06-25 18:25:53 -0400 (Fri, 25 Jun 2010)
New Revision: 23058
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF
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/utils/JAXRSTester.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java
Log:
[JBIDE-6544] Minor tweaks for demo
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-06-25 22:23:04 UTC (rev 23057)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-06-25 22:25:53 UTC (rev 23058)
@@ -39,6 +39,7 @@
org.jboss.tools.ws.ui.wizards
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.jst.javaee.web,
+Import-Package: javax.xml.ws,
+ org.eclipse.jst.javaee.web,
org.jboss.tools.ws.creation.core.commands,
org.jboss.tools.ws.creation.core.data
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-06-25 22:23:04 UTC (rev 23057)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-06-25 22:25:53 UTC (rev 23058)
@@ -84,6 +84,7 @@
JAXRSWSTestView_Action_URL_Label=Action URL:
JAXRSWSTestView_Button_Get_From_WSDL=Get from WSDL...
JAXRSWSTestView_Configure_Monitor_Button=Configure Monitor
+JAXRSWSTestView_CopyResultMenu_Text=&Copy Result Header to Clipboard
JAXRSWSTestView_CopyResultsMenu=&Copy
JAXRSWSTestView_Error_Msg_Starting_Monitor=Encountered an error starting the new TCP/IP monitor. Open the TCP/IP Monitor view and edit the monitor definition to correct the error.
JAXRSWSTestView_Error_Title_Starting_Monitor=Error Starting Monitor
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-06-25 22:23:04 UTC (rev 23057)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-06-25 22:25:53 UTC (rev 23058)
@@ -107,6 +107,7 @@
public static String JAXRSWSTestView_Action_URL_Label;
public static String JAXRSWSTestView_Button_Get_From_WSDL;
public static String JAXRSWSTestView_Configure_Monitor_Button;
+ public static String JAXRSWSTestView_CopyResultMenu_Text;
public static String JAXRSWSTestView_CopyResultsMenu;
public static String JAXRSWSTestView_Error_Msg_Starting_Monitor;
public static String JAXRSWSTestView_Error_Title_Starting_Monitor;
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java 2010-06-25 22:23:04 UTC (rev 23057)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java 2010-06-25 22:25:53 UTC (rev 23058)
@@ -220,7 +220,8 @@
|| methodType.equalsIgnoreCase("PUT"))) { //$NON-NLS-1$
requestBody = WSTestUtils.stripNLsFromXML(requestBody);
OutputStreamWriter out = new OutputStreamWriter(httpurlc.getOutputStream());
- out.write(requestBody);
+ String stripped = stripCRLF(requestBody);
+ out.write(stripped);
out.close();
}
@@ -259,4 +260,24 @@
// disconnect explicitly (may not be necessary)
httpurlc.disconnect();
}
+
+ public static String stripCRLF ( String input ) {
+ if (input != null) {
+ StringBuffer output = new StringBuffer();
+
+ char cr = '\r';
+ char lf = '\n';
+
+ for (int i = 0; i < input.length(); i++) {
+ char ch = input.charAt(i);
+ if (ch == cr || ch == lf) {
+ // do nothing
+ } else {
+ output.append(ch);
+ }
+ }
+ return output.toString();
+ }
+ return null;
+ }
}
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-06-25 22:23:04 UTC (rev 23057)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-06-25 22:25:53 UTC (rev 23058)
@@ -33,10 +33,15 @@
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
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.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.FillLayout;
@@ -46,6 +51,7 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Menu;
@@ -126,6 +132,8 @@
private MenuItem openResponseTagInXMLEditor;
private Menu resultsTextMenu;
private MenuItem copyMenuAction;
+ private Menu resultsHeaderMenu;
+ private MenuItem copyResultHeaderMenuAction;
private boolean showSampleButton = false;
@@ -459,6 +467,40 @@
rdlsListGD.horizontalSpan = 2;
resultHeadersList.setLayoutData(dlsListGD);
+ resultsHeaderMenu = new Menu(resultHeadersList.getShell(), SWT.POP_UP);
+
+ copyResultHeaderMenuAction = new MenuItem(resultsHeaderMenu, SWT.PUSH);
+ copyResultHeaderMenuAction.setText(JBossWSUIMessages.JAXRSWSTestView_CopyResultMenu_Text);
+ copyResultHeaderMenuAction.setAccelerator(SWT.CTRL + 'C');
+ copyResultHeaderMenuAction.addSelectionListener(new SelectionListener(){
+
+ public void widgetDefaultSelected(SelectionEvent arg0) {
+ if (resultHeadersList.getSelectionCount() == 0)
+ resultHeadersList.selectAll();
+ Display display = Display.getDefault();
+ final Clipboard cb = new Clipboard(display);
+ TextTransfer textTransfer = TextTransfer.getInstance();
+ cb.setContents(resultHeadersList.getSelection() ,
+ new Transfer[] { textTransfer });
+ }
+
+ public void widgetSelected(SelectionEvent arg0) {
+ widgetDefaultSelected(arg0);
+ }
+ });
+
+ resultHeadersList.setMenu(resultsHeaderMenu);
+
+ resultHeadersList.addMouseListener(new MouseListener() {
+ public void mouseDoubleClick(MouseEvent arg0) {
+ }
+ public void mouseDown(MouseEvent arg0) {
+ setMenusForCurrentState();
+ }
+ public void mouseUp(MouseEvent arg0) {
+ }
+ });
+
wsTypeCombo.setText(JAX_WS);
setControlsForWSType(wsTypeCombo.getText());
setControlsForMethodType(methodCombo.getText());
@@ -492,6 +534,10 @@
openResponseTagInXMLEditor.setEnabled(false);
}
}
+ if (resultHeadersList != null && !resultHeadersList.isDisposed()) {
+ boolean enabled = resultHeadersList.getItemCount() > 0;
+ copyResultHeaderMenuAction.setEnabled(enabled);
+ }
}
private void openXMLEditor (String text){
More information about the jbosstools-commits
mailing list