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

bug TDI-27784:A shell is activated after pressing Finish button when creating General JDBC for DB2 and Teradata.

Browse Source 
git-svn-id: http://talendforge.org/svn/tos/trunk@110500 f6f1c999-d317-4740-80b0-e6d1abc6f99e
This commit is contained in:
plv
2013-11-05 08:18:21 +00:00
parent 68d1c6b07d
commit b43f70e1e7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/ExtractMetaDataUtils.java
View File

@@ -45,8 +45,6 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Shell;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.utils.database.AS400DatabaseMetaData;
import org.talend.commons.utils.database.DB2ForZosDataBaseMetadata;
@@ -898,9 +896,8 @@ public class ExtractMetaDataUtils {
if (!checkFileCRCCode(new File(getJavaLibPath() + path.lastSegment()), new File(jar))) {
String librariesPath = getLibrariesPath(ECodeLanguage.JAVA);
File existJar = new File(librariesPath + File.separator + path.lastSegment());
if (existJar.exists()
&& MessageDialog.openQuestion(new Shell(), "",
"This JAR has been modified,do you want to use this jar")) {
// here will overwrite the original jar if exist(TDI-27784)
if (existJar.exists()) {
existJar.delete();
FilesUtils.copyFile(new File(jar), existJar);
}
@@ -1083,6 +1080,7 @@ public class ExtractMetaDataUtils {
}
public boolean checkFileCRCCode(File targetFile, File sourceFile) throws Exception {
// Cyclic Redundancy Check(CRC)
if (!targetFile.exists() || !sourceFile.exists()) {
return true;
}