Browse Source

无JIRA任务 ServerConfig进一步拆分

master
ju 7 years ago
parent
commit
ae9b622710
  1. 2
      designer/src/com/fr/design/widget/ui/ParameterTreeComboBox.java
  2. 2
      designer_base/src/com/fr/design/formula/VariableResolverAdapter.java
  3. 2
      designer_base/src/com/fr/design/parameter/ParameterArrayPane.java
  4. 2
      designer_base/src/com/fr/design/parameter/ParameterManagerPane.java
  5. 2
      designer_form/src/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java

2
designer/src/com/fr/design/widget/ui/ParameterTreeComboBox.java

@ -154,7 +154,7 @@ public class ParameterTreeComboBox extends FRTreeComboBox {
} }
// 全局参数 // 全局参数
parameters = ServerConfig.getInstance().getGlobal_Parameters(); parameters = ServerConfig.getInstance().getGlobalParameters();
if (!ArrayUtils.isEmpty(parameters)) { if (!ArrayUtils.isEmpty(parameters)) {
groupList.add(new ParameterGroup(Inter.getLocText("M_Server-Global_Parameters"), parameters)); groupList.add(new ParameterGroup(Inter.getLocText("M_Server-Global_Parameters"), parameters));
} }

2
designer_base/src/com/fr/design/formula/VariableResolverAdapter.java

@ -94,7 +94,7 @@ public abstract class VariableResolverAdapter implements VariableResolver {
public String[] resolveGlobalParameterVariables() { public String[] resolveGlobalParameterVariables() {
// 加上全局的参数 // 加上全局的参数
ServerConfig reportServerManager = ServerConfig.getInstance(); ServerConfig reportServerManager = ServerConfig.getInstance();
Parameter[] globalParameters = reportServerManager.getGlobal_Parameters(); Parameter[] globalParameters = reportServerManager.getGlobalParameters();
List<String> variablesList = new ArrayList<String>(); List<String> variablesList = new ArrayList<String>();
for (int i = 0; i < (globalParameters == null ? 0 : globalParameters.length); i++) { for (int i = 0; i < (globalParameters == null ? 0 : globalParameters.length); i++) {

2
designer_base/src/com/fr/design/parameter/ParameterArrayPane.java

@ -31,7 +31,7 @@ public class ParameterArrayPane extends JListControlPane {
}); });
this.addEditingListner( new PropertyChangeAdapter() { this.addEditingListner( new PropertyChangeAdapter() {
public void propertyChange() { public void propertyChange() {
Parameter[] parameters = ServerConfig.getInstance().getGlobal_Parameters(); Parameter[] parameters = ServerConfig.getInstance().getGlobalParameters();
String[] allListNames = nameableList.getAllNames(); String[] allListNames = nameableList.getAllNames();
allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY; allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY;
String tempName = getEditingName(); String tempName = getEditingName();

2
designer_base/src/com/fr/design/parameter/ParameterManagerPane.java

@ -41,7 +41,7 @@ public class ParameterManagerPane extends BasicPane {
// this.parameterTextField.setText(FRContext.getCurrentEnv().getPath() + File.separator + // this.parameterTextField.setText(FRContext.getCurrentEnv().getPath() + File.separator +
// ProjectConstants.RESOURCES_NAME + // ProjectConstants.RESOURCES_NAME +
// File.separator + configManager.fileName()); // File.separator + configManager.fileName());
this.parameterArrayPane.populate(configManager.getGlobal_Parameters()); this.parameterArrayPane.populate(configManager.getGlobalParameters());
} }
public void update(ServerConfig configManager) { public void update(ServerConfig configManager) {

2
designer_form/src/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java

@ -152,7 +152,7 @@ public class ParameterTreeComboBox extends FRTreeComboBox {
} }
// 全局参数 // 全局参数
parameters = ServerConfig.getInstance().getGlobal_Parameters(); parameters = ServerConfig.getInstance().getGlobalParameters();
if (!ArrayUtils.isEmpty(parameters)) { if (!ArrayUtils.isEmpty(parameters)) {
groupList.add(new ParameterGroup(Inter.getLocText("M_Server-Global_Parameters"), parameters)); groupList.add(new ParameterGroup(Inter.getLocText("M_Server-Global_Parameters"), parameters));
} }

Loading…
Cancel
Save