[Ds-java-dev] svn commit r17125 - in
trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide:
dialog wizard
svn at wso2.org
svn at wso2.org
Fri May 16 05:08:17 PDT 2008
Author: samindaw
Date: Fri May 16 05:08:17 2008
New Revision: 17125
Log:
xml tag string validation
Modified:
trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddInputParamDialog.java
trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddOutputMappingDialog.java
trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddQueryDialog.java
trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/wizard/WSO2DataserviceWizardStepTwo.java
Modified: trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddInputParamDialog.java
==============================================================================
--- trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddInputParamDialog.java (original)
+++ trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddInputParamDialog.java Fri May 16 05:08:17 2008
@@ -28,7 +28,6 @@
import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.events.*;
import org.wso2.ws.dataservice.ide.util.FontUtil;
import org.wso2.ws.dataservice.ide.wizard.WSO2DataserviceWizardStepTwo;
@@ -245,17 +244,21 @@
}
private boolean isAllDataValid(){
- if (mappingData.get
- (WSO2DataserviceWizardStepTwo.SQLQUERY_IMAP_NAME).toString().equals("")){
+ String s;
+ s=mappingData.get(WSO2DataserviceWizardStepTwo.SQLQUERY_IMAP_NAME).toString();
+ if (s.equals("")){
showMsg("Name cannot be empty");
return false;
+ }else{
+ if (!WSO2DataserviceWizardStepTwo.isStringValidXmlTag(s)){
+ showMsg("Name string '"+s+"' is not a valid xml tag string.");
+ return false;
+ }
}
-
- if (!mappingData.get
- (WSO2DataserviceWizardStepTwo.SQLQUERY_IMAP_ORDINAL).toString().equals("")){
+ s=mappingData.get(WSO2DataserviceWizardStepTwo.SQLQUERY_IMAP_ORDINAL).toString();
+ if (!s.equals("")){
try{
- Integer.parseInt(mappingData.get
- (WSO2DataserviceWizardStepTwo.SQLQUERY_IMAP_ORDINAL).toString());
+ Integer.parseInt(s);
}catch(Exception e){
showMsg("Ordinal needs to be a numerical value");
return false;
Modified: trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddOutputMappingDialog.java
==============================================================================
--- trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddOutputMappingDialog.java (original)
+++ trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddOutputMappingDialog.java Fri May 16 05:08:17 2008
@@ -200,14 +200,20 @@
}
private boolean isAllDataValid(){
- if (mappingData.get
- (WSO2DataserviceWizardStepTwo.SQLQUERY_OMAP_OUT_FIELD).toString().equals("")){
+ String s;
+ s=mappingData.get(WSO2DataserviceWizardStepTwo.SQLQUERY_OMAP_OUT_FIELD).toString();
+ if (s.equals("")){
showMsg("Output field name cannot be empty.");
return false;
+ }else{
+ if (!WSO2DataserviceWizardStepTwo.isStringValidXmlTag(s)){
+ showMsg("Output field name string '"+s+"' is not a valid xml tag string.");
+ return false;
+ }
}
-
- if (mappingData.get
- (WSO2DataserviceWizardStepTwo.SQLQUERY_OMAP_SQL_COL).toString().equals("")){
+
+ s=mappingData.get(WSO2DataserviceWizardStepTwo.SQLQUERY_OMAP_SQL_COL).toString();
+ if (s.equals("")){
showMsg("SQL column name cannot be empty.");
return false;
}
Modified: trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddQueryDialog.java
==============================================================================
--- trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddQueryDialog.java (original)
+++ trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddQueryDialog.java Fri May 16 05:08:17 2008
@@ -15,17 +15,9 @@
*/
package org.wso2.ws.dataservice.ide.dialog;
-import java.awt.Color;
-import java.awt.Font;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyledText;
@@ -35,13 +27,11 @@
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.internal.gtk.GdkColor;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
@@ -49,9 +39,7 @@
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
-import org.wso2.ws.dataservice.ide.WSO2DataservicePlugin;
import org.wso2.ws.dataservice.ide.constant.WSO2DataserviceWizardConstant;
-import org.wso2.ws.dataservice.ide.context.PersistentDSContext;
import org.wso2.ws.dataservice.ide.util.FontUtil;
import org.wso2.ws.dataservice.ide.wizard.WSO2DataserviceWizardStepTwo;
@@ -78,8 +66,6 @@
private Button editButtonOutputMap;
private Button deleteButtonOutputMap;
-
- private PersistentDSContext dsContext;
private WSO2DataserviceWizardStepTwo parentPage;
private List configList;
private List inputMapList;
@@ -98,7 +84,7 @@
dialogHeadingPrefix = headingPrefix;
isEditMode=headingPrefix.equals(WSO2DataserviceWizardConstant.editTag);
//Obtain the current context from eclipse preferences.
- dsContext = WSO2DataservicePlugin.getDefault().getPersistentDSContext();
+
parentPage = page;
}
@@ -541,32 +527,49 @@
}
private boolean isAllDataValid(){
- if ((!isEditMode)&&(parentPage.getQueryData(configList.get(0).toString())!=null)){
- showMsg("Query Id '"+configList.get(0).toString()+"' already present.");
+ String s;
+ s=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_QUERYID).toString();
+ if ((!isEditMode)&&(parentPage.getQueryData(s)!=null)){
+ showMsg("Query Id '"+s+"' already present.");
return false;
}
- if (configList.get(
- WSO2DataserviceWizardStepTwo.SQLQUERY_QUERYID).toString().trim().equals("")){
+ s=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_QUERYID).toString().trim();
+ if (s.equals("")){
showMsg("Query id is required.");
return false;
}
-
- if (configList.get(
- WSO2DataserviceWizardStepTwo.SQLQUERY_QUERY).toString().trim().equals("")){
+ s=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_QUERY).toString();
+ if (s.trim().equals("")){
showMsg("Sql statement is required.");
return false;
}
-
- if (configList.get(
- WSO2DataserviceWizardStepTwo.SQLQUERY_ELEMENT).toString().trim().equals("")){
+ s=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_ELEMENT).toString();
+ if (s.trim().equals("")){
showMsg("Group by element is required.");
return false;
+ }else{
+ if (!WSO2DataserviceWizardStepTwo.isStringValidXmlTag(s)){
+ showMsg("Group by element string '"+s+"' is not a valid xml tag string.");
+ return false;
+ }
}
-
- if (configList.get(
- WSO2DataserviceWizardStepTwo.SQLQUERY_ROW_NAME).toString().trim().equals("")){
+ s=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_ROW_NAME).toString();
+ if (s.trim().equals("")){
showMsg("Row name is required.");
return false;
+ }else{
+ if (!WSO2DataserviceWizardStepTwo.isStringValidXmlTag(s)){
+ showMsg("Row name string '"+s+"' is not a valid xml tag string.");
+ return false;
+ }
+ }
+
+ s=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_NAME_SPACE).toString();
+ if (!s.trim().equals("")){
+ if (!WSO2DataserviceWizardStepTwo.isStringValidXmlTag(s)){
+ showMsg("Row namespace string '"+s+"' is not a valid xml tag string.");
+ return false;
+ }
}
return true;
}
Modified: trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/wizard/WSO2DataserviceWizardStepTwo.java
==============================================================================
--- trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/wizard/WSO2DataserviceWizardStepTwo.java (original)
+++ trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/wizard/WSO2DataserviceWizardStepTwo.java Fri May 16 05:08:17 2008
@@ -39,7 +39,6 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Dialog;
import org.eclipse.swt.events.*;
import org.wso2.ws.dataservice.ide.WSO2DataservicePlugin;
@@ -482,4 +481,8 @@
return root;
}
+ public static boolean isStringValidXmlTag(String s){
+ java.util.regex.Pattern p= java.util.regex.Pattern.compile("[A-Za-z]([A-Za-z0-9._]|-)*");
+ return p.matcher(s).matches();
+ }
}
\ No newline at end of file
More information about the Ds-java-dev
mailing list