diff options
28 files changed, 160 insertions, 173 deletions
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/TextControlBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/TextControlBP.java index 6b2fc03d5..2d869eb3a 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/TextControlBP.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/TextControlBP.java @@ -13,9 +13,9 @@ package org.eclipse.jubula.client.ui.rcp.businessprocess; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.rcp.widgets.CheckedText; import org.eclipse.jubula.client.ui.widgets.DirectCombo; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Text; /** @@ -37,8 +37,8 @@ public class TextControlBP { */ @SuppressWarnings("unchecked") public static void setText(String text, Control control) { - if (control instanceof JBText) { - ((JBText)control).setText(text); + if (control instanceof Text) { + ((Text)control).setText(text); } else if (control instanceof DirectCombo) { ((DirectCombo<String>)control).setSelectedObject(text); } else if (control instanceof CCombo) { @@ -54,8 +54,8 @@ public class TextControlBP { * @return the text of the given control */ public static String getText(Control control) { - if (control instanceof JBText) { - return ((JBText)control).getText(); + if (control instanceof Text) { + return ((Text)control).getText(); } else if (control instanceof DirectCombo) { return ((DirectCombo)control).getText(); } else if (control instanceof CCombo) { @@ -69,8 +69,8 @@ public class TextControlBP { * @param control the current control */ public static void selectAll(Control control) { - if (control instanceof JBText) { - ((JBText)control).selectAll(); + if (control instanceof Text) { + ((Text)control).selectAll(); } else if (!(control instanceof DirectCombo || control instanceof CCombo)) { @@ -84,8 +84,8 @@ public class TextControlBP { * @param index the index to set the selection */ public static void setSelection(Control control, int index) { - if (control instanceof JBText) { - ((JBText)control).setSelection(index); + if (control instanceof Text) { + ((Text)control).setSelection(index); } else if (!(control instanceof DirectCombo || control instanceof CCombo)) { diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/AUTPropertiesDialog.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/AUTPropertiesDialog.java index 8fff729c8..1a0a27cc3 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/AUTPropertiesDialog.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/AUTPropertiesDialog.java @@ -46,7 +46,6 @@ import org.eclipse.jubula.client.ui.rcp.wizards.pages.AUTSettingWizardPage; import org.eclipse.jubula.client.ui.utils.DialogUtils; import org.eclipse.jubula.client.ui.utils.LayoutUtil; import org.eclipse.jubula.client.ui.widgets.DirectCombo; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException; import org.eclipse.jubula.tools.constants.AutConfigConstants; import org.eclipse.jubula.tools.constants.CommandConstants; @@ -539,12 +538,12 @@ public class AUTPropertiesDialog extends TitleAreaDialog { * @param parent The parent composite. */ private void createAutConfigButtons(Composite parent) { - JBText invisibleText = new JBText(parent, SWT.BORDER); + Text invisibleText = new Text(parent, SWT.BORDER); invisibleText.setVisible(false); GridData invisibleGrid = new GridData(); invisibleGrid.widthHint = 10; invisibleText.setLayoutData(invisibleGrid); - JBText invisibleText2 = new JBText(parent, SWT.BORDER); + Text invisibleText2 = new Text(parent, SWT.BORDER); invisibleText2.setVisible(false); invisibleText2.setLayoutData(invisibleGrid); diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/AbstractEditParametersDialog.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/AbstractEditParametersDialog.java index 494ddb828..abff4e155 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/AbstractEditParametersDialog.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/AbstractEditParametersDialog.java @@ -42,7 +42,6 @@ import org.eclipse.jubula.client.ui.rcp.Plugin; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; import org.eclipse.jubula.tools.constants.StringConstants; import org.eclipse.jubula.tools.constants.TestDataConstants; @@ -985,7 +984,7 @@ public abstract class AbstractEditParametersDialog extends TitleAreaDialog { final Label nameLabel = new Label(nameFieldArea, SWT.NONE); nameLabel.setText(getEditedObjectNameString()); - final JBText nameField = new JBText(nameFieldArea, + final Text nameField = new Text(nameFieldArea, SWT.SINGLE | SWT.BORDER); final GridData nameFieldGridData = new GridData(); nameFieldGridData.grabExcessHorizontalSpace = true; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/AddEventHandlerDialog.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/AddEventHandlerDialog.java index ce1928bfd..95f15bc86 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/AddEventHandlerDialog.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/AddEventHandlerDialog.java @@ -28,7 +28,6 @@ import org.eclipse.jubula.client.ui.constants.IconConstants; import org.eclipse.jubula.client.ui.rcp.Plugin; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; import org.eclipse.jubula.tools.constants.StringConstants; import org.eclipse.swt.SWT; @@ -45,6 +44,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Spinner; +import org.eclipse.swt.widgets.Text; /** @@ -178,7 +178,7 @@ public class AddEventHandlerDialog extends TitleAreaDialog { // create a non-editable text field for the name of the event handler Label eventNameLabel = new Label(parent, SWT.NONE); eventNameLabel.setText(Messages.AddEventHandlerDialogLabel); - JBText nameText = new JBText(parent, SWT.FILL | SWT.BORDER); + Text nameText = new Text(parent, SWT.FILL | SWT.BORDER); GridData eventNameGridData = new GridData(SWT.FILL, SWT.NONE, true, false); nameText.setLayoutData(eventNameGridData); diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/CompNameExistsDialog.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/CompNameExistsDialog.java index f22f69947..7c0eaa961 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/CompNameExistsDialog.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/CompNameExistsDialog.java @@ -17,7 +17,6 @@ import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; import org.eclipse.jubula.tools.constants.StringConstants; import org.eclipse.jubula.tools.exception.JBException; @@ -33,6 +32,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; /** @@ -56,7 +56,7 @@ public class CompNameExistsDialog extends TitleAreaDialog { private Label m_typeLabel; /** The name Text-Field */ - private JBText m_nameField; + private Text m_nameField; /** * @param parentShell The parent shell. @@ -132,7 +132,7 @@ public class CompNameExistsDialog extends TitleAreaDialog { final Label messageLabel2 = new Label(nameFieldArea, SWT.NONE); messageLabel2.setText(Messages.CompNameExistsDialogPressOkOrEnter); - m_nameField = new JBText(nameFieldArea, SWT.SINGLE | SWT.BORDER); + m_nameField = new Text(nameFieldArea, SWT.SINGLE | SWT.BORDER); final GridData nameFieldGridData = new GridData(); nameFieldGridData.grabExcessHorizontalSpace = true; nameFieldGridData.horizontalAlignment = GridData.FILL; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/EnterAutIdDialog.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/EnterAutIdDialog.java index c964cab40..d7ee03480 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/EnterAutIdDialog.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/EnterAutIdDialog.java @@ -18,7 +18,6 @@ import org.eclipse.jface.databinding.swt.SWTObservables; import org.eclipse.jubula.client.ui.dialogs.AbstractValidatedDialog; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -26,6 +25,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; /** @@ -75,7 +75,7 @@ public class EnterAutIdDialog extends AbstractValidatedDialog { area.setLayoutData(gridData); area.setLayout(new GridLayout(2, false)); - JBText autIdField = createAutIdText(area); + Text autIdField = createAutIdText(area); gridData = new GridData(SWT.FILL, SWT.FILL, true, false); LayoutUtil.addToolTipAndMaxWidth(gridData, autIdField); autIdField.setLayoutData(gridData); @@ -105,9 +105,9 @@ public class EnterAutIdDialog extends AbstractValidatedDialog { * @param area The parent for the created widgets. * @return the created text field. */ - private JBText createAutIdText(Composite area) { + private Text createAutIdText(Composite area) { new Label(area, SWT.NONE).setText(Messages.EnterAutIdDialogAutIdLabel); - return new JBText(area, SWT.SINGLE | SWT.BORDER); + return new Text(area, SWT.SINGLE | SWT.BORDER); } /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/EnterLogicalCompNameDialog.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/EnterLogicalCompNameDialog.java index 9ab838eb1..f0f0fbb20 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/EnterLogicalCompNameDialog.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/EnterLogicalCompNameDialog.java @@ -18,7 +18,6 @@ import org.eclipse.jubula.client.core.businessprocess.IComponentNameMapper; import org.eclipse.jubula.client.ui.dialogs.AbstractValidatedDialog; import org.eclipse.jubula.client.ui.rcp.databinding.validators.ComponentNameValidator; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -26,6 +25,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; @@ -85,7 +85,7 @@ public abstract class EnterLogicalCompNameDialog area.setLayoutData(gridData); area.setLayout(new GridLayout(2, false)); - JBText componentNameField = createComponentName(area); + Text componentNameField = createComponentName(area); gridData = new GridData(SWT.FILL, SWT.FILL, true, false); LayoutUtil.addToolTipAndMaxWidth(gridData, componentNameField); componentNameField.setLayoutData(gridData); @@ -117,11 +117,11 @@ public abstract class EnterLogicalCompNameDialog * @param area The parent for the created widgets. * @return the created text field. */ - private JBText createComponentName(Composite area) { + private Text createComponentName(Composite area) { new Label(area, SWT.NONE).setText(org.eclipse.jubula.client.ui.rcp.i18n. Messages.NewCAPDialogComponentNameLabel); - JBText componentNameField = new JBText(area, SWT.SINGLE | SWT.BORDER); + Text componentNameField = new Text(area, SWT.SINGLE | SWT.BORDER); return componentNameField; } diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/EnterTestDataManagerDialog.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/EnterTestDataManagerDialog.java index e2da17312..9e21662ed 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/EnterTestDataManagerDialog.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/EnterTestDataManagerDialog.java @@ -20,7 +20,6 @@ import org.eclipse.jubula.client.ui.dialogs.AbstractValidatedDialog; import org.eclipse.jubula.client.ui.rcp.databinding.validators.TestDataManagerNameValidator; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -28,6 +27,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; @@ -82,7 +82,7 @@ public abstract class EnterTestDataManagerDialog area.setLayoutData(gridData); area.setLayout(new GridLayout(2, false)); - JBText testDataCubeNameField = createTestDataManagerName(area); + Text testDataCubeNameField = createTestDataManagerName(area); gridData = new GridData(SWT.FILL, SWT.FILL, true, false); LayoutUtil.addToolTipAndMaxWidth(gridData, testDataCubeNameField); testDataCubeNameField.setLayoutData(gridData); @@ -114,11 +114,11 @@ public abstract class EnterTestDataManagerDialog * @param area The parent for the created widgets. * @return the created text field. */ - private JBText createTestDataManagerName(Composite area) { + private Text createTestDataManagerName(Composite area) { new Label(area, SWT.NONE).setText( Messages.EnterTestDataCubeDialogTestDataCubeNameLabel); - JBText testDataCubeNameField = - new JBText(area, SWT.SINGLE | SWT.BORDER); + Text testDataCubeNameField = + new Text(area, SWT.SINGLE | SWT.BORDER); return testDataCubeNameField; } diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/InputDialog.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/InputDialog.java index 0c9af1020..5e37f7565 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/InputDialog.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/InputDialog.java @@ -16,7 +16,6 @@ import org.eclipse.jubula.client.ui.rcp.Plugin; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.rcp.utils.Utils; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.tools.constants.StringConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -31,6 +30,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; @@ -57,7 +57,7 @@ public class InputDialog extends TitleAreaDialog { /** = m_nameField.getText() */ private String m_name = StringConstants.EMPTY; /** the name textfield */ - private JBText m_nameField; + private Text m_nameField; /** the message depends on the object that is selected */ private String m_message = StringConstants.EMPTY; /** the errormessage depends on the object that is selected */ @@ -192,7 +192,7 @@ public class InputDialog extends TitleAreaDialog { */ private void createNameField(Composite area) { new Label(area, SWT.NONE).setText(m_label); - m_nameField = new JBText(area, SWT.SINGLE | SWT.BORDER); + m_nameField = new Text(area, SWT.SINGLE | SWT.BORDER); GridData gridData = newGridData(false); LayoutUtil.addToolTipAndMaxWidth(gridData, m_nameField); m_nameField.setLayoutData(gridData); diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/NewCAPDialog.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/NewCAPDialog.java index d10831d04..f102ca3eb 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/NewCAPDialog.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/NewCAPDialog.java @@ -34,7 +34,6 @@ import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.rcp.widgets.CompNamePopUpTextField; import org.eclipse.jubula.client.ui.utils.LayoutUtil; import org.eclipse.jubula.client.ui.widgets.DirectCombo; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; import org.eclipse.jubula.tools.constants.StringConstants; import org.eclipse.jubula.tools.exception.Assert; @@ -55,6 +54,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; @@ -79,7 +79,7 @@ public class NewCAPDialog extends TitleAreaDialog { /** horizontal span = 3 */ private static final int HORIZONTAL_SPAN = 3; /** the m_text field for the CapPO name */ - private JBText m_capNameField; + private Text m_capNameField; /** the m_text field for the component name */ private CompNamePopUpTextField m_componentNameField; /** the combo box for the components */ @@ -227,7 +227,7 @@ public class NewCAPDialog extends TitleAreaDialog { private void createCapNameField(Composite area) { Label label = new Label(area, SWT.NONE); label.setText(Messages.NewCAPDialogCapNameLabel); - m_capNameField = new JBText(area, SWT.SINGLE | SWT.BORDER); + m_capNameField = new Text(area, SWT.SINGLE | SWT.BORDER); GridData gridData = newGridData(); LayoutUtil.addToolTipAndMaxWidth(gridData, m_capNameField); m_capNameField.setLayoutData(gridData); diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/VersionDialog.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/VersionDialog.java index 62d349b3f..1d1e49318 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/VersionDialog.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/dialogs/VersionDialog.java @@ -17,7 +17,6 @@ import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.rcp.utils.Utils; import org.eclipse.jubula.client.ui.rcp.widgets.CheckedIntText; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.tools.constants.StringConstants; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; @@ -30,6 +29,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; @@ -57,9 +57,9 @@ public class VersionDialog extends TitleAreaDialog { /** int value of minor version field */ private Integer m_minorVersionNumber = null; /** the major version textfield */ - private JBText m_majorVersionField; + private Text m_majorVersionField; /** the minor version textfield */ - private JBText m_minorVersionField; + private Text m_minorVersionField; /** the message depends on the object that is selected */ private String m_message = StringConstants.EMPTY; /** the errormessage depends on the object that is selected */ diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/preferences/TestResultPreferencePage.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/preferences/TestResultPreferencePage.java index b45558766..ec42c0de5 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/preferences/TestResultPreferencePage.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/preferences/TestResultPreferencePage.java @@ -22,7 +22,6 @@ import org.eclipse.jubula.client.ui.rcp.Plugin; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.rcp.widgets.I18nStringCombo; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.tools.constants.StringConstants; import org.eclipse.jubula.tools.exception.Assert; import org.eclipse.swt.SWT; @@ -44,11 +43,10 @@ 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.Text; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; - - /** * @author BREDEX GmbH * @created 10.01.2005 @@ -82,7 +80,7 @@ public class TestResultPreferencePage extends PreferencePage "TestResultViewPreferencePage"; //$NON-NLS-1$ /** textfield to define path to xml Generation */ - private JBText m_path = null; + private Text m_path = null; /** Checkbox to decide Open ResultView */ private Button m_openResultView = null; @@ -118,7 +116,7 @@ public class TestResultPreferencePage extends PreferencePage * textfield to define maximum number of results in the test result summary * view */ - private JBText m_numberOfDays = null; + private Text m_numberOfDays = null; /** * <code>m_testExecRememberValue</code> @@ -373,8 +371,8 @@ public class TestResultPreferencePage extends PreferencePage * @param parent The composite. * @return a new m_text field */ - private JBText newTextField(Composite parent) { - final JBText textField = new JBText(parent, SWT.BORDER); + private Text newTextField(Composite parent) { + final Text textField = new Text(parent, SWT.BORDER); GridData textGrid = new GridData(GridData.FILL, GridData.CENTER, true , false, 3, 1); textGrid.widthHint = Dialog.convertWidthInCharsToPixels( diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectGeneralPropertyPage.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectGeneralPropertyPage.java index 6d2f09caf..63a2f54ac 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectGeneralPropertyPage.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectGeneralPropertyPage.java @@ -44,7 +44,6 @@ import org.eclipse.jubula.client.ui.rcp.widgets.CheckedText; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.client.ui.utils.LayoutUtil; import org.eclipse.jubula.client.ui.widgets.DirectCombo; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.tools.constants.StringConstants; import org.eclipse.jubula.tools.exception.Assert; import org.eclipse.jubula.tools.exception.JBException; @@ -63,6 +62,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -244,7 +244,7 @@ public class ProjectGeneralPropertyPage extends AbstractProjectPropertyPage { Messages.ProjectPropertyPageProjectGuid), "GDControlDecorator.ProjectPropertiesGUID", false); //$NON-NLS-1$ - JBText projectGuid = new JBText(rightComposite, + Text projectGuid = new Text(rightComposite, SWT.READ_ONLY | SWT.BORDER); projectGuid.setText(m_projectGuid); Label l = createLabel(rightComposite, StringConstants.EMPTY); diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/AutConfigComponent.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/AutConfigComponent.java index cdc148f04..1b64c1f22 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/AutConfigComponent.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/AutConfigComponent.java @@ -47,7 +47,6 @@ import org.eclipse.jubula.client.ui.utils.DialogUtils; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.client.ui.utils.LayoutUtil; import org.eclipse.jubula.client.ui.widgets.DirectCombo; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.client.ui.widgets.UIComponentHelper; import org.eclipse.jubula.tools.constants.AutConfigConstants; import org.eclipse.jubula.tools.constants.ConfigurationConstants; @@ -69,6 +68,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.DirectoryDialog; +import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.PreferencesUtil; @@ -222,17 +222,17 @@ public abstract class AutConfigComponent extends ScrolledComposite { /** Composite holding the entire contents of this config component */ private Composite m_contentComposite; /** gui component */ - private JBText m_autConfigNameTextField; + private Text m_autConfigNameTextField; /** gui component */ private Combo m_serverCombo; /** gui component */ private Button m_addServerButton; /** gui component */ - private JBText m_autWorkingDirectoryTextField; + private Text m_autWorkingDirectoryTextField; /** gui component */ private Button m_autWorkingDirectoryButton; /** gui component */ - private JBText m_autIdTextField; + private Text m_autIdTextField; /** validator for the AUT ID text field */ private IValidator m_autIdValidator; @@ -314,7 +314,7 @@ public abstract class AutConfigComponent extends ScrolledComposite { /** * @return the text field for the AUT working directory */ - protected JBText getAutWorkingDirField() { + protected Text getAutWorkingDirField() { return m_autWorkingDirectoryTextField; } @@ -394,11 +394,26 @@ public abstract class AutConfigComponent extends ScrolledComposite { */ private void createLayout(Composite areaComposite) { areaComposite.setLayout( - LayoutUtil.createDefaultGridLayout(NUM_COLUMNS)); + createDefaultGridLayout(NUM_COLUMNS)); GridData gridData = new GridData(GridData.BEGINNING); gridData.horizontalSpan = NUM_COLUMNS; areaComposite.setLayoutData(gridData); } + + /** + * creates the default GridLayout to be used + * @param numColumns the number of the columns + * @return a new instance of GridLayout + */ + public static GridLayout createDefaultGridLayout(int numColumns) { + GridLayout result = new GridLayout(); + result.numColumns = numColumns; + result.horizontalSpacing = 5; + result.verticalSpacing = 5; + result.marginWidth = 0; + result.marginHeight = 0; + return result; + } /** * Creates the header area (above the mode buttons). @@ -967,8 +982,8 @@ public abstract class AutConfigComponent extends ScrolledComposite { String text = combo.getText(); return checkTextInput(emptyAllowed, textLength, text); } - if (modifiedWidget instanceof JBText) { - JBText textField = (JBText)modifiedWidget; + if (modifiedWidget instanceof Text) { + Text textField = (Text)modifiedWidget; int textLength = textField.getText().length(); String text = textField.getText(); return checkTextInput(emptyAllowed, textLength, text); @@ -1243,7 +1258,7 @@ public abstract class AutConfigComponent extends ScrolledComposite { /** * @return the Text component for the Configuration name. */ - protected JBText getAutConfigNameTextField() { + protected Text getAutConfigNameTextField() { return m_autConfigNameTextField; } @@ -1290,7 +1305,7 @@ public abstract class AutConfigComponent extends ScrolledComposite { * * @return the text field for the Working Directory. */ - protected JBText getWorkingDirTextField() { + protected Text getWorkingDirTextField() { return m_autWorkingDirectoryTextField; } @@ -1329,7 +1344,7 @@ public abstract class AutConfigComponent extends ScrolledComposite { * @return true if the user selected a new entry and no error occured */ protected boolean remoteBrowse(boolean folderSelection, - String configVarKey, JBText textfield, String title) { + String configVarKey, Text textfield, String title) { boolean valueChanged = false; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/JavaAutConfigComponent.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/JavaAutConfigComponent.java index b4526d079..4f1a5d473 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/JavaAutConfigComponent.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/JavaAutConfigComponent.java @@ -44,7 +44,6 @@ import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.client.ui.utils.LayoutUtil; import org.eclipse.jubula.client.ui.widgets.DirectCombo; import org.eclipse.jubula.client.ui.widgets.I18nEnumCombo; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.client.ui.widgets.UIComponentHelper; import org.eclipse.jubula.toolkit.common.monitoring.MonitoringAttribute; import org.eclipse.jubula.toolkit.common.monitoring.MonitoringUtils; @@ -76,6 +75,7 @@ import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; +import org.eclipse.swt.widgets.Text; @@ -116,11 +116,11 @@ public abstract class JavaAutConfigComponent extends AutConfigComponent { // internally used classes for data handling // internally used GUI components /** gui component */ - private JBText m_jarTextField; + private Text m_jarTextField; /** gui component */ private Button m_jarButton; /** text field for the executable that will launch the AUT */ - private JBText m_execTextField; + private Text m_execTextField; /** browse button for the executable */ private Button m_execButton; /** gui component */ @@ -138,23 +138,23 @@ public abstract class JavaAutConfigComponent extends AutConfigComponent { /** move down button */ private Button m_moveElementDownButton; /** gui component */ - private JBText m_classNameTextField; + private Text m_classNameTextField; /** gui component */ - private JBText m_autArgsTextField; + private Text m_autArgsTextField; /** gui component */ private I18nEnumCombo<ActivationMethod> m_activationMethodCombo; /** gui component */ - private JBText m_autJreTextField; + private Text m_autJreTextField; /** gui component */ private Button m_autJreButton; /** gui component */ private Composite m_autJreComposite; /** gui component */ - private JBText m_autJreParamTextField; + private Text m_autJreParamTextField; /** gui component */ private DirectCombo<String> m_monitoringCombo; /** gui component */ - private JBText m_envTextArea; + private Text m_envTextArea; /** the WidgetModifyListener */ private WidgetModifyListener m_modifyListener; /** the WidgetFocusListener */ @@ -287,7 +287,7 @@ public abstract class JavaAutConfigComponent extends AutConfigComponent { MonitoringAttribute att) { Composite c = UIComponentHelper.createLayoutComposite(composite, 2); - final JBText textField = createMonitoringTextFieldWidget(c, att); + final Text textField = createMonitoringTextFieldWidget(c, att); final Button browseButton = new Button(c, SWT.PUSH); browseButton.setText(Messages.AUTConfigComponentBrowse); browseButton.setLayoutData(BUTTON_LAYOUT); @@ -332,10 +332,10 @@ public abstract class JavaAutConfigComponent extends AutConfigComponent { * @return A monitoring textfield * */ - private JBText createMonitoringTextFieldWidget(Composite composite, + private Text createMonitoringTextFieldWidget(Composite composite, final MonitoringAttribute att) { - final JBText textField = UIComponentHelper.createTextField( + final Text textField = UIComponentHelper.createTextField( composite, 1); textField.setData(MonitoringConstants.MONITORING_KEY, att.getId()); @@ -577,7 +577,8 @@ public abstract class JavaAutConfigComponent extends AutConfigComponent { */ private void initGuiEnvironmentEditor(Composite parent) { UIComponentHelper.createLabel(parent, "AUTConfigComponent.envVariables"); //$NON-NLS-1$ - m_envTextArea = new JBText(parent, LayoutUtil.MULTI_TEXT_STYLE); + m_envTextArea = new Text(parent, + LayoutUtil.MULTI_TEXT | SWT.V_SCROLL); LayoutUtil.setMaxChar(m_envTextArea, 4000); GridData textGridData = new GridData(); textGridData.horizontalAlignment = GridData.FILL; @@ -585,7 +586,7 @@ public abstract class JavaAutConfigComponent extends AutConfigComponent { textGridData.grabExcessHorizontalSpace = false; textGridData.widthHint = COMPOSITE_WIDTH; textGridData.heightHint = Dialog.convertHeightInCharsToPixels(LayoutUtil - .getFontMetrics(m_envTextArea), 5); + .getFontMetrics(m_envTextArea), 2); m_envTextArea.setLayoutData(textGridData); } @@ -611,35 +612,40 @@ public abstract class JavaAutConfigComponent extends AutConfigComponent { */ private void initGuiClasspathEditor(Composite parent) { UIComponentHelper.createLabel( - parent, "AUTConfigComponent.classPath"); //$NON-NLS-1$ - m_classPathListField = new List(parent, + parent, "AUTConfigComponent.classPath"); //$NON-NLS-1$ + Composite classpathComposite = + UIComponentHelper.createLayoutComposite(parent); + m_classPathListField = new List(classpathComposite, LayoutUtil.MULTI_TEXT_STYLE | SWT.SINGLE); GridData textGridData = new GridData(); textGridData.horizontalAlignment = GridData.FILL; textGridData.grabExcessHorizontalSpace = true; textGridData.heightHint = Dialog.convertHeightInCharsToPixels(LayoutUtil - .getFontMetrics(m_classPathListField), 8); + .getFontMetrics(m_classPathListField), 2); LayoutUtil.addToolTipAndMaxWidth(textGridData, m_classPathListField); m_classPathListField.setLayoutData(textGridData); - m_classPathButtonComposite = - UIComponentHelper.createLayoutComposite(parent); - m_addElementButton = new Button(m_classPathButtonComposite, SWT.PUSH); - m_addElementButton.setText(Messages.AUTConfigComponentElement); - m_addElementButton.setLayoutData(BUTTON_LAYOUT); - + + Composite moveComposite = + UIComponentHelper.createLayoutComposite(parent); m_moveElementUpButton = - new Button(m_classPathButtonComposite, SWT.PUSH); + new Button(moveComposite, SWT.PUSH); m_moveElementUpButton.setImage(IconConstants.UP_ARROW_DIS_IMAGE); m_moveElementUpButton.setToolTipText( - Messages.AutConfigDialogMoveCpUpToolTip); + Messages.AutConfigDialogMoveCpUpToolTip); m_moveElementUpButton.setLayoutData(BUTTON_LAYOUT); - + m_moveElementDownButton = - new Button(m_classPathButtonComposite, SWT.PUSH); + new Button(moveComposite, SWT.PUSH); m_moveElementDownButton.setImage(IconConstants.DOWN_ARROW_DIS_IMAGE); m_moveElementDownButton.setToolTipText( - Messages.AutConfigDialogMoveCpDownToolTip); + Messages.AutConfigDialogMoveCpDownToolTip); m_moveElementDownButton.setLayoutData(BUTTON_LAYOUT); + + m_classPathButtonComposite = + UIComponentHelper.createLayoutComposite(classpathComposite, 3); + m_addElementButton = new Button(m_classPathButtonComposite, SWT.PUSH); + m_addElementButton.setText(Messages.AUTConfigComponentElement); + m_addElementButton.setLayoutData(BUTTON_LAYOUT); m_editElementButton = new Button(m_classPathButtonComposite, SWT.PUSH); m_editElementButton.setText(Messages.AUTConfigComponentEdit); @@ -860,8 +866,8 @@ public abstract class JavaAutConfigComponent extends AutConfigComponent { for (int i = 0; i < ca.length; i++) { if (ca[i].getData(MonitoringConstants.MONITORING_KEY) != null) { - if (ca[i] instanceof JBText) { - JBText t = (JBText) ca[i]; + if (ca[i] instanceof Text) { + Text t = (Text) ca[i]; String value = data.get(String.valueOf( t.getData(MonitoringConstants.MONITORING_KEY))); if (value != null && !value.equals(StringConstants.EMPTY)) { @@ -1082,7 +1088,7 @@ public abstract class JavaAutConfigComponent extends AutConfigComponent { * @param title window title */ void browseLocal(String [] extensionFilters, String title, - JBText textField, String configVarKey) { + Text textField, String configVarKey) { String directory; FileDialog fileDialog = new FileDialog(getShell(), SWT.APPLICATION_MODAL | SWT.ON_TOP); @@ -1812,7 +1818,7 @@ public abstract class JavaAutConfigComponent extends AutConfigComponent { * @param directoryDialog The DirectoryDialog * @param textField The textField */ - private void handleBrowseDirButtonEvent(JBText textField, + private void handleBrowseDirButtonEvent(Text textField, DirectoryDialog directoryDialog) { String directory = null; directoryDialog.setMessage(Messages.AUTConfigComponentSelectDir); @@ -1841,7 +1847,7 @@ public abstract class JavaAutConfigComponent extends AutConfigComponent { * corresponding to the text field in the monitoring area. * @param textField The text field to set the path to. */ - private void monitoringBrowseButtonSelected(JBText textField) { + private void monitoringBrowseButtonSelected(Text textField) { if (isRemoteRequest()) { remoteBrowse(true, String.valueOf(textField.getData( diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/ModifiableTriggerList.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/ModifiableTriggerList.java index 2b3151efd..9e5f27105 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/ModifiableTriggerList.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/ModifiableTriggerList.java @@ -26,7 +26,6 @@ import org.eclipse.jubula.client.ui.rcp.widgets.ModifiableListObservable.IConten import org.eclipse.jubula.client.ui.rcp.widgets.ModifiableListObservable.IOptionalButtonSelectedListener; import org.eclipse.jubula.client.ui.rcp.widgets.ModifiableListObservable.ISelectionChangedListener; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.tools.constants.StringConstants; import org.eclipse.jubula.tools.i18n.I18n; import org.eclipse.swt.SWT; @@ -238,7 +237,7 @@ public class ModifiableTriggerList extends Composite implements /***/ private Control m_toolTipOwner; /***/ - private JBText m_toolTipContent; + private Text m_toolTipContent; /***/ private Shell m_tip; /***/ @@ -305,7 +304,7 @@ public class ModifiableTriggerList extends Composite implements layout.marginHeight = 2; layout.marginWidth = 2; m_tip.setLayout(layout); - m_toolTipContent = new JBText(m_tip, LayoutUtil.MULTI_TEXT + m_toolTipContent = new Text(m_tip, LayoutUtil.MULTI_TEXT | SWT.READ_ONLY); m_tip.setForeground(m_toolTipOwner.getDisplay() .getSystemColor(SWT.COLOR_INFO_FOREGROUND)); @@ -355,10 +354,9 @@ public class ModifiableTriggerList extends Composite implements /** * {@inheritDoc} - * @param event */ public void handleEvent(Event event) { - JBText label = (JBText) event.widget; + Text label = (Text) event.widget; Shell shell = label.getShell(); switch (event.type) { case SWT.FocusOut: diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/AUTSettingWizardPage.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/AUTSettingWizardPage.java index 3063a9f98..bace3179e 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/AUTSettingWizardPage.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/AUTSettingWizardPage.java @@ -34,7 +34,6 @@ import org.eclipse.jubula.client.ui.rcp.widgets.ListElementChooserComposite; import org.eclipse.jubula.client.ui.rcp.wizards.ProjectWizard; import org.eclipse.jubula.client.ui.utils.LayoutUtil; import org.eclipse.jubula.client.ui.widgets.DirectCombo; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; import org.eclipse.jubula.tools.constants.CommandConstants; @@ -55,6 +54,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; @@ -83,7 +83,7 @@ public class AUTSettingWizardPage extends WizardPage { private Button m_leftButton; /** the AUT name editor */ - private JBText m_autNameText; + private Text m_autNameText; /** the combo box with the toolkit names */ private DirectCombo<String> m_autToolKitComboBox; @@ -296,7 +296,7 @@ public class AUTSettingWizardPage extends WizardPage { leftComposite.setLayout(gridLayout); rightComposite.setLayout(gridLayout); newLabel(leftComposite, Messages.AUTSettingWizardPageAutName); - m_autNameText = new JBText(rightComposite, SWT.BORDER); + m_autNameText = new Text(rightComposite, SWT.BORDER); m_autNameText.setFocus(); final GridData gridData = new GridData(); gridData.grabExcessHorizontalSpace = true; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ImportProjectsWizardPage.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ImportProjectsWizardPage.java index d8a714312..1cc529064 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ImportProjectsWizardPage.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ImportProjectsWizardPage.java @@ -28,7 +28,6 @@ import org.eclipse.jubula.client.ui.rcp.provider.ControlDecorator; import org.eclipse.jubula.client.ui.rcp.utils.Utils; import org.eclipse.jubula.client.ui.utils.DialogUtils; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.tools.constants.DebugConstants; import org.eclipse.jubula.tools.constants.StringConstants; import org.eclipse.osgi.util.NLS; @@ -49,6 +48,7 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,7 +69,7 @@ public class ImportProjectsWizardPage extends WizardPage private static final int NUM_COLUMS = 6; /** TextField for FilePath */ - private JBText m_fileToAdd; + private Text m_fileToAdd; /** All files that will be imported */ private List m_filesToImport; /** button to browse for file */ @@ -612,7 +612,7 @@ public class ImportProjectsWizardPage extends WizardPage label.setLayoutData(gridData); label.setText(Messages.ImportProjectDialogFileLabel); - m_fileToAdd = new JBText(composite, SWT.BORDER); + m_fileToAdd = new Text(composite, SWT.BORDER); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 4; gridData.grabExcessHorizontalSpace = true; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ProjectSettingWizardPage.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ProjectSettingWizardPage.java index e5abacc23..9e85d8788 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ProjectSettingWizardPage.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ProjectSettingWizardPage.java @@ -35,7 +35,6 @@ import org.eclipse.jubula.client.ui.rcp.widgets.ListElementChooserComposite; import org.eclipse.jubula.client.ui.rcp.wizards.ProjectWizard; import org.eclipse.jubula.client.ui.utils.LayoutUtil; import org.eclipse.jubula.client.ui.widgets.DirectCombo; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.tools.constants.StringConstants; import org.eclipse.jubula.tools.exception.Assert; import org.eclipse.swt.SWT; @@ -51,6 +50,7 @@ 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.eclipse.ui.PlatformUI; @@ -93,7 +93,7 @@ public class ProjectSettingWizardPage extends WizardPage { /** the combo box for the project aut toolkit */ private DirectCombo<String> m_autToolKitComboBox; /** the text field for the project name */ - private JBText m_projectNameTextField; + private Text m_projectNameTextField; /** the checkbox for the project reusability */ private Button m_projectReusabilityCheckbox; /** the checkbox for the project reusability */ diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/DBLoginDialog.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/DBLoginDialog.java index d0158410b..501f0501c 100644 --- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/DBLoginDialog.java +++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/DBLoginDialog.java @@ -33,7 +33,6 @@ import org.eclipse.jubula.client.ui.constants.ContextHelpIds; import org.eclipse.jubula.client.ui.constants.IconConstants; import org.eclipse.jubula.client.ui.i18n.Messages; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.tools.constants.StringConstants; import org.eclipse.jubula.tools.constants.SwtAUTHierarchyConstants; import org.eclipse.persistence.config.PersistenceUnitProperties; @@ -48,6 +47,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; @@ -83,11 +83,11 @@ public class DBLoginDialog extends TitleAreaDialog { private String m_message = Messages.DBLoginDialogMessage; /** the username m_text field */ - private JBText m_userText; + private Text m_userText; /** the username label */ private Label m_userLabel; /** the password m_text field */ - private JBText m_pwdText; + private Text m_pwdText; /** the password label */ private Label m_pwdLabel; /** the connection combobox viewer */ @@ -195,7 +195,7 @@ public class DBLoginDialog extends TitleAreaDialog { m_userLabel = new Label(area, SWT.NONE); m_userLabel.setText(Messages.DBLoginDialogUserLabel); m_userLabel.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "DBLoginDialog.userLabel"); //$NON-NLS-1$ - m_userText = new JBText(area, SWT.BORDER); + m_userText = new Text(area, SWT.BORDER); m_userText.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "DBLoginDialog.userTxf"); //$NON-NLS-1$ GridData gridData = newGridData(); LayoutUtil.addToolTipAndMaxWidth(gridData, m_userText); @@ -223,7 +223,7 @@ public class DBLoginDialog extends TitleAreaDialog { m_pwdLabel = new Label(area, SWT.NONE); m_pwdLabel.setText(Messages.DBLoginDialogPwdLabel); m_pwdLabel.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "DBLoginDialog.pwdLabel"); //$NON-NLS-1$ - m_pwdText = new JBText(area, SWT.PASSWORD | SWT.BORDER); + m_pwdText = new Text(area, SWT.PASSWORD | SWT.BORDER); m_pwdText.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "DBLoginDialog.pwdTxf"); //$NON-NLS-1$ GridData gridData = newGridData(); LayoutUtil.addToolTipAndMaxWidth(gridData, m_pwdText); diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EnterCommentDialog.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EnterCommentDialog.java index 77ef7efc5..659d1c702 100644 --- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EnterCommentDialog.java +++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EnterCommentDialog.java @@ -18,7 +18,6 @@ import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.jface.databinding.swt.SWTObservables; import org.eclipse.jubula.client.ui.i18n.Messages; import org.eclipse.jubula.client.ui.utils.LayoutUtil; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; @@ -27,6 +26,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; /** @@ -119,7 +119,7 @@ public class EnterCommentDialog extends AbstractValidatedDialog { */ private void createCommentTitleField(Composite area) { GridData gridData; - JBText commentTitleField = createCommentTitleText(area); + Text commentTitleField = createCommentTitleText(area); gridData = new GridData(SWT.FILL, SWT.FILL, true, false); LayoutUtil.addToolTipAndMaxWidth(gridData, commentTitleField); commentTitleField.setLayoutData(gridData); @@ -146,7 +146,7 @@ public class EnterCommentDialog extends AbstractValidatedDialog { */ private void createCommentDetailField(Composite area) { GridData gridData; - JBText commentDetailField = createCommentDetailText(area); + Text commentDetailField = createCommentDetailText(area); gridData = new GridData(SWT.FILL, SWT.FILL, true, true); LayoutUtil.addToolTipAndMaxWidth(gridData, commentDetailField); commentDetailField.setLayoutData(gridData); @@ -171,20 +171,20 @@ public class EnterCommentDialog extends AbstractValidatedDialog { * @param area The parent for the created widgets. * @return the created text field. */ - private JBText createCommentTitleText(Composite area) { + private Text createCommentTitleText(Composite area) { new Label(area, SWT.NONE).setText( Messages.EnterCommentDialogTitleLabel); - return new JBText(area, SWT.SINGLE | SWT.BORDER); + return new Text(area, SWT.SINGLE | SWT.BORDER); } /** * @param area The parent for the created widgets. * @return the created text field. */ - private JBText createCommentDetailText(Composite area) { + private Text createCommentDetailText(Composite area) { new Label(area, SWT.NONE).setText( Messages.EnterCommentDialogDetailLabel); - return new JBText(area, SWT.V_SCROLL | SWT.BORDER); + return new Text(area, SWT.V_SCROLL | SWT.BORDER); } /** diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/DatabaseConnectionPreferencePage.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/DatabaseConnectionPreferencePage.java index ab3800feb..2724101a1 100644 --- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/DatabaseConnectionPreferencePage.java +++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/DatabaseConnectionPreferencePage.java @@ -38,7 +38,6 @@ import org.eclipse.jubula.client.core.preferences.database.DatabaseConnection; import org.eclipse.jubula.client.core.preferences.database.DatabaseConnectionConverter; import org.eclipse.jubula.client.ui.dialogs.DatabaseConnectionDialog; import org.eclipse.jubula.client.ui.i18n.Messages; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -82,8 +81,8 @@ public class DatabaseConnectionPreferencePage extends PreferencePage case SWT.FocusIn: if (m_isTraversing) { m_isTraversing = false; - if (event.widget instanceof JBText) { - ((JBText)event.widget).selectAll(); + if (event.widget instanceof Text) { + ((Text)event.widget).selectAll(); } } break; diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/LayoutUtil.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/LayoutUtil.java index 38be8560a..060a2f2a0 100644 --- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/LayoutUtil.java +++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/LayoutUtil.java @@ -21,7 +21,6 @@ import org.eclipse.swt.graphics.FontMetrics; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -83,7 +82,7 @@ public class LayoutUtil { /** the style for a multi - line m_text */ public static final int MULTI_TEXT_STYLE = SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL; - /** the style for a multi - line m_text without border*/ + /** the style for a multi - line text without border*/ public static final int MULTI_TEXT = SWT.MULTI | SWT.WRAP; /** margin width = 2 */ public static final int MARGIN_WIDTH = 2; @@ -139,21 +138,6 @@ public class LayoutUtil { } /** - * creates the default GridLayout to be used - * @param numColumns the number of the columns - * @return a new instance of GridLayout - */ - public static GridLayout createDefaultGridLayout(int numColumns) { - GridLayout result = new GridLayout(); - result.numColumns = numColumns; - result.horizontalSpacing = SMALL_HORIZONTAL_SPACING; - result.verticalSpacing = SMALL_VERTICAL_SPACING; - result.marginWidth = SMALL_MARGIN_WIDTH; - result.marginHeight = SMALL_MARGIN_HEIGHT; - return result; - } - - /** * Sets a character limit (255) for the text field (incl. warning, if limit was reached) * @param textField The actual text field. */ diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/JBText.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/JBText.java index 5c26057c0..00f7216e7 100644 --- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/JBText.java +++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/JBText.java @@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Text; * @author BREDEX GmbH * @created 02.03.2006 */ -public class JBText extends Text { +public abstract class JBText extends Text { /** * @param parent parent * @param style style @@ -32,11 +32,8 @@ public class JBText extends Text { public JBText(Composite parent, int style) { super(parent, style); } - - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ protected void checkSubclass() { // do nothing, therefor allowing subclassing } diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/UIComponentHelper.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/UIComponentHelper.java index 3b2cacd3e..f0d07298b 100644 --- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/UIComponentHelper.java +++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/UIComponentHelper.java @@ -24,6 +24,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.Text; /** @@ -77,8 +78,8 @@ public abstract class UIComponentHelper { * @param hSpan number of columns the sepator should span * @return a Text */ - public static JBText createTextField(Composite parent, int hSpan) { - final JBText textField = new JBText(parent, SWT.BORDER); + public static Text createTextField(Composite parent, int hSpan) { + final Text textField = new Text(parent, SWT.BORDER); GridData textGrid = new GridData(GridData.FILL, GridData.CENTER, true , false, hSpan, 1); LayoutUtil.addToolTipAndMaxWidth(textGrid, textField); // FIXME al @@ -182,14 +183,14 @@ public abstract class UIComponentHelper { * @param limit The limit, any number greater than one and less than * Text.LIMIT; */ - public static void setMaxTextChars(JBText textField, final int limit) { + public static void setMaxTextChars(Text textField, final int limit) { if (textField == null) { return; } textField.setTextLimit(limit); textField.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { - if (((JBText)e.widget).getCharCount() == limit) { + if (((Text)e.widget).getCharCount() == limit) { ErrorHandlingUtil.createMessageDialog( MessageIDs.W_MAX_CHAR, new Object[] {limit}, null); diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/DatabaseConnectionWizardPage.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/DatabaseConnectionWizardPage.java index eeea853df..6255dfe0d 100644 --- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/DatabaseConnectionWizardPage.java +++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/DatabaseConnectionWizardPage.java @@ -41,7 +41,6 @@ import org.eclipse.jubula.client.ui.databinding.SimpleIntegerToStringConverter; import org.eclipse.jubula.client.ui.databinding.SimpleStringToIntegerConverter; import org.eclipse.jubula.client.ui.databinding.validators.StringToPortValidator; import org.eclipse.jubula.client.ui.utils.DialogUtils; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.client.ui.widgets.UIComponentHelper; import org.eclipse.jubula.tools.i18n.I18n; import org.eclipse.swt.SWT; @@ -460,7 +459,7 @@ public class DatabaseConnectionWizardPage extends WizardPage { setControl(composite); UIComponentHelper.createLabel(composite, I18n.getString("DatabaseConnection.Name"), SWT.NONE); //$NON-NLS-1$ - JBText nameText = new JBText(composite, SWT.BORDER); + Text nameText = new Text(composite, SWT.BORDER); DialogUtils.setWidgetName(nameText, "DatabaseConnection.Name"); //$NON-NLS-1$ nameText.setLayoutData(textGridDataFactory.create()); dbc.bindValue(SWTObservables.observeText(nameText, SWT.Modify), @@ -505,7 +504,7 @@ public class DatabaseConnectionWizardPage extends WizardPage { bindComboViewer(dbc, typeComboViewer, detailArea, connectionInfoObservable); - JBText url = new JBText(composite, SWT.BORDER); + Text url = new Text(composite, SWT.BORDER); DialogUtils.setWidgetName(url, "DatabaseConnection.URL"); //$NON-NLS-1$ url.setEditable(false); url.setBackground(composite.getBackground()); @@ -604,7 +603,7 @@ public class DatabaseConnectionWizardPage extends WizardPage { * @return the created text field. */ private static Text createDetailText(Composite parent) { - final JBText detailText = new JBText(parent, SWT.BORDER); + final Text detailText = new Text(parent, SWT.BORDER); GridDataFactory.fillDefaults().grab(true, false) .align(SWT.FILL, SWT.CENTER).applyTo(detailText); return detailText; diff --git a/org.eclipse.jubula.toolkit.provider.html/src/org/eclipse/jubula/toolkit/provider/html/gui/HtmlAutConfigComponent.java b/org.eclipse.jubula.toolkit.provider.html/src/org/eclipse/jubula/toolkit/provider/html/gui/HtmlAutConfigComponent.java index 23d8778aa..75f450f8a 100644 --- a/org.eclipse.jubula.toolkit.provider.html/src/org/eclipse/jubula/toolkit/provider/html/gui/HtmlAutConfigComponent.java +++ b/org.eclipse.jubula.toolkit.provider.html/src/org/eclipse/jubula/toolkit/provider/html/gui/HtmlAutConfigComponent.java @@ -23,7 +23,6 @@ import org.eclipse.jubula.client.ui.rcp.provider.ControlDecorator; import org.eclipse.jubula.client.ui.rcp.utils.DialogStatusParameter; import org.eclipse.jubula.client.ui.rcp.widgets.AutConfigComponent; import org.eclipse.jubula.client.ui.widgets.I18nEnumCombo; -import org.eclipse.jubula.client.ui.widgets.JBText; import org.eclipse.jubula.client.ui.widgets.UIComponentHelper; import org.eclipse.jubula.tools.constants.AutConfigConstants; import org.eclipse.jubula.tools.constants.StringConstants; @@ -39,6 +38,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; /** @@ -47,22 +47,14 @@ import org.eclipse.swt.widgets.Label; */ public class HtmlAutConfigComponent extends AutConfigComponent { /** gui component */ - private JBText m_autUrlTextField; + private Text m_autUrlTextField; /** gui field for browser */ - private JBText m_browserTextField; + private Text m_browserTextField; /** gui field for aut id attribute text field */ - private JBText m_autIdAttibuteTextField; + private Text m_autIdAttibuteTextField; /** gui button for browser path */ private Button m_browserPathButton; /** gui component */ - private Label m_activationMethodLabel; - /** gui component */ - private Label m_browserPathLabel; - /** gui component */ - private Label m_browserLabel; - /** gui component */ - private Label m_urlLabel; - /** gui component */ private I18nEnumCombo<Browser> m_browserCombo; /** gui component */ private I18nEnumCombo<ActivationMethod> m_activationMethodCombo; @@ -91,18 +83,18 @@ public class HtmlAutConfigComponent extends AutConfigComponent { super.createBasicArea(basicAreaComposite); // URL property - m_urlLabel = UIComponentHelper.createLabel( + Label urlLabel = UIComponentHelper.createLabel( basicAreaComposite, "WebAutConfigComponent.URL"); //$NON-NLS-1$ - m_urlLabel.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "org.eclipse.jubula.toolkit.provider.html.gui.HtmlAutConfigComponent.urlLabel"); //$NON-NLS-1$ + urlLabel.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "org.eclipse.jubula.toolkit.provider.html.gui.HtmlAutConfigComponent.urlLabel"); //$NON-NLS-1$ m_autUrlTextField = UIComponentHelper.createTextField( basicAreaComposite, 2); m_autUrlTextField.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "org.eclipse.jubula.toolkit.provider.html.gui.HtmlAutConfigComponent.autUrlTextField"); //$NON-NLS-1$ // browser - m_browserLabel = UIComponentHelper.createLabel( + Label browserLabel = UIComponentHelper.createLabel( basicAreaComposite, "WebAutConfigComponent.browser"); //$NON-NLS-1$ - m_browserLabel.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "org.eclipse.jubula.toolkit.provider.html.gui.HtmlAutConfigComponent.browserLabel"); //$NON-NLS-1$ + browserLabel.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "org.eclipse.jubula.toolkit.provider.html.gui.HtmlAutConfigComponent.browserLabel"); //$NON-NLS-1$ m_browserCombo = UIComponentHelper.createEnumCombo( basicAreaComposite, 2, "WebAutConfigComponent.Browser", //$NON-NLS-1$ @@ -129,9 +121,9 @@ public class HtmlAutConfigComponent extends AutConfigComponent { super.createExpertArea(expertAreaComposite); // activation method editor - m_activationMethodLabel = UIComponentHelper.createLabel( + Label activationMethodLabel = UIComponentHelper.createLabel( expertAreaComposite, "AUTConfigComponent.activationMethod"); //$NON-NLS-1$ - m_activationMethodLabel.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "org.eclipse.jubula.toolkit.provider.html.gui.HtmlAutConfigComponent.activationMethodLabel"); //$NON-NLS-1$ + activationMethodLabel.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "org.eclipse.jubula.toolkit.provider.html.gui.HtmlAutConfigComponent.activationMethodLabel"); //$NON-NLS-1$ m_activationMethodCombo = UIComponentHelper.createEnumCombo( expertAreaComposite, 2, "AUTConfigComponent.ActivationMethod", //$NON-NLS-1$ @@ -155,9 +147,9 @@ public class HtmlAutConfigComponent extends AutConfigComponent { */ protected void createBrowserPathEditor(Composite parent) { - m_browserPathLabel = UIComponentHelper.createLabel(parent, "WebAutConfigComponent.browserPath"); //$NON-NLS-1$ - m_browserPathLabel.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "org.eclipse.jubula.toolkit.provider.html.gui.HtmlAutConfigComponent.browserPathLabel"); //$NON-NLS-1$ - ControlDecorator.decorateInfo(m_browserPathLabel, + Label browserPathLabel = UIComponentHelper.createLabel(parent, "WebAutConfigComponent.browserPath"); //$NON-NLS-1$ + browserPathLabel.setData(SwtAUTHierarchyConstants.WIDGET_NAME, "org.eclipse.jubula.toolkit.provider.html.gui.HtmlAutConfigComponent.browserPathLabel"); //$NON-NLS-1$ + ControlDecorator.decorateInfo(browserPathLabel, "GDControlDecorator.WebBrowserPath", false); //$NON-NLS-1$ m_browserTextField = UIComponentHelper.createTextField( diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/guidancerStrings.properties b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/guidancerStrings.properties index 4e0d4f134..a9e213ebf 100644 --- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/guidancerStrings.properties +++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/guidancerStrings.properties @@ -59,7 +59,7 @@ AUTConfigComponent.labelMonitoring.helpText=Monitoring-Agents require an \nAUT s AUTConfigComponent.labelSourceDirectory=The directory which contains\nthe Java files of this AUT AUTConfigComponent.server=AUT Agent Host\: AUTConfigComponent.srcDir=AUT Source\nDirectory\: -AUTConfigComponent.workDir=AUT Base/\nWorking Directory\: +AUTConfigComponent.workDir=AUT Working Directory\: AUTConfigPreferencePage.AUTJreDirectory=JRE Binary\: AUTConfigPreferencePage.AUTName=AUT name\: AUTConfigPreferencePage.AUTWorkingDirectory=Working Directory\: |