From 3832ab0684f72568705a21611baa3e6275662db4 Mon Sep 17 00:00:00 2001
From: Maximus <49313791+num73@users.noreply.github.com>
Date: Fri, 24 Feb 2023 16:21:15 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-86502=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E8=BF=9E=E6=8E=A5=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E9=A9=B1=E5=8A=A8=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=B8=8E=E6=A3=80=E6=B5=8B=E9=A9=B1=E5=8A=A8?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connect/DatabaseConnectionPane.java       | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
index 4d5556ef95..9974c88107 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
@@ -3,6 +3,7 @@
  */
 package com.fr.design.data.datapane.connect;
 
+import com.fr.data.driver.util.JarFileParseUtil;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.impl.JNDIDatabaseConnection;
@@ -32,10 +33,12 @@ import com.fr.workspace.WorkContext;
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JDialog;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.ScrollPaneConstants;
+import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 import javax.swing.UIManager;
@@ -55,6 +58,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.io.File;
 import java.net.URI;
 import java.util.concurrent.ExecutionException;
 
@@ -190,6 +194,55 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                             JScrollPane jsp = new JScrollPane(jta);
                             jsp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
                             jsp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+                            Connection con = DatabaseConnectionPane.this.updateBean();
+                            if(con instanceof JDBCDatabaseConnection) {
+                                JPanel xBorderPanel = new JPanel();
+                                xBorderPanel.setLayout(new BorderLayout());
+                                UILabel driverTestTip = new UILabel();
+                                JLabel testResult = new JLabel();
+                                driverTestTip.setForeground(Color.BLUE);
+                                driverTestTip.setVisible(true);
+                                testResult.setVisible(false);
+                                testResult.setHorizontalAlignment(SwingConstants.CENTER);
+                                driverTestTip.setText(Toolkit.i18nText("Fine_Designer_Driver_Path_Test"));
+                                xBorderPanel.add(driverTestTip, BorderLayout.WEST);
+                                xBorderPanel.add(testResult, BorderLayout.CENTER);
+                                String driverPath = JarFileParseUtil.getDriverClassPath((JDBCDatabaseConnection) con);
+                                jta.append(Toolkit.i18nText("Fine_Designer_Current_Driver_Path") + ":" + driverPath + "\n");
+                                driverTestTip.addMouseListener(new MouseAdapter() {
+                                    @Override
+                                    public void mouseEntered(MouseEvent e) {
+                                        driverTestTip.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                                    }
+
+                                    @Override
+                                    public void mouseExited(MouseEvent e) {
+                                        driverTestTip.setCursor(Cursor.getDefaultCursor());
+                                    }
+                                    @Override
+                                    public void mouseClicked(MouseEvent e) {
+                                        try {
+                                            String path;
+                                            if(driverPath.endsWith(JarFileParseUtil.JAR_MARKER)) {
+                                                path = new File(driverPath).getParent();
+                                            } else {
+                                                path = driverPath;
+                                            }
+                                            if(JarFileParseUtil.hasDuplicateDriver(con.getDriver(), path)) {
+                                                testResult.setForeground(Color.RED);
+                                                testResult.setText(Toolkit.i18nText("Fine_Designer_Driver_Conflict"));
+                                            } else {
+                                                testResult.setForeground(Color.BLACK);
+                                                testResult.setText(Toolkit.i18nText("Fine_Designer_Driver_No_Conflict"));
+                                            }
+                                            testResult.setVisible(true);
+                                        } catch (Exception clickException) {
+                                            FineLoggerFactory.getLogger().warn(clickException, "can not test driver conflict");
+                                        }
+                                    }
+                                });
+                                borderPanel.add(xBorderPanel, BorderLayout.NORTH);
+                            }
                             jta.append(select.getResultException().getDetailMessage() + "\n");
                             jta.append(select.getResultException().getSolution());
                             jta.setCaretPosition(0);