Browse Source

Merge pull request #1701 in BA/design from ~RICHIE/design:feature/10.0 to feature/10.0

* commit 'b5686ff4e4fd84172005e5669e6c9222e6088082':
  无JIRA任务 配置文件克隆
master
superman 7 years ago
parent
commit
c019635781
  1. 2
      designer/src/com/fr/design/actions/server/ServerConfigManagerAction.java
  2. 2
      designer/src/com/fr/design/actions/server/StyleListAction.java
  3. 2
      designer/src/com/fr/design/actions/server/WidgetManagerAction.java
  4. 2
      designer_base/src/com/fr/design/actions/server/FunctionManagerAction.java
  5. 2
      designer_base/src/com/fr/design/actions/server/GlobalParameterAction.java
  6. 2
      designer_base/src/com/fr/design/actions/server/GlobalTableDataAction.java
  7. 2
      designer_base/src/com/fr/design/actions/server/ProcedureListAction.java
  8. 2
      designer_base/src/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java

2
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());
}
};

2
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);
}

2
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());
}
};

2
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);
}

2
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() {

2
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) {

2
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);

2
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);

Loading…
Cancel
Save