[jbosstools-commits] JBoss Tools SVN: r22076 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: views and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: bfitzpat
Date: 2010-05-13 20:05:30 -0400 (Thu, 13 May 2010)
New Revision: 22076

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/views/DelimitedStringList.java
   trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java
Log:
OPEN - issue JBIDE-6283: [tester] User input for request parameters/headers should be validated 
https://jira.jboss.org/jira/browse/JBIDE-6283

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-13 23:44:21 UTC (rev 22075)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties	2010-05-14 00:05:30 UTC (rev 22076)
@@ -2,6 +2,8 @@
 Command=wsconsume.sh
 Bin=bin
 Client=client
+DelimitedStringList_NO_COMMAS_WARNING=There are no commas delimiting the name and value for this key/value pair.
+DelimitedStringList_NO_EQUALS_DELIMITER_WARNING=Parameters should be in 'name=value' format.
 Lib=lib
 Endorsed=endorsed
 # END NON-TRANSLATABLE

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-13 23:44:21 UTC (rev 22075)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java	2010-05-14 00:05:30 UTC (rev 22076)
@@ -27,6 +27,8 @@
 	public static String Bin;
 	public static String Command;
 	public static String Client;
+	public static String DelimitedStringList_NO_COMMAS_WARNING;
+	public static String DelimitedStringList_NO_EQUALS_DELIMITER_WARNING;
 	public static String Lib;
 	public static String Endorsed;
 	

Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java	2010-05-13 23:44:21 UTC (rev 22075)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java	2010-05-14 00:05:30 UTC (rev 22076)
@@ -26,6 +26,7 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.List;
 import org.eclipse.swt.widgets.Text;
 import org.jboss.tools.ws.ui.messages.JBossWSUIMessages;
@@ -52,6 +53,7 @@
 	private List mPropsList;
 	private Text mAddText;
 	private boolean isReadOnly = false;
+	private Label mWarningLabel;
 
 	// current delimiter
 	private String mDelimiter = DELIMITER;
@@ -85,7 +87,7 @@
 	public DelimitedStringList(Composite parent, int style) {
 		this(parent, style, false);
 	}
-	
+
 	/**
 	 * Constructor
 	 * 
@@ -108,6 +110,13 @@
 		gridLayout.numColumns = 2;
 		setLayout(gridLayout);
 		{
+			this.mWarningLabel = new Label(this, SWT.NONE);
+			GridData wlGridData = new GridData(GridData.FILL_HORIZONTAL);
+			wlGridData.horizontalSpan = 2;
+			this.mWarningLabel.setLayoutData(wlGridData);
+			this.mWarningLabel.setForeground(this.mWarningLabel.getDisplay().getSystemColor(SWT.COLOR_RED));
+		}
+		{
 			this.mAddText = new Text(this, SWT.BORDER | additionalStyles);
 			this.mAddText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			this.mAddText.addModifyListener(new AddTextModifyListener(this));
@@ -406,15 +415,25 @@
 			value = this.mAddText.getText();
 			boolean flag = value != null && value.trim().length() > 0;
 			boolean valid = validateText(value);
+			if (!valid) {
+				this.mWarningLabel.setText(this.mWarning);
+			} else {
+				this.mWarningLabel.setText(""); //$NON-NLS-1$
+			}
 			this.mAddButton.setEnabled(flag && valid);
+			
 		} 
 	}
 
 	private boolean validateText(String text) {
 		if (text != null && text.trim().length() > 0 && text.indexOf(",") > -1) { //$NON-NLS-1$
-			this.mWarning = "There are no commas delimiting the name and value for this key/value pair."; //$NON-NLS-1$
+			this.mWarning = JBossWSUIMessages.DelimitedStringList_NO_COMMAS_WARNING;
 			return false;
 		}
+		else if (text != null && text.trim().length() > 0 && text.indexOf("=") == -1) { //$NON-NLS-1$
+			this.mWarning = JBossWSUIMessages.DelimitedStringList_NO_EQUALS_DELIMITER_WARNING;
+			return false;
+		}
 		this.mWarning = null;
 		return true;
 	}

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-13 23:44:21 UTC (rev 22075)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java	2010-05-14 00:05:30 UTC (rev 22076)
@@ -268,7 +268,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) {