From 8d7f932c6fe45ed9f8ab378ca544538f604b76b9 Mon Sep 17 00:00:00 2001 From: kerry Date: Tue, 6 Mar 2018 10:49:26 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-6956=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actions/server/ConnectionListAction.java | 39 +------------------ .../actions/server/GlobalTableDataAction.java | 32 +-------------- 2 files changed, 2 insertions(+), 69 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java b/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java index 758bcd359..6fbad6de4 100644 --- a/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java +++ b/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java @@ -109,39 +109,7 @@ public class ConnectionListAction extends UpdateAction { */ public static boolean doWithDatasourceManager(ConnectionConfig datasourceManager, ConnectionShowPane connectionShowPane, BasicDialog databaseListDialog) { connectionShowPane.update(datasourceManager); -// HashMap modifyDetails = datasourceManager.getConnectionModifyDetails(); -// modifyDetails.clear(); -// Env currentEnv = FRContext.getCurrentEnv(); -// ModifiedTable localModifiedTable = datasourceManager.checkConnectionModifyTable(backupManager, currentEnv.getUserID()); boolean isFailed = false; -// if (currentEnv.isSupportLocalFileOperate() && !((LocalEnv) currentEnv).isNoRemoteUser()) { -// //如果是本地，并且有远程用户时则更新自己的修改表 -// datasourceManager.updateSelfConnectionTotalModifiedTable(localModifiedTable, ModifiedTable.LOCAL_MODIFIER); -// } else { -// if (!currentEnv.isSupportLocalFileOperate()) { -// //如果是远程，则去取服务器的最新的修改表,检查有没有冲突 -// ModifiedTable currentServerModifyTable = currentEnv.getDataSourceModifiedTables(DatasourceManager.CONNECTION); -// if (localModifiedTable.checkModifiedTableConflictWithServer(currentServerModifyTable, currentEnv.getUserID())) { -// //有冲突，进行提示 -// String title = Inter.getLocText(new String[]{"Select", "Single", "Setting"}); -// int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), localModifiedTable.getWaringMessage(), title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); -// if (returnVal == JOptionPane.YES_OPTION) { -// //点击是，进行相应刷新去冲突 -// datasourceManager.synchronizedWithServer(backupManager, DatasourceManager.CONNECTION); -// //要是有重命名冲突的，则对详细的修改表先进行修改 -// datasourceManager.doWithConnectionConflict(localModifiedTable); -// localModifiedTable.removeConfilct(); -// modifyDetails.clear(); -// //更新面板 -// connectionShowPane.populate(datasourceManager); -// } else { -// //更新失败，继续停留页面 -// isFailed = true; -// } -// -// } -// } -// } //存在请重命名则不能更新 int index = isConnectionMapContainsRename(datasourceManager); if (index != -1) { @@ -149,12 +117,7 @@ public class ConnectionListAction extends UpdateAction { connectionShowPane.setSelectedIndex(index); } databaseListDialog.setDoOKSucceed(!isFailed); -// //如果修改成功，则去远程端增量修改修改表 -// if (!isFailed && !currentEnv.isSupportLocalFileOperate()) { -// currentEnv.writeDataSourceModifiedTables(localModifiedTable, DatasourceManager.CONNECTION); -// localModifiedTable.clear(); -// modifyDetails.clear(); -// } + return !isFailed; } diff --git a/designer_base/src/com/fr/design/actions/server/GlobalTableDataAction.java b/designer_base/src/com/fr/design/actions/server/GlobalTableDataAction.java index 744dfea2a..5e172d475 100644 --- a/designer_base/src/com/fr/design/actions/server/GlobalTableDataAction.java +++ b/designer_base/src/com/fr/design/actions/server/GlobalTableDataAction.java @@ -131,38 +131,8 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS * @return */ private boolean doWithDatasourceManager(TableDataConfig datasourceManager, TableDataManagerPane tableDataManagerPane, BasicDialog databaseListDialog) { -// HashMap modifyDetails = datasourceManager.getTableDataModifyDetails(); -// modifyDetails.clear(); -// Env currentEnv = FRContext.getCurrentEnv(); -// ModifiedTable localModifiedTable = datasourceManager.checkTableDataModifyTable(backupManager, currentEnv.getUserID()); boolean isFailed = false; -// if (currentEnv.isSupportLocalFileOperate() && !((LocalEnv) currentEnv).isNoRemoteUser()) { -// //如果是本地，并且有远程用户时则更新自己的修改表 -// datasourceManager.updateSelfTableDataTotalModifiedTable(localModifiedTable, ModifiedTable.LOCAL_MODIFIER); -// } else { -// if (!currentEnv.isSupportLocalFileOperate()) { -// //如果是远程，则去取服务器的最新的修改表,检查有没有冲突 -// ModifiedTable currentServerModifyTable = currentEnv.getDataSourceModifiedTables(DatasourceManager.TABLEDATA); -// if (localModifiedTable.checkModifiedTableConflictWithServer(currentServerModifyTable, currentEnv.getUserID())) { -// //有冲突，进行提示 -// String title = Inter.getLocText(new String[]{"Select", "Single", "Setting"}); -// int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), localModifiedTable.getWaringMessage(), title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); -// if (returnVal == JOptionPane.YES_OPTION) { -// //点击是，进行相应刷新去冲突 -// datasourceManager.synchronizedWithServer(backupManager, DatasourceManager.TABLEDATA); -// //要是有重命名冲突的，则对详细的修改表先进行修改 -// datasourceManager.doWithTableDataConfilct(localModifiedTable); -// localModifiedTable.removeConfilct(); -// modifyDetails.clear(); -// //更新面板 -// tableDataManagerPane.populate(datasourceManager); -// } else { -// //更新失败，继续停留页面 -// isFailed = true; -// } -// } -// } -// } +// //存在请重命名则不能更新 int index = isTableDataMapContainsRename(datasourceManager); if (index != -1) {