jprdonnelly/tcommon-studio-se
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge r87395 from branch 5.1 to trunk

Browse Source 
TDQ-5812 TDQ-5801 hide also "Microsoft SQL Server 2005/2008"  item on database wizard for DQ.


git-svn-id: http://talendforge.org/svn/tos/trunk@87497 f6f1c999-d317-4740-80b0-e6d1abc6f99e
This commit is contained in:
qiongli
2012-07-16 06:48:35 +00:00
parent 41bd93a033
commit a67921f0da
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/connection/database/DatabaseForm.java
View File

@@ -719,7 +719,9 @@ public class DatabaseForm extends AbstractForm {
String perId = page.getPerspective().getId();
if ((!"".equals(perId) && null != perId)) {
// eg : use DI, then switch to DQ : All view from DI must be hidden when switch
if (perId.equalsIgnoreCase(IBrandingConfiguration.PERSPECTIVE_DI_ID)) {
//MOD qiongli 2012-7-10 TDQ-5801,hide also 'MSsql 2005/2008' for DQ after delete that MS jars.
if (perId.equalsIgnoreCase(IBrandingConfiguration.PERSPECTIVE_DI_ID)
|| perId.equalsIgnoreCase(IBrandingConfiguration.PERSPECTIVE_DQ_ID)) {
if (dbTypeDisplayList != null) {
ArrayList<String> newList = new ArrayList<String>(dbTypeDisplayList);
for (int i = 0; i < newList.size(); i++) {
@@ -729,19 +731,6 @@ public class DatabaseForm extends AbstractForm {
}
dbTypeDisplayList = newList;
}
} else if (perId.equalsIgnoreCase(IBrandingConfiguration.PERSPECTIVE_DQ_ID)) {
if (dbTypeDisplayList != null) {
ArrayList<String> newList = new ArrayList<String>(dbTypeDisplayList);
if (!newList.contains(("Microsoft SQL Server 2005/2008"))) {
for (int i = 0; i < newList.size(); i++) {
if (newList.get(i).equalsIgnoreCase(("Microsoft SQL Server"))) {
newList.add(i, "Microsoft SQL Server 2005/2008");
break;
}
}
}
dbTypeDisplayList = newList;
}
}
}
}