Skip to content

Commit

Permalink
TEIIDDES-2466 cntd(1)
Browse files Browse the repository at this point in the history 
 * adding missing i18n
 * fixed layout issue with case options tab
  • Loading branch information
@blafond
blafond committed Mar 21, 2016
1 parent d5fc29d commit 0d59be6
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 36 deletions.
62 changes: 34 additions & 28 deletions ....teiid.designer.jdbc.ui/src/org/teiid/designer/jdbc/ui/wizards/JdbcImportOptionsPage.java
View file
Expand Up @@ -79,6 +79,7 @@
import org.teiid.designer.ui.common.InternalUiConstants;
import org.teiid.designer.ui.common.dialog.FolderSelectionDialog;
import org.teiid.designer.ui.common.product.ProductCustomizerMgr;
import org.teiid.designer.ui.common.util.LayoutDebugger;
import org.teiid.designer.ui.common.util.UiUtil;
import org.teiid.designer.ui.common.util.WidgetFactory;
import org.teiid.designer.ui.common.util.WidgetUtil;
Expand Down Expand Up @@ -363,6 +364,10 @@ public void widgetSelected(final SelectionEvent event) {
});
this.includeCatalogCheckBox.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));

// Indent the change case group
Label spacer = new Label(mainPanel, SWT.NONE);
spacer.setText(""); //$NON-NLS-1$

