From 41b5e042c918a516cfb950812a77df83794b9216 Mon Sep 17 00:00:00 2001 From: mystarry-sky Date: Thu, 19 May 2022 14:26:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dissue=EF=BC=9A=E5=BB=BA?= =?UTF-8?q?=E8=A1=A8/=E8=A7=86=E5=9B=BE=E5=90=8E=EF=BC=8C=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E5=8F=B3=E5=87=BB=E6=9F=A5=E7=9C=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E5=8F=B3=E5=87=BB=E5=A4=8D=E5=88=B6=E5=88=B0excel?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E4=B8=A4=E7=A7=8D=E6=A0=BC=E5=BC=8F=E5=9D=87?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E8=80=8C?= =?UTF-8?q?=E6=8A=A5=E9=94=99=203th=20pom=20version=20recovery=20to=2018+2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/org.opengauss.mppdbide.view/.classpath | 17 ++++++----------- .../META-INF/MANIFEST.MF | 10 +++++----- .../build.properties | 5 ++++- .../GridResultDataSelectedCopyToExcel.java | 5 ++--- code/datastudio/src/pom.xml | 2 +- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/.classpath b/code/datastudio/src/org.opengauss.mppdbide.view/.classpath index 71b0e34b..7d0cd38e 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 9263a8b2..b8eb0ac8 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 ecda4b3d..2f52848b 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 8424adf1..e03d01c8 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 f5b0bd36..86e919ec 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/ -- Gitee