From ae9b622710d7a7ba37dc38a2ff34728f97efddb2 Mon Sep 17 00:00:00 2001 From: ju Date: Thu, 8 Mar 2018 16:20:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20ServerConfig?= =?UTF-8?q?=E8=BF=9B=E4=B8=80=E6=AD=A5=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/widget/ui/ParameterTreeComboBox.java | 2 +- .../src/com/fr/design/formula/VariableResolverAdapter.java | 2 +- .../src/com/fr/design/parameter/ParameterArrayPane.java | 2 +- .../src/com/fr/design/parameter/ParameterManagerPane.java | 2 +- .../com/fr/design/widget/ui/designer/ParameterTreeComboBox.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/designer/src/com/fr/design/widget/ui/ParameterTreeComboBox.java b/designer/src/com/fr/design/widget/ui/ParameterTreeComboBox.java index 9571edac18..06ec154b9a 100644 --- a/designer/src/com/fr/design/widget/ui/ParameterTreeComboBox.java +++ b/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)) { groupList.add(new ParameterGroup(Inter.getLocText("M_Server-Global_Parameters"), parameters)); } diff --git a/designer_base/src/com/fr/design/formula/VariableResolverAdapter.java b/designer_base/src/com/fr/design/formula/VariableResolverAdapter.java index e1e6078081..5f11221939 100644 --- a/designer_base/src/com/fr/design/formula/VariableResolverAdapter.java +++ b/designer_base/src/com/fr/design/formula/VariableResolverAdapter.java @@ -94,7 +94,7 @@ public abstract class VariableResolverAdapter implements VariableResolver { public String[] resolveGlobalParameterVariables() { // 加上全局的参数 ServerConfig reportServerManager = ServerConfig.getInstance(); - Parameter[] globalParameters = reportServerManager.getGlobal_Parameters(); + Parameter[] globalParameters = reportServerManager.getGlobalParameters(); List variablesList = new ArrayList(); for (int i = 0; i < (globalParameters == null ? 0 : globalParameters.length); i++) { diff --git a/designer_base/src/com/fr/design/parameter/ParameterArrayPane.java b/designer_base/src/com/fr/design/parameter/ParameterArrayPane.java index 3ef162fc0c..6736b8ea49 100644 --- a/designer_base/src/com/fr/design/parameter/ParameterArrayPane.java +++ b/designer_base/src/com/fr/design/parameter/ParameterArrayPane.java @@ -31,7 +31,7 @@ public class ParameterArrayPane extends JListControlPane { }); this.addEditingListner( new PropertyChangeAdapter() { public void propertyChange() { - Parameter[] parameters = ServerConfig.getInstance().getGlobal_Parameters(); + Parameter[] parameters = ServerConfig.getInstance().getGlobalParameters(); String[] allListNames = nameableList.getAllNames(); allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY; String tempName = getEditingName(); diff --git a/designer_base/src/com/fr/design/parameter/ParameterManagerPane.java b/designer_base/src/com/fr/design/parameter/ParameterManagerPane.java index 0640f4795a..f17a4846f8 100644 --- a/designer_base/src/com/fr/design/parameter/ParameterManagerPane.java +++ b/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 + // ProjectConstants.RESOURCES_NAME + // File.separator + configManager.fileName()); - this.parameterArrayPane.populate(configManager.getGlobal_Parameters()); + this.parameterArrayPane.populate(configManager.getGlobalParameters()); } public void update(ServerConfig configManager) { diff --git a/designer_form/src/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java b/designer_form/src/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java index ba596d06c3..68d2d54a30 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java +++ b/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)) { groupList.add(new ParameterGroup(Inter.getLocText("M_Server-Global_Parameters"), parameters)); }