From 3d4e74d5bf8d6581d4c89886c18a91dad0bf259f Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 18 Oct 2021 15:41:53 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-61095=20=E6=95=B0=E6=8D=AE=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E4=B8=8E=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E4=B8=A4=E6=AC=A1=E9=87=8D=E5=91=BD=E5=90=8D=E5=90=8E?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E4=B8=8E=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/server/GlobalTableDataAction.java | 1 - .../com/fr/design/data/datapane/TableDataPaneListPane.java | 2 +- .../design/data/datapane/connect/ConnectionListPane.java | 7 +------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java index fdfdc31b5..1457f0d11 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java @@ -88,7 +88,6 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS } protected void renameConnection(final String oldName, final String newName) { - tableDataConfig.renameTableData(oldName, newName); StrategyEventsNotifier.modifyDataSet(DSMapping.ofServerDS(new DsNameTarget(oldName))); } }; diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java index 32bd070d9..a16c16e24 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java @@ -251,7 +251,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData try { WorkContext.getCurrent().get(TableDataOperator.class).saveTableData(tableDataBeans); if (!WorkContext.getCurrent().isLocal()) { - EventDispatcher.fire(RemoteConfigEvent.EDIT, TableDataConfig.class.getSimpleName()); + EventDispatcher.fire(RemoteConfigEvent.EDIT, TableDataConfig.getInstance().getNameSpace()); } } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java index 018aa8f4c..4ce851295 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java @@ -182,7 +182,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh try { WorkContext.getCurrent().get(ConnectionOperator.class).saveConnection(connectionBeans); if (!WorkContext.getCurrent().isLocal()) { - EventDispatcher.fire(RemoteConfigEvent.EDIT, ConnectionConfig.class.getSimpleName()); + EventDispatcher.fire(RemoteConfigEvent.EDIT, ConnectionConfig.getInstance().getNameSpace()); } } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); @@ -197,11 +197,6 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh ConnectionConfig cloned = connectionConfig.mirror(); populate(cloned); } - - @Override - protected void renameConnection(String oldName, String newName) { - connectionConfig.renameConnection(oldName, newName); - } }; final BasicDialog connectionListDialog = connectionManagerPane.showLargeWindow(parent, null); connectionListDialog.addDialogActionListener(new ConnectionListDialogActionAdapter(connectionManagerPane, connectionListDialog, connectionConfig));