summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpshi2012-05-17 23:30:31 (EDT)
committer mwu2012-05-17 23:30:31 (EDT)
commit4fd5954b7d28bf4538e6b70cefb5c0f308dd1ef0 (patch)
tree389890de6166e39be8ee7f3193e51c47df5f4e96
parentbe8bf08de2defad5819140bf78188d45064eefdc (diff)
downloadorg.eclipse.birt-4fd5954b7d28bf4538e6b70cefb5c0f308dd1ef0.zip
org.eclipse.birt-4fd5954b7d28bf4538e6b70cefb5c0f308dd1ef0.tar.gz
org.eclipse.birt-4fd5954b7d28bf4538e6b70cefb5c0f308dd1ef0.tar.bz2
Summary: fix 47654, Data Source created using connection profile to
classicmodels sample DB is not shown as created using connection profile Description: While the sample db datasource is not created from external connection profile, do not display the warning message
-rw-r--r--data/org.eclipse.birt.report.data.oda.sampledb.ui/src/org/eclipse/birt/report/data/oda/sampledb/ui/profile/SampleDbSelectionPageHelper.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/data/org.eclipse.birt.report.data.oda.sampledb.ui/src/org/eclipse/birt/report/data/oda/sampledb/ui/profile/SampleDbSelectionPageHelper.java b/data/org.eclipse.birt.report.data.oda.sampledb.ui/src/org/eclipse/birt/report/data/oda/sampledb/ui/profile/SampleDbSelectionPageHelper.java
index 607b5a5..f08ee96 100644
--- a/data/org.eclipse.birt.report.data.oda.sampledb.ui/src/org/eclipse/birt/report/data/oda/sampledb/ui/profile/SampleDbSelectionPageHelper.java
+++ b/data/org.eclipse.birt.report.data.oda.sampledb.ui/src/org/eclipse/birt/report/data/oda/sampledb/ui/profile/SampleDbSelectionPageHelper.java
@@ -81,7 +81,14 @@ public class SampleDbSelectionPageHelper
m_sampleUser = new Label( content, SWT.LEFT );
m_sampleUser.setText( SampleDBJDBCConnectionFactory.getDbUser( ) );//$NON-NLS-1$
- setMessage( Messages.getMessage( "datasource.page.warning" ), IMessageProvider.WARNING);
+ if (parent.getShell().getText().startsWith("New Data Source"))
+ {
+ setMessage( DEFAULT_MESSAGE, IMessageProvider.NONE );
+ }
+ else
+ {
+ setMessage( Messages.getMessage( "datasource.page.warning" ), IMessageProvider.WARNING);
+ }
PlatformUI.getWorkbench( ).getHelpSystem( ).setHelp( getControl(),
CONEXT_ID_DATASOURCE_SAMPLEDB );