Pull request #5775: KERNEL-8990 远程设计配置保存问题的优化

Merge in DESIGN/design from ~HADES/design:feature/x to feature/x

* commit 'feaf3a37bfb81a1e85aad9073652d1e931bb70c1':
  KERNEL-8990 远程设计配置保存问题的优化

designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java

@@ -25,9 +25,6 @@ import com.fr.esd.event.DsNameTarget;
 import com.fr.esd.event.StrategyEventsNotifier;
 import com.fr.file.TableDataConfig;
 
-import com.fr.transaction.CallBackAdaptor;
-import com.fr.transaction.Configurations;
-import com.fr.transaction.WorkerFacade;
 import com.fr.report.LockItem;
 
 import javax.swing.KeyStroke;
@@ -106,34 +103,18 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
                     globalTableDataDialog.setDoOKSucceed(false);
                     return;
                 }
+                globalTableDataPane.update(tableDataConfig);
                 DesignTableDataManager.clearGlobalDs();
                 // 保存时 移除服务器数据集列名缓存
                 for (String name : tableDataConfig.getTableDatas().keySet()) {
                     DesignTableDataManager.removeSelectedColumnNames(name);
                 }
-
-                Configurations.modify(new WorkerFacade(TableDataConfig.class) {
-                    @Override
-                    public void run() {
-                        globalTableDataPane.update(tableDataConfig);
-                    }
-                }.addCallBack(new CallBackAdaptor() {
-                    @Override
-                    public boolean beforeCommit() {
-                        //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
-                        return doWithDatasourceManager(tableDataConfig, globalTableDataPane, globalTableDataDialog);
-                    }
-
-                    @Override
-                    public void afterCommit() {
                 // 刷新共有数据集
                 TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
                 fireDSChanged(globalTableDataPane.getDsChangedNameMap());
                 // 关闭服务器数据集页面，为其解锁
                 EditLockUtils.unlock(LockItem.SERVER_TABLE_DATA);
             }
-                }));
-            }
 
             @Override
             public void doCancel() {

designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java

@@ -1,6 +1,8 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.TableData;
+import com.fr.base.TableDataBean;
+import com.fr.config.RemoteConfigEvent;
 import com.fr.data.TableDataSource;
 import com.fr.data.api.StoreProcedureAssist;
 import com.fr.data.impl.storeproc.StoreProcedure;
@@ -12,22 +14,26 @@ import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.i18n.Toolkit;
+import com.fr.event.EventDispatcher;
 import com.fr.file.ProcedureConfig;
 import com.fr.file.TableDataConfig;
+import com.fr.file.TableDataOperator;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
+import com.fr.third.org.apache.commons.collections4.MapUtils;
+import com.fr.workspace.WorkContext;
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -231,15 +237,25 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
 
     @Override
     public void update(TableDataConfig tableDataConfig) {
-        tableDataConfig.removeAllTableData();
-        ProcedureConfig.getInstance().removeAllProcedure();
         Nameable[] tableDataArray = this.update();
-        Map<String, TableData> tableDataMap = new LinkedHashMap<String, TableData>();
+        List<TableDataBean> tableDataBeans = new ArrayList<>();
+        Map<String, String> map = MapUtils.invertMap(getDsNameChangedMap());
         for (int i = 0; i < tableDataArray.length; i++) {
             NameObject nameObject = (NameObject) tableDataArray[i];
-            tableDataMap.put(nameObject.getName(), (TableData) nameObject.getObject());
+            String oldName = map.get(nameObject.getName());
+            if (oldName == null) {
+                oldName = StringUtils.EMPTY;
+            }
+            tableDataBeans.add(new TableDataBean(nameObject.getName(), oldName, (TableData) nameObject.getObject()));
+        }
+        try {
+            WorkContext.getCurrent().get(TableDataOperator.class).saveTableData(tableDataBeans);
+            if (!WorkContext.getCurrent().isLocal()) {
+                EventDispatcher.fire(RemoteConfigEvent.EDIT, TableDataConfig.class.getSimpleName());
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
-        tableDataConfig.setTableDatas(tableDataMap);
     }
 
     @Override

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java

@@ -5,20 +5,13 @@ import com.fr.data.impl.AbstractDatabaseConnection;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.NameDatabaseConnection;
 import com.fr.design.DesignerEnvManager;
-import com.fr.design.actions.server.ConnectionListAction;
-import com.fr.design.dialog.BasicDialog;
-import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.editlock.ConnectionLockChangeChecker;
 import com.fr.design.editlock.EditLockUtils;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UILockButton;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.file.ConnectionConfig;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.StringUtils;
-import com.fr.transaction.CallBackAdaptor;
-import com.fr.transaction.Configurations;
-import com.fr.transaction.WorkerFacade;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.connection.DBConnectAuth;
 import com.fr.report.LockItem;
@@ -132,48 +125,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
             return;
         }
         // 锁定成功，执行后续操作
-        final ConnectionListPane connectionListPane = new ConnectionListPane();
+        ConnectionListPane.showDialog(SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this));
-        final ConnectionConfig connectionConfig = ConnectionConfig.getInstance();
-        ConnectionConfig cloned = connectionConfig.mirror();
-        connectionListPane.populate(cloned);
-        final BasicDialog connectionListDialog = connectionListPane.showLargeWindow(
-                SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), null);
-        connectionListDialog.addDialogActionListener(new DialogActionAdapter() {
-            public void doOk() {
-                if (!connectionListPane.isNamePermitted()) {
-                    connectionListDialog.setDoOKSucceed(false);
-                    return;
-                }
-                Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
-                    @Override
-                    public void run() {
-                        connectionListPane.update(connectionConfig);
-                    }
-                }.addCallBack(new CallBackAdaptor() {
-                    @Override
-                    public boolean beforeCommit() {
-                        //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
-                        return ConnectionListAction.doWithDatasourceManager(connectionConfig, connectionListPane, connectionListDialog);
-                    }
-
-                    @Override
-                    public void afterCommit() {
-                        DesignerContext.getDesignerBean("databasename").refreshBeanElement();
-                        // 关闭定义数据连接页面，为其解锁
-                        EditLockUtils.unlock(LockItem.CONNECTION);
-                    }
-                }));
-
-            }
-
-            @Override
-            public void doCancel() {
-                // 关闭定义数据连接页面，为其解锁
-                super.doCancel();
-                EditLockUtils.unlock(LockItem.CONNECTION);
-            }
-        });
-        connectionListDialog.setVisible(true);
         refreshItems();
     }
 

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListDialogActionAdapter.java

