Browse Source

Merge pull request #1703 in BA/design from ~KERRY/design:feature/10.0 to feature/10.0

* commit 'd12c86ea2e9ed9cf25b7cde87bc439db5cc2a4a5':
  无
  REPORT-6956 删除无用逻辑
  REPORT-6956 设计器适配10.0配置写法
master
superman 7 years ago
parent
commit
a915d45a90
  1. 40
      designer_base/src/com/fr/design/actions/server/ConnectionListAction.java
  2. 38
      designer_base/src/com/fr/design/actions/server/GlobalTableDataAction.java

40
designer_base/src/com/fr/design/actions/server/ConnectionListAction.java

@ -108,39 +108,8 @@ public class ConnectionListAction extends UpdateAction {
* @return boolean 是否更新成功 * @return boolean 是否更新成功
*/ */
public static boolean doWithDatasourceManager(ConnectionConfig datasourceManager, ConnectionShowPane connectionShowPane, BasicDialog databaseListDialog) { public static boolean doWithDatasourceManager(ConnectionConfig datasourceManager, ConnectionShowPane connectionShowPane, BasicDialog databaseListDialog) {
// HashMap<String, Connection> modifyDetails = datasourceManager.getConnectionModifyDetails(); connectionShowPane.update(datasourceManager);
// modifyDetails.clear();
// Env currentEnv = FRContext.getCurrentEnv();
// ModifiedTable localModifiedTable = datasourceManager.checkConnectionModifyTable(backupManager, currentEnv.getUserID());
boolean isFailed = false; 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); int index = isConnectionMapContainsRename(datasourceManager);
if (index != -1) { if (index != -1) {
@ -148,12 +117,7 @@ public class ConnectionListAction extends UpdateAction {
connectionShowPane.setSelectedIndex(index); connectionShowPane.setSelectedIndex(index);
} }
databaseListDialog.setDoOKSucceed(!isFailed); databaseListDialog.setDoOKSucceed(!isFailed);
// //如果修改成功,则去远程端增量修改修改表
// if (!isFailed && !currentEnv.isSupportLocalFileOperate()) {
// currentEnv.writeDataSourceModifiedTables(localModifiedTable, DatasourceManager.CONNECTION);
// localModifiedTable.clear();
// modifyDetails.clear();
// }
return !isFailed; return !isFailed;
} }

38
designer_base/src/com/fr/design/actions/server/GlobalTableDataAction.java

@ -131,38 +131,8 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
* @return * @return
*/ */
private boolean doWithDatasourceManager(TableDataConfig datasourceManager, TableDataManagerPane tableDataManagerPane, BasicDialog databaseListDialog) { private boolean doWithDatasourceManager(TableDataConfig datasourceManager, TableDataManagerPane tableDataManagerPane, BasicDialog databaseListDialog) {
// HashMap<String, TableData> modifyDetails = datasourceManager.getTableDataModifyDetails();
// modifyDetails.clear();
// Env currentEnv = FRContext.getCurrentEnv();
// ModifiedTable localModifiedTable = datasourceManager.checkTableDataModifyTable(backupManager, currentEnv.getUserID());
boolean isFailed = false; 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); int index = isTableDataMapContainsRename(datasourceManager);
if (index != -1) { if (index != -1) {
@ -170,12 +140,6 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
tableDataManagerPane.setSelectedIndex(index); tableDataManagerPane.setSelectedIndex(index);
} }
databaseListDialog.setDoOKSucceed(!isFailed); databaseListDialog.setDoOKSucceed(!isFailed);
//如果修改成功,则去远程端增量修改修改表
// if (!isFailed && !currentEnv.isSupportLocalFileOperate()) {
// currentEnv.writeDataSourceModifiedTables(localModifiedTable, DatasourceManager.TABLEDATA);
// localModifiedTable.clear();
// modifyDetails.clear();
// }
return !isFailed; return !isFailed;
} }

Loading…
Cancel
Save