diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/.classpath b/code/datastudio/src/org.opengauss.mppdbide.view/.classpath index 71b0e34b9c650e5852f4eba94bb4a1ad37ea4dd0..7d0cd38e25be936055aacb7b558c09025b56c3a5 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/.classpath +++ b/code/datastudio/src/org.opengauss.mppdbide.view/.classpath @@ -1,21 +1,16 @@ - - + - - - - - - - + + + + + - - diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/META-INF/MANIFEST.MF b/code/datastudio/src/org.opengauss.mppdbide.view/META-INF/MANIFEST.MF index 9263a8b234ba818aa6d310452a324e68dbc9a5e6..b8eb0ac833da42df25c1d6c12399ba8fd40b220e 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/META-INF/MANIFEST.MF +++ b/code/datastudio/src/org.opengauss.mppdbide.view/META-INF/MANIFEST.MF @@ -66,11 +66,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.15.300", org.eclipse.gef.geometry.convert.swt;bundle-version="5.0.2", org.eclipse.gef.fx.jface;bundle-version="5.0.2", org.apache.commons.lang3;bundle-version="3.1.0", - openjfx.base;bundle-version="17.0.1", - openjfx.controls;bundle-version="17.0.1", - openjfx.graphics.win32_64;bundle-version="17.0.1", - openjfx.swing;bundle-version="17.0.1", - openjfx.swt;bundle-version="17.0.1" + openjfx.base;bundle-version="17.0.2", + openjfx.controls;bundle-version="17.0.2", + openjfx.graphics.win32_64;bundle-version="17.0.2", + openjfx.swing;bundle-version="17.0.2", + openjfx.swt;bundle-version="17.0.2" Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Import-Package: com.google.common.collect;version="15.0.0", diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/build.properties b/code/datastudio/src/org.opengauss.mppdbide.view/build.properties index ecda4b3d6d20bf14b470722a2cf1f95c23346d62..2f52848b2420c822b35ea0fcdaab17e9cddd4d08 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/build.properties +++ b/code/datastudio/src/org.opengauss.mppdbide.view/build.properties @@ -8,5 +8,8 @@ bin.includes = META-INF/,\ icons/,\ build.properties,\ gson-2.8.6.jar,\ - guava-30.1.1-jre.jar + guava-30.1.1-jre.jar,\ + javafx-graphics-17.0.2-win.jar,\ + javafx-controls-17.0.2-win.jar,\ + javafx-base-17.0.2-win.jar diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/ui/terminal/resulttab/GridResultDataSelectedCopyToExcel.java b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/ui/terminal/resulttab/GridResultDataSelectedCopyToExcel.java index 8424adf1ea404fff3de737d5f6ed0b7353682d77..e03d01c8046af7f482cbc47a00c68fa657632335 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/ui/terminal/resulttab/GridResultDataSelectedCopyToExcel.java +++ b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/ui/terminal/resulttab/GridResultDataSelectedCopyToExcel.java @@ -203,14 +203,13 @@ public class GridResultDataSelectedCopyToExcel extends Observable { boolean fileExists = Files.exists(newPath); if (!fileExists) { Set supportedAttr = newPath.getFileSystem().supportedFileAttributeViews(); - FileAttribute> fileAttributes = new DSFileAttributes(null); try { - newPath = Files.createDirectory(newPath, fileAttributes); if (supportedAttr.contains("acl")) { FilePermissionFactory.getFilePermissionInstance().createFileWithPermission(newPath.toString(), true, null, true); + } - } catch (IOException | DatabaseOperationException exception) { + } catch (DatabaseOperationException exception) { MPPDBIDELoggerUtility.error(MessageConfigLoader.getProperty(IMessagesConstants.CREATE_FILE_FAIL_ERR), exception); } diff --git a/code/datastudio/src/pom.xml b/code/datastudio/src/pom.xml index f5b0bd3674cd0066e983926a937d6f4f78cf5dc8..86e919eca448f6d80f72188bca70cd0f0c9626a9 100644 --- a/code/datastudio/src/pom.xml +++ b/code/datastudio/src/pom.xml @@ -38,7 +38,7 @@ http://${url.ip}${url.port}/eclipse/tools/gef/updates/releases/5.1.0_gef-master_5509/ http://${url.ip}${url.port}/eclipse/efxclipse/updates-released/3.5.0/site/ http://${url.ip}${url.port}/eclipse/releases/2021-12/202112081000/ - https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx-17.0.1/ + https://downloads.efxclipse.bestsolution.at/p2-repos/openjfx-17.0.2/