@@ -0,0 +1,48 @@
+package com.fr.design.data.datapane.connect;
+
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.editlock.EditLockUtils;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.file.ConnectionConfig;
+import com.fr.report.LockItem;
+
+/**
+ * @author hades
+ * @version 11.0
+ * Created by hades on 2021/9/8
+ */
+public class ConnectionListDialogActionAdapter extends DialogActionAdapter {
+
+    private final ConnectionManagerPane connectionManagerPane;
+    private final BasicDialog connectionListDialog;
+    private final ConnectionConfig connectionConfig;
+
+    public ConnectionListDialogActionAdapter(ConnectionManagerPane connectionManagerPane,
+                                             BasicDialog connectionListDialog,
+                                             ConnectionConfig connectionConfig) {
+        this.connectionManagerPane = connectionManagerPane;
+        this.connectionListDialog = connectionListDialog;
+        this.connectionConfig = connectionConfig;
+    }
+
+    @Override
+    public void doOk() {
+        if (!connectionManagerPane.isNamePermitted()) {
+            connectionListDialog.setDoOKSucceed(false);
+            return;
+        }
+        connectionManagerPane.update(connectionConfig);
+        DesignerContext.getDesignerBean("databasename").refreshBeanElement();
+        // 关闭定义数据连接页面，为其解锁
+        EditLockUtils.unlock(LockItem.CONNECTION);
+
+    }
+
+    @Override
+    public void doCancel() {
+        // 关闭定义数据连接页面，为其解锁
+        super.doCancel();
+        EditLockUtils.unlock(LockItem.CONNECTION);
+    }
+}

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

@@ -1,23 +1,32 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.config.RemoteConfigEvent;
 import com.fr.data.impl.Connection;
+import com.fr.data.impl.ConnectionBean;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.impl.JNDIDatabaseConnection;
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.fun.ConnectionProvider;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.i18n.Toolkit;
+import com.fr.event.EventDispatcher;
 import com.fr.file.ConnectionConfig;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
