Author: snjeza Date: 2008-06-24 16:45:51 -0400 (Tue, 24 Jun 2008) New Revision: 8926 Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateSelectionPageHelper.java Log: JBIDE-2220 JBoss BIRT Integration Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateSelectionPageHelper.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateSelectionPageHelper.java 2008-06-24 18:45:31 UTC (rev 8925) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateSelectionPageHelper.java 2008-06-24 20:45:51 UTC (rev 8926) @@ -49,6 +49,7 @@ private WizardPage wizardPage; private PreferencePage propertyPage; private Combo configurationCombo; + private Text jndiSessionFactoryName; private Text maxRows; private Button testButton; @@ -80,6 +81,16 @@ gridData.horizontalAlignment = SWT.FILL; gridData.grabExcessHorizontalSpace = true; configurationCombo.setLayoutData(gridData); + + Label jndiLabel = new Label(composite, SWT.RIGHT); + jndiLabel.setText("JNDI URL:"); + + jndiSessionFactoryName = new Text(composite,SWT.BORDER); + gridData = new GridData(); + gridData.horizontalSpan = 2; + gridData.horizontalAlignment = SWT.FILL; + gridData.grabExcessHorizontalSpace = true; + jndiSessionFactoryName.setLayoutData(gridData); ConsoleConfiguration[] configurations = KnownConfigurations .getInstance().getConfigurations(); @@ -99,9 +110,12 @@ public void modifyText(ModifyEvent e) { validateData(); + adjustJndiName(); } }); + + adjustJndiName(); new Label(composite, SWT.NONE); testButton = new Button(composite, SWT.PUSH); @@ -120,6 +134,20 @@ } + private void adjustJndiName() { + String jndiName = jndiSessionFactoryName.getText(); + if (jndiName == null || jndiName.length() <= 0) { + String configurationName = configurationCombo.getText(); + if (configurationName != null && configurationName.length() > 0) { + int index = configurationName.indexOf("-ejb"); + if (index > 0) { + configurationName = configurationName.substring(0,index); + } + jndiSessionFactoryName.setText("java:/" + configurationName); + } + } + } + private void setMessage(String message, int type) { if (wizardPage != null) wizardPage.setMessage(message, type);