{
// Add widgets to page
Group theGroup = WidgetFactory.createGroup(mainPanel, getString("jndiGroup"), SWT.NONE, 2, 3); //$NON-NLS-1$
Expand All @@ -380,25 +385,24 @@ public void widgetSelected(final SelectionEvent event) {
this.jndiNameField.setText(this.jndiName);
}

this.jndiNameField.setEnabled(serverActive);
this.jndiNameField.setEnabled(true);

if(serverActive ) {
this.jndiNameField.addModifyListener(new ModifyListener() {

@Override
public void modifyText(ModifyEvent e) {

if( jndiNameField.getText() != null && jndiNameField.getText().length() > 0 ) {
jndiName = jndiNameField.getText();
importer.setJBossJndiNameName(jndiName);
} else {
jndiName = ""; //$NON-NLS-1$
importer.setJBossJndiNameName(null);
}

}
});
}
this.jndiNameField.addModifyListener(new ModifyListener() {

@Override
public void modifyText(ModifyEvent e) {

if( jndiNameField.getText() != null && jndiNameField.getText().length() > 0 ) {
jndiName = jndiNameField.getText();
importer.setJBossJndiNameName(jndiName);
} else {
jndiName = ""; //$NON-NLS-1$
importer.setJBossJndiNameName(null);
}

}
});

GridDataFactory.fillDefaults().grab(true, false).applyTo(jndiNameField);

this.autoCreateDataSource = WidgetFactory.createCheckBox(theGroup, "Auto-create Data Source");
Expand Down Expand Up @@ -453,10 +457,11 @@ public void widgetDefaultSelected(SelectionEvent e) {
* Create the SQL Display tab panel
*/
private Composite createNameOptionsPanel( Composite parent ) {
Composite caseOptionsGroup = WidgetFactory.createPanel(parent, GridData.HORIZONTAL_ALIGN_FILL | SWT.NO_SCROLL, 1, 2);
caseOptionsGroup.getHorizontalBar().setVisible(false);
Composite caseOptionsGroup = new Composite(parent, SWT.NONE);
GridLayoutFactory.fillDefaults().margins(10, 10).numColumns(1).applyTo(caseOptionsGroup);
GridDataFactory.fillDefaults().grab(true, false).applyTo(caseOptionsGroup);

this.fullyQualifiedNamesCheckBox = WidgetFactory.createCheckBox(caseOptionsGroup, FULLY_QUALIFIED_CHECKBOX, 0, 2);
this.fullyQualifiedNamesCheckBox = WidgetFactory.createCheckBox(caseOptionsGroup, FULLY_QUALIFIED_CHECKBOX, 0, 1);
this.fullyQualifiedNamesCheckBox.setToolTipText(FULLY_QUALIFIED_CHECKBOX_TOOLTIP);
this.fullyQualifiedNamesCheckBox.addSelectionListener(new SelectionAdapter() {

Expand All @@ -466,9 +471,13 @@ public void widgetSelected(final SelectionEvent event) {
}
});
this.fullyQualifiedNamesCheckBox.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
((GridData) this.fullyQualifiedNamesCheckBox.getLayoutData()).horizontalSpan = 2;

this.modifyCaseCheckBox = WidgetFactory.createCheckBox(caseOptionsGroup, MODIFY_CASE_CHECKBOX, 0, 2);
GridDataFactory.fillDefaults().grab(true, false).applyTo(fullyQualifiedNamesCheckBox);

Label spacer = new Label(caseOptionsGroup, SWT.NONE);
spacer.setText(""); //$NON-NLS-1$

this.modifyCaseCheckBox = WidgetFactory.createCheckBox(caseOptionsGroup, MODIFY_CASE_CHECKBOX, 0, 1);
this.modifyCaseCheckBox.addSelectionListener(new SelectionAdapter() {

@Override
Expand All @@ -477,16 +486,13 @@ public void widgetSelected(final SelectionEvent event) {
}
});
this.modifyCaseCheckBox.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
((GridData) this.modifyCaseCheckBox.getLayoutData()).horizontalSpan = 2;

// Indent the change case group
Label spacer = new Label(caseOptionsGroup, SWT.NONE);
spacer.setText(" "); //$NON-NLS-1$
GridDataFactory.fillDefaults().grab(true, false).applyTo(modifyCaseCheckBox);

changeCaseGroup = WidgetFactory.createGroup(caseOptionsGroup,
CHANGE_CASE_GROUP,
GridData.HORIZONTAL_ALIGN_FILL,
1, 1);
GridDataFactory.fillDefaults().grab(true, false).applyTo(changeCaseGroup);

this.uppercaseButton = WidgetFactory.createRadioButton(changeCaseGroup, MAKE_ALL_UPPER_RADIO);
this.uppercaseButton.addSelectionListener(new SelectionAdapter() {
Expand Down
14 changes: 6 additions & 8 deletions ...s/org.teiid.designer.jdbc.ui/src/org/teiid/designer/jdbc/ui/wizards/JdbcImportWizard.java
View file
Expand Up @@ -815,14 +815,12 @@ void runFinish( IProgressMonitor monitor ) throws InvocationTargetException {
if (this.connectionProfile != null && ! isUpdatedModel()) {
IConnectionInfoProvider provider = new JDBCConnectionInfoProvider();
provider.setConnectionInfo(ppProcessorPack.getModelResource(), this.connectionProfile);
if( isVirtual ) {
if( handleCreateDataSource() ) {
String jndiName = importer.getJBossJndiName();
if( !StringUtilities.isEmpty(jndiName) ) {
ConnectionInfoHelper helper = new ConnectionInfoHelper();
helper.setJNDIName(ppProcessorPack.getModelResource(), jndiName);
}
}
if( !isVirtual ) {
String jndiName = importer.getJBossJndiName();
if( !StringUtilities.isEmpty(jndiName) ) {
ConnectionInfoHelper helper = new ConnectionInfoHelper();
helper.setJNDIName(ppProcessorPack.getModelResource(), jndiName);
}
}
}

Expand Down
4 changes: 4 additions & 0 deletions plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/i18n.properties
View file
Expand Up @@ -946,6 +946,10 @@ JdbcImportOptionsPage.changeCaseGroup = Case Options
JdbcImportOptionsPage.modifyCaseCheckBox = Change Case For All Characters
JdbcImportOptionsPage.makeAllUpperRadioButton = Make All Upper Case (Example: Suppliers > SUPPLIERS)
JdbcImportOptionsPage.makeAllLowerRadioButton = Make All Lower Case (Example: SUPPLIERS > suppliers)
JdbcImportOptionsPage.jndiGroup=JBoss Data Source Information
JdbcImportOptionsPage.noServerDefined=No server defined
JdbcImportOptionsPage.serverNotStarted=Default server not started.
JdbcImportOptionsPage.serverUnavailableGroup=Server Unavailable

#=================================================================================================================================
# JdbcImportWizard
Expand Down

0 comments on commit 0d59be6

Please sign in to comment.