+import com.fr.third.org.apache.commons.collections4.MapUtils;
+import com.fr.workspace.WorkContext;
+import com.fr.file.ConnectionOperator;
+import java.awt.Window;
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -67,8 +76,19 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
 
 
     protected void rename(String oldName, String newName) {
-        renameMap.remove(selectedName);
+        //如果a改成了b,b又被改成了c,就认为是a改成了c
-        renameMap.put(selectedName, newName);
+        for (Map.Entry<String, String> entry : renameMap.entrySet()) {
+            if (StringUtils.equals(oldName, entry.getValue())) {
+                oldName = entry.getKey();
+                break;
+            }
+        }
+        if (StringUtils.equals(oldName, newName)) {
+            //a -> b;b -> a,说明没改
+            renameMap.remove(oldName);
+        } else {
+            renameMap.put(oldName, newName);
+        }
     }
 
     /**
@@ -149,14 +169,42 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
     public void update(ConnectionConfig connectionConfig) {
         // Nameable[]居然不能强转成NameObject[],一定要这么写...
         Nameable[] res = this.update();
-        NameObject[] res_array = new NameObject[res.length];
+        List<ConnectionBean> connectionBeans = new ArrayList<>();
-        java.util.Arrays.asList(res).toArray(res_array);
+        Map<String, String> map = MapUtils.invertMap(getRenameMap());
+        for (int i = 0; i < res.length; i++) {
+            NameObject nameObject = (NameObject) res[i];
+            String oldName = map.get(nameObject.getName());
+            if (oldName == null) {
+                oldName = StringUtils.EMPTY;
+            }
+            connectionBeans.add(new ConnectionBean(nameObject.getName(), oldName, (Connection) nameObject.getObject()));
+        }
+        try {
+            WorkContext.getCurrent().get(ConnectionOperator.class).saveConnection(connectionBeans);
+            if (!WorkContext.getCurrent().isLocal()) {
+                EventDispatcher.fire(RemoteConfigEvent.EDIT, ConnectionConfig.class.getSimpleName());
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+    }
 
-        connectionConfig.removeAllConnection();
+    public static void showDialog(Window parent) {
+        final ConnectionConfig connectionConfig = ConnectionConfig.getInstance();
+        final ConnectionManagerPane connectionManagerPane = new ConnectionManagerPane() {
+            @Override
+            public void complete() {
+                ConnectionConfig cloned = connectionConfig.mirror();
+                populate(cloned);
+            }
 
-        for (int i = 0; i < res_array.length; i++) {
+            @Override
-            NameObject nameObject = res_array[i];
+            protected void renameConnection(String oldName, String newName) {
-            connectionConfig.addConnection(nameObject.getName(), (Connection) nameObject.getObject());
+                connectionConfig.renameConnection(oldName, newName);
             }
+        };
+        final BasicDialog connectionListDialog = connectionManagerPane.showLargeWindow(parent, null);
+        connectionListDialog.addDialogActionListener(new ConnectionListDialogActionAdapter(connectionManagerPane, connectionListDialog, connectionConfig));
+        connectionListDialog.setVisible(true);
     }
 }

designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java

@@ -1,18 +1,8 @@
 package com.fr.design.os.impl;
 
-import com.fr.design.data.datapane.connect.ConnectionManagerPane;
+import com.fr.design.data.datapane.connect.ConnectionListPane;
-import com.fr.design.dialog.BasicDialog;
-import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.editlock.EditLockUtils;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.DesignerFrame;
-import com.fr.file.ConnectionConfig;
 import com.fr.stable.os.support.OSBasedAction;
-import com.fr.transaction.CallBackAdaptor;
-import com.fr.transaction.Configurations;
-import com.fr.transaction.WorkerFacade;
-import com.fr.report.LockItem;
-import static com.fr.design.actions.server.ConnectionListAction.doWithDatasourceManager;
 
 /**
  * 数据连接窗口
@@ -33,54 +23,7 @@ public class DatabaseDialogAction implements OSBasedAction {
     }
 
     private void openDesignDatabaseManager() {
-        DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
+        ConnectionListPane.showDialog(DesignerContext.getDesignerFrame());
-        final ConnectionConfig datasourceManager = ConnectionConfig.getInstance();
-        final ConnectionManagerPane databaseManagerPane = new ConnectionManagerPane() {
-            public void complete() {
-                ConnectionConfig connectionConfig = datasourceManager.mirror();
-                populate(connectionConfig);
-            }
-
-            protected void renameConnection(String oldName, String newName) {
-                datasourceManager.renameConnection(oldName, newName);
-            }
-        };
-        final BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null);
-        databaseListDialog.addDialogActionListener(new DialogActionAdapter() {
-            public void doOk() {
-                if (!databaseManagerPane.isNamePermitted()) {
-                    databaseListDialog.setDoOKSucceed(false);
-                    return;
-                }
-                Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
-                    @Override
-                    public void run() {
-                        databaseManagerPane.update(datasourceManager);
-                    }
-                }.addCallBack(new CallBackAdaptor() {
-                    @Override
-                    public boolean beforeCommit() {
-                        //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
-                        return doWithDatasourceManager(datasourceManager, databaseManagerPane, databaseListDialog);
-                    }
-
-                    @Override
-                    public void afterCommit() {
-                        DesignerContext.getDesignerBean("databasename").refreshBeanElement();
-                        // 定义数据连接弹窗关闭后，解锁
-                        EditLockUtils.unlock(LockItem.CONNECTION);
-                    }
-                }));
-            }
-
-            @Override
-            public void doCancel() {
-                super.doCancel();
-                // 定义数据连接弹窗关闭后，解锁
-                EditLockUtils.unlock(LockItem.CONNECTION);
-            }
-        });
-        databaseListDialog.setVisible(true);
     }