[207618] Axis2 Preference Page, sequence of fields is wrong.
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/META-INF/MANIFEST.MF
index f83f2bf..e8f4da8 100644
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.consumption.ui;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-Activator: org.eclipse.jst.ws.internal.axis2.consumption.ui.plugin.WebServiceAxis2ConsumptionUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/widgets/Axis2ProxyWidget.java b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/widgets/Axis2ProxyWidget.java
index ec9a381..cdc50d3 100644
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/widgets/Axis2ProxyWidget.java
+++ b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/widgets/Axis2ProxyWidget.java
@@ -17,6 +17,7 @@
* 20070523 174876 sandakith@wso2.com - Lahiru Sandakith, Persist Preferences inside Framework
* 20070823 200413 sandakith@wso2.com - Lahiru Sandakith, Namespace to Package table fix
* 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
+ * 20071030 207618 zina@ca.ibm.com - Zina Mostafia, Page GUI sequence using tab is not correct ( violates Accessibility)
*******************************************************************************/
package org.eclipse.jst.ws.internal.axis2.consumption.ui.widgets;
@@ -28,13 +29,15 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
-import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterContext;
-import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
import org.eclipse.jst.ws.axis2.consumption.core.data.DataModel;
import org.eclipse.jst.ws.axis2.consumption.core.messages.Axis2ConsumptionUIMessages;
import org.eclipse.jst.ws.axis2.consumption.core.utils.WSDLPropertyReader;
+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
+import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterContext;
+import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
import org.eclipse.jst.ws.axis2.core.utils.ClassLoadingUtil;
+import org.eclipse.jst.ws.axis2.ui.plugin.WebServiceAxis2UIPlugin;
+import org.eclipse.jst.ws.internal.ui.common.UIUtils;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.TableEditor;
@@ -44,12 +47,11 @@
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Table;
@@ -82,7 +84,7 @@
private Combo portNameCombo;
private Combo serviceNameCombo;
private Text packageText;
- Label label, fillLabel, fillLabel1, fillLabel2, fillLabel3, fillLabel4, fillLabel5, fillLabel6;
+
//private java.util.List serviceQNameList2 = null;
private Table namespace2packageTable = null;
private Button generateAllCheckBoxButton;
@@ -96,23 +98,12 @@
public WidgetDataEvents addControls( Composite parent, Listener statusListener )
{
context = WebServiceAxis2CorePlugin.getDefault().getAxisEmitterContext();
- Composite mainComp = new Composite( parent, SWT.NONE );
- GridLayout layout = new GridLayout();
- mainComp.setLayout(layout);
-
- layout.numColumns = 3;
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- mainComp.setLayoutData( gd );
-
+ UIUtils uiUtils = new UIUtils(WebServiceAxis2UIPlugin.PLUGIN_ID);
+
+ Composite topComp = uiUtils.createComposite(parent, 2 );
+
// service name
- label = new Label(mainComp, SWT.NULL);
- label.setText(Axis2ConsumptionUIMessages.LABEL_SERVICE_NAME_CAPTION);
-
- serviceNameCombo = new Combo(mainComp, SWT.DROP_DOWN | SWT.BORDER
- | SWT.READ_ONLY);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- serviceNameCombo.setLayoutData(gd);
+ serviceNameCombo = uiUtils.createCombo(topComp, Axis2ConsumptionUIMessages.LABEL_SERVICE_NAME_CAPTION, null, null, SWT.READ_ONLY);
serviceNameCombo.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
//loadPortNames();
@@ -123,13 +114,7 @@
});
// port name
- label = new Label(mainComp, SWT.NULL);
- label.setText(Axis2ConsumptionUIMessages.LABEL_PORTNAME);
- portNameCombo = new Combo(mainComp, SWT.DROP_DOWN | SWT.BORDER
- | SWT.READ_ONLY);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- portNameCombo.setLayoutData(gd);
+ portNameCombo = uiUtils.createCombo(topComp, Axis2ConsumptionUIMessages.LABEL_PORTNAME, null, null, SWT.READ_ONLY);
portNameCombo.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
model.setPortName(portNameCombo.getText());
@@ -139,12 +124,7 @@
});
// Databinding
- label = new Label(mainComp, SWT.NULL);
- label.setText(Axis2ConsumptionUIMessages.LABEL_DATABINDING_CAPTION);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- databindingTypeCombo = new Combo(mainComp, SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
- databindingTypeCombo.setLayoutData(gd);
+ databindingTypeCombo = uiUtils.createCombo(topComp, Axis2ConsumptionUIMessages.LABEL_DATABINDING_CAPTION, null, null, SWT.READ_ONLY);
fillDatabinderCombo();
databindingTypeCombo.select(0);
databindingTypeCombo.addSelectionListener(new SelectionListener() {
@@ -156,40 +136,17 @@
});
// package name
- label = new Label(mainComp, SWT.NULL);
- label.setText(Axis2ConsumptionUIMessages.LABEL_PACKEGE_NAME);
- packageText = new Text(mainComp, SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
-
- packageText.setLayoutData(gd);
- packageText.setText(""); // get this text from the
+ packageText = uiUtils.createText(topComp, Axis2ConsumptionUIMessages.LABEL_PACKEGE_NAME, null, null,SWT.BORDER);
packageText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
model.setPackageText(packageText.getText());
}
});
- //filling label
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- fillLabel = new Label(mainComp, SWT.HORIZONTAL | SWT.NULL);
- fillLabel.setLayoutData(gd);
-
- //Client type label
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- Text clientlabel = new Text(mainComp,SWT.BACKGROUND | SWT.READ_ONLY);
- clientlabel.setText(Axis2ConsumptionUIMessages.LABEL_CLIENT_SIDE);
- clientlabel.setLayoutData(gd);
-
- //client side buttons
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 1;
- syncAndAsyncRadioButton = new Button(mainComp, SWT.RADIO);
- syncAndAsyncRadioButton.setLayoutData(gd);
- syncAndAsyncRadioButton.setText(Axis2ConsumptionUIMessages.LABEL_SYNC_AND_ASYNC);
- syncAndAsyncRadioButton.setVisible(true);
+ //Client type label
+ Group clientTypeGroup = uiUtils.createGroup(parent, Axis2ConsumptionUIMessages.LABEL_CLIENT_SIDE, null, null);
+
+ syncAndAsyncRadioButton = uiUtils.createRadioButton(clientTypeGroup, Axis2ConsumptionUIMessages.LABEL_SYNC_AND_ASYNC, null, null);
syncAndAsyncRadioButton.setSelection(
((context.isAsync() || context.isSync())==false)
?true
@@ -205,12 +162,7 @@
}
});
-
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 1;
- syncOnlyRadioButton = new Button(mainComp, SWT.RADIO);
- syncOnlyRadioButton.setLayoutData(gd);
- syncOnlyRadioButton.setText(Axis2ConsumptionUIMessages.LABEL_SYNC);
+ syncOnlyRadioButton = uiUtils.createRadioButton(clientTypeGroup, Axis2ConsumptionUIMessages.LABEL_SYNC, null, null);
syncOnlyRadioButton.setSelection(context.isSync() && !context.isAsync());
syncOnlyRadioButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
@@ -221,12 +173,7 @@
}
});
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 1;
- asyncOnlyRadioButton = new Button(mainComp, SWT.RADIO);
- asyncOnlyRadioButton.setLayoutData(gd);
- asyncOnlyRadioButton
- .setText(Axis2ConsumptionUIMessages.LABEL_ASYNC);
+ asyncOnlyRadioButton = uiUtils.createRadioButton(clientTypeGroup, Axis2ConsumptionUIMessages.LABEL_ASYNC, null, null);
asyncOnlyRadioButton.setSelection(context.isAsync() && !context.isSync());
asyncOnlyRadioButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
@@ -241,18 +188,10 @@
model.setSync(context.isSync());
model.setASync(context.isAsync());
- //filling label
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- fillLabel = new Label(mainComp, SWT.HORIZONTAL | SWT.NULL);
- fillLabel.setLayoutData(gd);
+ // generate test case option
- // generate test case option
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- testCaseCheckBoxButton = new Button(mainComp, SWT.CHECK);
- testCaseCheckBoxButton.setLayoutData(gd);
- testCaseCheckBoxButton.setText(Axis2ConsumptionUIMessages.LABEL_GENERATE_TESTCASE_CAPTION);
+ Composite checkBoxes = uiUtils.createComposite(parent, 1);
+ testCaseCheckBoxButton = uiUtils.createCheckbox(checkBoxes, Axis2ConsumptionUIMessages.LABEL_GENERATE_TESTCASE_CAPTION, null, null);
testCaseCheckBoxButton.setSelection(context.isClientTestCase());
model.setTestCaseCheck(context.isClientTestCase());
testCaseCheckBoxButton.addSelectionListener(new SelectionListener() {
@@ -265,12 +204,8 @@
// generate all
- generateAllCheckBoxButton = new Button(mainComp, SWT.CHECK);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- generateAllCheckBoxButton.setLayoutData(gd);
+ generateAllCheckBoxButton = uiUtils.createCheckbox(checkBoxes, Axis2ConsumptionUIMessages.LABEL_GENERATE_ALL, null, null);
generateAllCheckBoxButton.setSelection(context.isClientGenerateAll());
- generateAllCheckBoxButton.setText(Axis2ConsumptionUIMessages.LABEL_GENERATE_ALL);
generateAllCheckBoxButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
model.setGenerateAllCheck(generateAllCheckBoxButton.getSelection());
@@ -279,28 +214,13 @@
}
});
-
- //filling label
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- fillLabel3 = new Label(mainComp, SWT.HORIZONTAL | SWT.NULL);
-
- //filling label
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- fillLabel4 = new Label(mainComp, SWT.HORIZONTAL | SWT.NULL);
-
- //add a table to set namespace to package mapping
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 3;
- gd.verticalSpan = 5;
-
- namespace2packageTable = new Table(mainComp,SWT.BORDER|SWT.MULTI);
+
+ new Label(parent,SWT.HORIZONTAL);
+ namespace2packageTable = new Table(parent,SWT.BORDER|SWT.MULTI);
namespace2packageTable.setLinesVisible(true);
namespace2packageTable.setHeaderVisible(true);
namespace2packageTable.setEnabled(true);
- namespace2packageTable.setLayoutData(gd);
-
+
declareColumn(namespace2packageTable,
350, //a default width until we adjust
Axis2ConsumptionUIMessages.LABEL_NAMESPACE);
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis2.ui/META-INF/MANIFEST.MF
index 504644b..b01594a 100644
--- a/bundles/org.eclipse.jst.ws.axis2.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.axis2.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.ui;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-Activator: org.eclipse.jst.ws.axis2.ui.plugin.WebServiceAxis2UIPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java
index 90afd2a..65100ee 100644
--- a/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java
+++ b/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java
@@ -23,6 +23,7 @@
* 20070604 190067 pmoogk@ca.ibm.com - Peter Moogk
* 20070824 200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
* 20070827 188732 sandakith@wso2.com - Lahiru Sandakith, Restore defaults for preferences
+ * 20071030 207618 zina@ca.ibm.com - Zina Mostafia, Page GUI sequence using tab is not correct ( violates Accessibility)
*******************************************************************************/
package org.eclipse.jst.ws.internal.axis2.consumption.ui.preferences;
@@ -38,6 +39,8 @@
import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
import org.eclipse.jst.ws.axis2.core.utils.Axis2CoreUtils;
import org.eclipse.jst.ws.axis2.core.utils.RuntimePropertyUtils;
+import org.eclipse.jst.ws.axis2.ui.plugin.WebServiceAxis2UIPlugin;
+import org.eclipse.jst.ws.internal.ui.common.UIUtils;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -51,6 +54,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TabFolder;
@@ -206,33 +210,24 @@
codegenPreferencesItem.setText(Axis2CoreUIMessages.AXIS2_PREFERENCES);
codegenPreferencesItem.setToolTipText(Axis2CoreUIMessages.AXIS2_PREFERENCES_TOOLTIP);
- Composite codegenGroup = new Composite(axis2PreferenceTab, SWT.NONE);
+ UIUtils uiUtils = new UIUtils(WebServiceAxis2UIPlugin.PLUGIN_ID);
+ Composite codegenGroup = uiUtils.createComposite(axis2PreferenceTab, 1);
codegenPreferencesItem.setControl(codegenGroup);
codegenGroup.setToolTipText(Axis2CoreUIMessages.AXIS2_PREFERENCES_TOOLTIP);
- layout = new GridLayout();
- codegenGroup.setLayout(layout);
- layout.numColumns = 2;
- layout.marginHeight = 10;
- gd = new GridData(GridData.FILL_BOTH);
- codegenGroup.setLayoutData( gd );
+ ///////////////////////////////////////////////////////////////////////////////////////////
//Service Codegen Options
- Text serviceCodegenLabel = new Text(codegenGroup,SWT.BACKGROUND | SWT.READ_ONLY);
- serviceCodegenLabel.setText( Axis2CoreUIMessages.LABEL_WEB_SERVICE_CODEGEN);
+ Composite serviceCodegenGroup = uiUtils.createComposite(codegenGroup, 1);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- serviceCodegenLabel.setLayoutData(gd);
-
+ Text serviceCodegenGroupLabel= new Text(serviceCodegenGroup, SWT.READ_ONLY);
+ serviceCodegenGroupLabel.setText(Axis2CoreUIMessages.LABEL_WEB_SERVICE_CODEGEN);
+
+ Composite dataBindComp = uiUtils.createComposite(serviceCodegenGroup, 2);
//Data binding
- Label databindingLabel = new Label( codegenGroup, SWT.NONE );
- databindingLabel.setText( Axis2CoreUIMessages.LABEL_DATABINDING);
-
+ serviceDatabindingCombo = uiUtils.createCombo(dataBindComp, Axis2CoreUIMessages.LABEL_DATABINDING, null, null, SWT.READ_ONLY);
//Data binding items
final String[] databindingItems = {context.getServiceDatabinding().toUpperCase()};
-
- serviceDatabindingCombo = new Combo(codegenGroup,SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
serviceDatabindingCombo.setItems(databindingItems);
serviceDatabindingCombo.select(0);
context.setServiceDatabinding(serviceDatabindingCombo.getItem(0));
@@ -244,10 +239,7 @@
});
//the server side interface option
- generateServerSideInterfaceCheckBoxButton =
- new Button(codegenGroup, SWT.CHECK);
- generateServerSideInterfaceCheckBoxButton.setText(
- Axis2CoreUIMessages.LABEL_GENERATE_SERVERSIDE_INTERFACE);
+ generateServerSideInterfaceCheckBoxButton = uiUtils.createCheckbox(serviceCodegenGroup, Axis2CoreUIMessages.LABEL_GENERATE_SERVERSIDE_INTERFACE, null, null);
generateServerSideInterfaceCheckBoxButton.setSelection(
context.isServiceInterfaceSkeleton());
generateServerSideInterfaceCheckBoxButton.addSelectionListener(new SelectionListener() {
@@ -259,14 +251,9 @@
}
});
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- generateServerSideInterfaceCheckBoxButton.setLayoutData(gd);
-
// generate all
- generateAllCheckBoxButton = new Button(codegenGroup, SWT.CHECK);
+ generateAllCheckBoxButton = uiUtils.createCheckbox(serviceCodegenGroup, Axis2CoreUIMessages.LABEL_GENERATE_ALL, null,null);
generateAllCheckBoxButton.setSelection(context.isServiceGenerateAll());
- generateAllCheckBoxButton.setText(Axis2CoreUIMessages.LABEL_GENERATE_ALL);
generateAllCheckBoxButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
context.setServiceGenerateAll(generateAllCheckBoxButton.getSelection());
@@ -275,37 +262,19 @@
}
});
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- generateAllCheckBoxButton.setLayoutData(gd);
-
+ uiUtils.createHorizontalSeparator(codegenGroup,2);
///////////////////////////////////////////////////////////////////////////////////////////
- //seperator
- Label seperatorLabel0 = new Label( codegenGroup, SWT.SEPARATOR | SWT.HORIZONTAL );
-
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- gd.verticalIndent=5;
- seperatorLabel0.setLayoutData(gd);
-
+
///Client Codegen Options
- Text clientCodegenLabel = new Text(codegenGroup,SWT.BACKGROUND | SWT.READ_ONLY);
- clientCodegenLabel.setText( Axis2CoreUIMessages.LABEL_WEB_SERVICE_CLIENT_CODEGEN);
-
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- gd.verticalIndent=5;
- clientCodegenLabel.setLayoutData(gd);
-
- //Client type label
- Label clientLabel = new Label(codegenGroup, SWT.HORIZONTAL | SWT.NULL);
- clientLabel.setText(Axis2CoreUIMessages.LABEL_CLIENT_SIDE);
+ Composite clientCodegenGroup = uiUtils.createComposite(codegenGroup, 1);
+ Text clientCodegenGroupLabel= new Text(clientCodegenGroup, SWT.READ_ONLY);
+ clientCodegenGroupLabel.setText(Axis2CoreUIMessages.LABEL_WEB_SERVICE_CLIENT_CODEGEN);
+
+ Group clientModeRadioComp = uiUtils.createGroup(clientCodegenGroup, Axis2CoreUIMessages.LABEL_CLIENT_SIDE, null, null);
//client side buttons
- syncAndAsyncRadioButton = new Button(codegenGroup, SWT.RADIO);
- syncAndAsyncRadioButton.setText(Axis2CoreUIMessages.LABEL_SYNC_AND_ASYNC);
- syncAndAsyncRadioButton.setVisible(true);
+ syncAndAsyncRadioButton = uiUtils.createRadioButton(clientModeRadioComp, Axis2CoreUIMessages.LABEL_SYNC_AND_ASYNC, null, null);
syncAndAsyncRadioButton.setSelection(
((context.isSync() || context.isAsync())==false)
?true
@@ -321,11 +290,7 @@
}
});
- // Skip a column
- new Label( codegenGroup, SWT.NONE );
-
- syncOnlyRadioButton = new Button(codegenGroup, SWT.RADIO);
- syncOnlyRadioButton.setText(Axis2CoreUIMessages.LABEL_SYNC);
+ syncOnlyRadioButton = uiUtils.createRadioButton(clientModeRadioComp,Axis2CoreUIMessages.LABEL_SYNC, null, null);
syncOnlyRadioButton.setSelection(context.isSync() && !context.isAsync() );
syncOnlyRadioButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
@@ -336,11 +301,7 @@
}
});
- // Skip a column
- new Label( codegenGroup, SWT.NONE );
-
- asyncOnlyRadioButton = new Button(codegenGroup, SWT.RADIO);
- asyncOnlyRadioButton.setText(Axis2CoreUIMessages.LABEL_ASYNC);
+ asyncOnlyRadioButton = uiUtils.createRadioButton(clientModeRadioComp, Axis2CoreUIMessages.LABEL_ASYNC, null, null);
asyncOnlyRadioButton.setSelection(context.isAsync() && !context.isSync());
asyncOnlyRadioButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
@@ -351,11 +312,8 @@
}
});
- //Data binding
- Label clientDatabindingLabel = new Label( codegenGroup, SWT.NONE );
- clientDatabindingLabel.setText( Axis2CoreUIMessages.LABEL_DATABINDING);
-
- clientDatabindingCombo = new Combo(codegenGroup,SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
+ Composite dataBind = uiUtils.createComposite(clientCodegenGroup, 2);
+ clientDatabindingCombo = uiUtils.createCombo(dataBind, Axis2CoreUIMessages.LABEL_DATABINDING, null, null, SWT.READ_ONLY);
clientDatabindingCombo.setItems(databindingItems);
clientDatabindingCombo.select(0);
context.setClientDatabinding(clientDatabindingCombo.getItem(0));
@@ -367,26 +325,19 @@
});
// generate test case option
- clientTestCaseCheckBoxButton = new Button(codegenGroup, SWT.CHECK);
- clientTestCaseCheckBoxButton.setText(Axis2CoreUIMessages.LABEL_GENERATE_TESTCASE_CAPTION);
+ clientTestCaseCheckBoxButton = uiUtils.createCheckbox(clientCodegenGroup, Axis2CoreUIMessages.LABEL_GENERATE_TESTCASE_CAPTION, null, null);
clientTestCaseCheckBoxButton.setSelection(context.isClientTestCase());
clientTestCaseCheckBoxButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
context.setClientTestCase(clientTestCaseCheckBoxButton.getSelection());
}
-
public void widgetDefaultSelected(SelectionEvent e) {
}
});
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- clientTestCaseCheckBoxButton.setLayoutData(gd);
-
// generate all
- clientGenerateAllCheckBoxButton = new Button(codegenGroup, SWT.CHECK);
+ clientGenerateAllCheckBoxButton = uiUtils.createCheckbox(clientCodegenGroup, Axis2CoreUIMessages.LABEL_GENERATE_ALL, null, null);
clientGenerateAllCheckBoxButton.setSelection(context.isClientGenerateAll());
- clientGenerateAllCheckBoxButton.setText(Axis2CoreUIMessages.LABEL_GENERATE_ALL);
clientGenerateAllCheckBoxButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
context.setClientGenerateAll(clientGenerateAllCheckBoxButton.getSelection());
@@ -395,37 +346,23 @@
}
});
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- clientGenerateAllCheckBoxButton.setLayoutData(gd);
-
+ uiUtils.createHorizontalSeparator(codegenGroup,2);
+
///////////////////////////////////////////////////////////////////////////////////////////
- //seperator
- Label seperatorLabel11 = new Label( codegenGroup, SWT.SEPARATOR | SWT.HORIZONTAL );
-
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- gd.verticalIndent=5;
- seperatorLabel11.setLayoutData(gd);
-
///AAR Options
- Text aarLabel = new Text(codegenGroup,SWT.BACKGROUND | SWT.READ_ONLY);
- aarLabel.setText( Axis2CoreUIMessages.LABEL_WEB_SERVICE_AAR);
+ Composite aarGroup = uiUtils.createComposite(codegenGroup,1);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- gd.verticalIndent=5;
- aarLabel.setLayoutData(gd);
+ Text arrGroupLabel= new Text(aarGroup, SWT.READ_ONLY);
+ arrGroupLabel.setText(Axis2CoreUIMessages.LABEL_WEB_SERVICE_AAR);
+
+ Composite aarExtGroup = uiUtils.createComposite(aarGroup,2);
//aar extention
- Label aarExtentionLabel = new Label( codegenGroup, SWT.NONE );
- aarExtentionLabel.setText( Axis2CoreUIMessages.LABEL_AAR_EXTENTION);
-
+ aarExtensionCombo = uiUtils.createCombo(aarExtGroup, Axis2CoreUIMessages.LABEL_AAR_EXTENTION, null, null, SWT.READ_ONLY );
+
//AAR extention items
final String[] aarExtentionItems = { Axis2Constants.AAR };
-
- aarExtensionCombo = new Combo(codegenGroup,SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
aarExtensionCombo.setItems(aarExtentionItems);
aarExtensionCombo.select(0);
context.setAarExtention( aarExtensionCombo.getItem(0) );
@@ -439,7 +376,6 @@
axis2PreferenceTab.setEnabled(true);
axis2PreferenceTab.setVisible(true);
-
return mainComp;
}
