[Ds-java-dev] svn commit r17201 -
trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog
svn at wso2.org
svn at wso2.org
Tue May 20 23:02:06 PDT 2008
Author: sandakith
Date: Tue May 20 23:02:06 2008
New Revision: 17201
Log:
Fixed : Always better to have discriptive variable names (not s,p,lblMsg)
Need to Fix:
Its always better to Add the method java doc comments to the new methods that include certain amount of logic and name itself can not discribe all of its logic.
At any statements that involve = and == keep spaces or not keep spaces
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
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 Tue May 20 23:02:06 2008
@@ -244,21 +244,21 @@
}
private boolean isAllDataValid(){
- String s;
- s=mappingData.get(WSO2DataserviceWizardStepTwo.SQLQUERY_IMAP_NAME).toString();
- if (s.equals("")){
+ String validateString;
+ validateString=mappingData.get(WSO2DataserviceWizardStepTwo.SQLQUERY_IMAP_NAME).toString();
+ if (validateString.equals("")){
showMsg("Name cannot be empty");
return false;
}else{
- if (!WSO2DataserviceWizardStepTwo.isStringValidXmlTag(s)){
- showMsg("Name string '"+s+"' is not a valid xml tag string.");
+ if (!WSO2DataserviceWizardStepTwo.isStringValidXmlTag(validateString)){
+ showMsg("Name string '"+validateString+"' is not a valid xml tag string.");
return false;
}
}
- s=mappingData.get(WSO2DataserviceWizardStepTwo.SQLQUERY_IMAP_ORDINAL).toString();
- if (!s.equals("")){
+ validateString=mappingData.get(WSO2DataserviceWizardStepTwo.SQLQUERY_IMAP_ORDINAL).toString();
+ if (!validateString.equals("")){
try{
- Integer.parseInt(s);
+ Integer.parseInt(validateString);
}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 Tue May 20 23:02:06 2008
@@ -200,20 +200,20 @@
}
private boolean isAllDataValid(){
- String s;
- s=mappingData.get(WSO2DataserviceWizardStepTwo.SQLQUERY_OMAP_OUT_FIELD).toString();
- if (s.equals("")){
+ String validateString;
+ validateString=mappingData.get(WSO2DataserviceWizardStepTwo.SQLQUERY_OMAP_OUT_FIELD).toString();
+ if (validateString.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.");
+ if (!WSO2DataserviceWizardStepTwo.isStringValidXmlTag(validateString)){
+ showMsg("Output field name string '"+validateString+"' is not a valid xml tag string.");
return false;
}
}
- s=mappingData.get(WSO2DataserviceWizardStepTwo.SQLQUERY_OMAP_SQL_COL).toString();
- if (s.equals("")){
+ validateString=mappingData.get(WSO2DataserviceWizardStepTwo.SQLQUERY_OMAP_SQL_COL).toString();
+ if (validateString.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 Tue May 20 23:02:06 2008
@@ -52,7 +52,7 @@
private Button outMappingButton;
private String dialogHeadingPrefix;
private Text queryIDText;
- private Label lblMsg;
+ private Label labelMessage;
private StyledText sqlStatementText;
private Text groupByElementText;
@@ -143,12 +143,12 @@
gd.horizontalSpan = 2;
label.setLayoutData(gd);
- lblMsg = new Label(container, SWT.NULL);
- lblMsg.setForeground(new org.eclipse.swt.graphics.Color(getShell().getDisplay(),255,0,0));
+ labelMessage = new Label(container, SWT.NULL);
+ labelMessage.setForeground(new org.eclipse.swt.graphics.Color(getShell().getDisplay(),255,0,0));
gd = new GridData();
gd.horizontalSpan = 1;
label.setLayoutData(gd);
- lblMsg.setText(" ");
+ labelMessage.setText(" ");
label = new Label(container, SWT.HORIZONTAL | SWT.SEPARATOR);
gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -495,11 +495,11 @@
if (isQueryIDAlreadyPresent(
configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_QUERYID).toString())){
inputMappingButton.setEnabled(isEditMode);
- if (isEditMode) lblMsg.setText(""); else lblMsg.setText("Query ID already exists.");
+ if (isEditMode) labelMessage.setText(""); else labelMessage.setText("Query ID already exists.");
outMappingButton.setEnabled(isEditMode && (!configList.get
(WSO2DataserviceWizardStepTwo.SQLQUERY_ELEMENT).toString().equals("")));
}else{
- lblMsg.setText("");
+ labelMessage.setText("");
if (configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_QUERYID).toString().equals(""))
{
inputMappingButton.setEnabled(false);
@@ -527,47 +527,47 @@
}
private boolean isAllDataValid(){
- String s;
- s=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_QUERYID).toString();
- if ((!isEditMode)&&(parentPage.getQueryData(s)!=null)){
- showMsg("Query Id '"+s+"' already present.");
+ String validateString;
+ validateString=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_QUERYID).toString();
+ if ((!isEditMode)&&(parentPage.getQueryData(validateString)!=null)){
+ showMsg("Query Id '"+validateString+"' already present.");
return false;
}
- s=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_QUERYID).toString().trim();
- if (s.equals("")){
+ validateString=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_QUERYID).toString().trim();
+ if (validateString.equals("")){
showMsg("Query id is required.");
return false;
}
- s=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_QUERY).toString();
- if (s.trim().equals("")){
+ validateString=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_QUERY).toString();
+ if (validateString.trim().equals("")){
showMsg("Sql statement is required.");
return false;
}
- s=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_ELEMENT).toString();
- if (s.trim().equals("")){
+ validateString=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_ELEMENT).toString();
+ if (validateString.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.");
+ if (!WSO2DataserviceWizardStepTwo.isStringValidXmlTag(validateString)){
+ showMsg("Group by element string '"+validateString+"' is not a valid xml tag string.");
return false;
}
}
- s=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_ROW_NAME).toString();
- if (s.trim().equals("")){
+ validateString=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_ROW_NAME).toString();
+ if (validateString.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.");
+ if (!WSO2DataserviceWizardStepTwo.isStringValidXmlTag(validateString)){
+ showMsg("Row name string '"+validateString+"' 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.");
+ validateString=configList.get(WSO2DataserviceWizardStepTwo.SQLQUERY_NAME_SPACE).toString();
+ if (!validateString.trim().equals("")){
+ if (!WSO2DataserviceWizardStepTwo.isStringValidXmlTag(validateString)){
+ showMsg("Row namespace string '"+validateString+"' is not a valid xml tag string.");
return false;
}
}
More information about the Ds-java-dev
mailing list