Merging in latest from upstream (BA/design:refs/heads/feature/10.0)

* commit '401b9fc48a3f2110afe8e0590b2dd9586ecadb74':
  REPORT-7059 数据连接无法保存的问题
  无
  REPORT-6956 删除无用逻辑
  REPORT-6956 设计器适配10.0配置写法
  无jira任务，10.0启动
  无JIRA任务 配置文件克隆

designer/src/com/fr/design/actions/server/ServerConfigManagerAction.java

@@ -42,7 +42,7 @@ public class ServerConfigManagerAction extends UpdateAction {
         final EditReportServerParameterPane editReportServerParameterPane = new EditReportServerParameterPane() {
             @Override
             public void complete() {
-                populate(config.copy());
+                populate(config.mirror());
             }
         };
 

designer/src/com/fr/design/actions/server/StyleListAction.java

@@ -55,7 +55,7 @@ public class StyleListAction extends UpdateAction {
 			}                
         });
 
-        styleListPane.populate(ServerConfig.getInstance().copy());
+        styleListPane.populate(ServerConfig.getInstance().mirror());
 		styleListDialog.setVisible(true);
 	
 	}

designer/src/com/fr/design/actions/server/WidgetManagerAction.java

@@ -37,7 +37,7 @@ public class WidgetManagerAction extends UpdateAction {
         final WidgetManagerPane widgetManagerPane = new WidgetManagerPane() {
             @Override
             public void complete() {
-                populate(widgetManager.copy());
+                populate(widgetManager.mirror());
             }
         };
 

designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java

@@ -95,10 +95,8 @@ public class UserInfoLabel extends UILabel {
     private void init(UserInfoPane userInfoPane) {
         this.userInfoPane = userInfoPane;
 
-        String userName = ServerConfig.getInstance().getBbsUsername();
         this.addMouseListener(userInfoAdapter);
         this.setHorizontalAlignment(SwingConstants.CENTER);
-        this.setText(userName);
 
         if (StableUtils.getMajorJavaVersion() == VERSION_8) {
             LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this);

designer/src/com/fr/design/mainframe/bbs/UserInfoPane.java

@@ -4,6 +4,7 @@
 package com.fr.design.mainframe.bbs;
 
 import com.fr.base.FRContext;
+import com.fr.config.DBEnv;
 import com.fr.config.ServerConfig;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.constants.UIConstants;
@@ -78,6 +79,7 @@ public class UserInfoPane extends BasicPane{
 		GeneralContext.addEnvChangedListener(new EnvChangedListener() {
 			@Override
 			public void envChanged() {
+				if (DBEnv.isDBEnvAvailable()) {
 					String username = ServerConfig.getInstance().getBbsUsername();
 					if (StringUtils.isEmpty(username)){
 						markUnSignIn();
@@ -85,6 +87,7 @@ public class UserInfoPane extends BasicPane{
 						markSignIn(username);
 					}
 				}
+			}
 		});
 	}
 

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

@@ -108,39 +108,8 @@ public class ConnectionListAction extends UpdateAction {
      * @return boolean 是否更新成功
      */
     public static boolean doWithDatasourceManager(ConnectionConfig datasourceManager, ConnectionShowPane connectionShowPane, BasicDialog databaseListDialog) {
-//        HashMap<String, Connection> modifyDetails = datasourceManager.getConnectionModifyDetails();
-//        modifyDetails.clear();
-//        Env currentEnv = FRContext.getCurrentEnv();
-//        ModifiedTable localModifiedTable = datasourceManager.checkConnectionModifyTable(backupManager, currentEnv.getUserID());
+        connectionShowPane.update(datasourceManager);
         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) {
@@ -148,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;
     }
 

designer_base/src/com/fr/design/actions/server/FunctionManagerAction.java

@@ -59,7 +59,7 @@ public class FunctionManagerAction extends UpdateAction {
 
 			}
         });
-        functionManagerPane.populate(functionManager.copy());
+        functionManagerPane.populate(functionManager.mirror());
         functionManagerDialog.setVisible(true);
     }
     

designer_base/src/com/fr/design/actions/server/GlobalParameterAction.java

@@ -47,7 +47,7 @@ public class GlobalParameterAction extends UpdateAction {
         //marks:读取服务器配置信息
         final ServerConfig configManager = ServerConfig.getInstance();
 
-        parameterManagerPane.populate(configManager.copy());
+        parameterManagerPane.populate(configManager.mirror());
         parameterManagerDialog.addDialogActionListener(new DialogActionAdapter() {
             public void doOk() {
                 Configurations.update(new Worker() {

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

@@ -69,7 +69,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
         final TableDataConfig tableDataConfig = TableDataConfig.getInstance();
         final TableDataManagerPane globalTableDataPane = new TableDataManagerPane() {
             public void complete() {
-                populate(tableDataConfig.copy());
+                populate(tableDataConfig.mirror());
             }
 
             protected void renameConnection(final String oldName, final String newName) {
@@ -131,38 +131,8 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
      * @return
      */
     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;
-//        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) {
@@ -170,12 +140,6 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
             tableDataManagerPane.setSelectedIndex(index);
         }
         databaseListDialog.setDoOKSucceed(!isFailed);
-        //如果修改成功，则去远程端增量修改修改表
-//        if (!isFailed && !currentEnv.isSupportLocalFileOperate()) {
-//            currentEnv.writeDataSourceModifiedTables(localModifiedTable, DatasourceManager.TABLEDATA);
-//            localModifiedTable.clear();
-//            modifyDetails.clear();
-//        }
         return !isFailed;
     }
 

designer_base/src/com/fr/design/actions/server/ProcedureListAction.java

@@ -36,7 +36,7 @@ public class ProcedureListAction extends UpdateAction {
         final ProcedureConfig procedureConfig = ProcedureConfig.getInstance();
         final ProcedureManagerPane databaseManagerPane = new ProcedureManagerPane() {
             public void complete() {
-                populate(procedureConfig.copy());
+                populate(procedureConfig.mirror());
             }
         };
         BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null);

designer_base/src/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java

@@ -89,7 +89,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
     protected void editItems() {
         final ConnectionListPane connectionListPane = new ConnectionListPane();
         final ConnectionConfig connectionConfig = ConnectionConfig.getInstance();
-        ConnectionConfig cloned = connectionConfig.copy();
+        ConnectionConfig cloned = connectionConfig.mirror();
         connectionListPane.populate(cloned);
         final BasicDialog connectionListDialog = connectionListPane.showLargeWindow(
                 SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), null);

designer_base/src/com/fr/design/file/TemplateTreePane.java

@@ -320,7 +320,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
             try {
                 fileUtils.moveToTrash(new File[]{new File(StableUtils.pathJoin(nodeFile.getEnvPath(), nodeFile.getPath()))});
                 //todo 走下这个流程，否则集群下其它节点无法同步删除
-                //FRContext.getCurrentEnv().deleteFile(nodeFile.getPath());
+                FRContext.getCurrentEnv().deleteFile(nodeFile.getPath());
             } catch (IOException e) {
                 FRLogger.getLogger().info(e.getMessage());
                 FRContext.getCurrentEnv().deleteFile(nodeFile.getPath());