[Ds-java-dev] svn commit r16736 - in trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide: dialog wizard

[svn at wso2.org]

Author: sandakith
Date: Fri May  9 02:51:16 2008
New Revision: 16736

Log:
Fixing the reported issues in https://wso2.org/jira/browse/DS-4

Modified:
   trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddOperationDialog.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/WSO2DataserviceWizardStepThree.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/AddOperationDialog.java
==============================================================================
--- trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddOperationDialog.java	(original)
+++ trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/dialog/AddOperationDialog.java	Fri May  9 02:51:16 2008
@@ -255,6 +255,14 @@
 		configList.add(operationNameText.getText());
 		configList.add(paramText.getText());
 	}
+	
+	/**
+	 * Get the Configuration List
+	 * @return
+	 */
+	public List getOperationList() {
+		return configList;
+	}
 
 
 

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  9 02:51:16 2008
@@ -351,6 +351,10 @@
 		configList.add(sqlStatementText.getText());
 	}
 	
+	/**
+	 * Return the current Config List
+	 * @return
+	 */
 	public List getQueryList(){
 		return configList;
 	}

Modified: trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/wizard/WSO2DataserviceWizardStepThree.java
==============================================================================
--- trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/wizard/WSO2DataserviceWizardStepThree.java	(original)
+++ trunk/solutions/data-services/java/modules/ide/src/org/wso2/ws/dataservice/ide/wizard/WSO2DataserviceWizardStepThree.java	Fri May  9 02:51:16 2008
@@ -83,11 +83,12 @@
 		gd.horizontalSpan = 7;
 		label.setLayoutData(gd);
 
-		table = new Table(container,SWT.SINGLE|SWT.FULL_SELECTION|SWT.CHECK);
+		table = new Table(container,
+				SWT.SINGLE|SWT.FULL_SELECTION|SWT.CHECK |SWT.V_SCROLL|SWT.H_SCROLL);
 		table.setLinesVisible(true);
 		table.setHeaderVisible(true); 
 		table.setLayoutData(gd);
-		declareColumn(table,200,"Current Operations");
+		declareColumn(table,500,"Current Operations");
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 7;
 		gd.heightHint = 100;
@@ -181,7 +182,9 @@
 				TableItem[] items = new TableItem[operationCount]; // An item for each field
 				for (int i = 0; i < operationCount; i++) {
 					items[i] = new TableItem(table, SWT.NONE);
-					items[i].setText(1, fillItems.get(i).toString());
+					//Get the Operation ID
+					List iOperationItem = (List)fillItems.get(i);
+					items[i].setText(iOperationItem.get(0).toString());
 					items[i].setChecked(true);//check them all by default
 				}
 				updateStatus(null);
@@ -217,7 +220,7 @@
 		addOperationDialog.open();
 
 		noOfLoadedOperations++;
-		operationToUIMapping.add("Test"+noOfLoadedOperations);
+		operationToUIMapping.add(addOperationDialog.getOperationList());
 		updateTable(operationToUIMapping);
 	}
 

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  9 02:51:16 2008
@@ -80,11 +80,12 @@
 		gd.horizontalSpan = 7;
 		label.setLayoutData(gd);
 
-		table = new Table(container,SWT.SINGLE|SWT.FULL_SELECTION|SWT.CHECK);
+		table = new Table(container,
+				SWT.SINGLE|SWT.FULL_SELECTION|SWT.CHECK|SWT.V_SCROLL|SWT.H_SCROLL);
 		table.setLinesVisible(true);
 		table.setHeaderVisible(true); 
 		table.setLayoutData(gd);
-		declareColumn(table,200,"Current Queries");
+		declareColumn(table,500,"Current Queries");
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalSpan = 7;
 		gd.heightHint = 100;
@@ -180,11 +181,14 @@
 				TableItem[] items = new TableItem[queryCount]; // An item for each field
 				for (int i = 0; i < queryCount; i++) {
 					items[i] = new TableItem(table, SWT.NONE);
-					items[i].setText(1, fillItems.get(i).toString());
+					//Get the Query ID
+					List iQueryItem = (List)fillItems.get(i);
+					items[i].setText(iQueryItem.get(0).toString());
 					items[i].setChecked(true);//check them all by default
 				}
 				updateStatus(null);
 			}
+			table.redraw();
 		}
 		table.setVisible(true);
 	}
@@ -216,7 +220,7 @@
 		addQueryDialog.open();
 
 		noOfLoadedQuery++;
-		queryToUIMapping.add("Test"+noOfLoadedQuery);
+		queryToUIMapping.add(addQueryDialog.getQueryList());
 		updateTable(queryToUIMapping);
 	}