From e820e0adc8bc473817a51be2c46543af667168b5 Mon Sep 17 00:00:00 2001 From: ju Date: Thu, 8 Mar 2018 11:58:42 +0800 Subject: [PATCH] =?UTF-8?q?DEC-472=20=E6=96=B0=E6=A8=A1=E5=9D=97=E5=88=92?= =?UTF-8?q?=E5=88=86=E4=B8=8E=E5=90=AF=E5=8A=A8=E3=80=81=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=A1=86=E6=9E=B6=20=E8=A7=A3=E9=99=A4=E6=96=B0=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E4=B8=8EReport=E5=90=AF=E5=8A=A8=E7=9A=84=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=EF=BC=8C=E6=8A=8A=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=94=BE=E5=88=B0core=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/InformationCollector.java | 6 +++--- .../fr/design/webattr/EditReportServerParameterPane.java | 4 ---- designer/src/com/fr/design/webattr/PageToolBarPane.java | 4 ---- designer/src/com/fr/design/webattr/ViewToolBarPane.java | 4 ---- designer/src/com/fr/design/webattr/WriteToolBarPane.java | 4 ---- .../src/com/fr/design/widget/ui/ParameterTreeComboBox.java | 2 +- designer/src/com/fr/start/module/PreStartActivator.java | 6 ------ .../src/com/fr/design/formula/VariableResolverAdapter.java | 2 +- .../src/com/fr/design/parameter/ParameterArrayPane.java | 2 +- .../src/com/fr/design/parameter/ParameterManagerPane.java | 5 +---- .../fr/design/widget/ui/designer/ParameterTreeComboBox.java | 2 +- 11 files changed, 8 insertions(+), 33 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/InformationCollector.java b/designer/src/com/fr/design/mainframe/InformationCollector.java index 7cc6eb6c44..de50be725c 100644 --- a/designer/src/com/fr/design/mainframe/InformationCollector.java +++ b/designer/src/com/fr/design/mainframe/InformationCollector.java @@ -3,8 +3,8 @@ */ package com.fr.design.mainframe; -import com.fr.base.ConfigManagerFactory; import com.fr.base.FRContext; +import com.fr.config.MarketConfig; import com.fr.data.core.db.DBUtils; import com.fr.data.core.db.dialect.DialectFactory; import com.fr.data.core.db.dml.Delete; @@ -163,7 +163,7 @@ public class InformationCollector implements XMLReadable, XMLWriter { content.put(XML_UUID, envManager.getUUID()); content.put(XML_JAR, GeneralUtils.readBuildNO()); content.put(XML_VERSION, ProductConstants.RELEASE_VERSION); - content.put(XML_USERNAME, ConfigManagerFactory.getProviderInstance().getBbsUsername()); + content.put(XML_USERNAME, MarketConfig.getInstance().getBbsUsername()); content.put(XML_KEY, envManager.getActivationKey()); content.put(XML_OS, System.getProperty("os.name")); } catch (JSONException e) { @@ -297,7 +297,7 @@ public class InformationCollector implements XMLReadable, XMLWriter { } DesignerEnvManager envManager = DesignerEnvManager.getEnvManager(); - content.put("username", ConfigManagerFactory.getProviderInstance().getBbsUsername()); + content.put("username", MarketConfig.getInstance().getBbsUsername()); content.put("uuid", envManager.getUUID()); content.put("functions", functionArray); diff --git a/designer/src/com/fr/design/webattr/EditReportServerParameterPane.java b/designer/src/com/fr/design/webattr/EditReportServerParameterPane.java index 4eaf6b60bd..133066354b 100644 --- a/designer/src/com/fr/design/webattr/EditReportServerParameterPane.java +++ b/designer/src/com/fr/design/webattr/EditReportServerParameterPane.java @@ -97,10 +97,6 @@ public class EditReportServerParameterPane extends LoadingBasicPane { */ public void update(ServerConfig reportServerConfig) { ReportWebAttr webAttr = ((ReportWebAttr)ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class)); - if (webAttr == null) { - webAttr = new ReportWebAttr(); - ConfigManager.getProviderInstance().putGlobalAttribute(ReportWebAttr.class, webAttr); - } webAttr.setWebPage(pagePane.updateBean()); webAttr.setWebView(viewPane.updateBean()); webAttr.setWebWrite(writePane.updateBean()); diff --git a/designer/src/com/fr/design/webattr/PageToolBarPane.java b/designer/src/com/fr/design/webattr/PageToolBarPane.java index 00fabc103b..364314848f 100644 --- a/designer/src/com/fr/design/webattr/PageToolBarPane.java +++ b/designer/src/com/fr/design/webattr/PageToolBarPane.java @@ -180,10 +180,6 @@ public class PageToolBarPane extends AbstractEditToolBarPane { @Override public void run() { ReportWebAttr reportWebAttr = ((ReportWebAttr)ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class)); - if (reportWebAttr == null) { - reportWebAttr = new ReportWebAttr(); - ConfigManager.getProviderInstance().putGlobalAttribute(ReportWebAttr.class, reportWebAttr); - } reportWebAttr.setWebPage(serverPageToolBarPane.updateBean()); } diff --git a/designer/src/com/fr/design/webattr/ViewToolBarPane.java b/designer/src/com/fr/design/webattr/ViewToolBarPane.java index 6011d8f7de..d0ceea4154 100644 --- a/designer/src/com/fr/design/webattr/ViewToolBarPane.java +++ b/designer/src/com/fr/design/webattr/ViewToolBarPane.java @@ -150,10 +150,6 @@ public class ViewToolBarPane extends AbstractEditToolBarPane { @Override public void run() { ReportWebAttr reportWebAttr = ((ReportWebAttr)ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class)); - if (reportWebAttr == null) { - reportWebAttr = new ReportWebAttr(); - ConfigManager.getProviderInstance().putGlobalAttribute(ReportWebAttr.class, reportWebAttr); - } reportWebAttr.setWebView(serverPageToolBarPane.updateBean()); } diff --git a/designer/src/com/fr/design/webattr/WriteToolBarPane.java b/designer/src/com/fr/design/webattr/WriteToolBarPane.java index 0dbb260261..681e19b8b0 100644 --- a/designer/src/com/fr/design/webattr/WriteToolBarPane.java +++ b/designer/src/com/fr/design/webattr/WriteToolBarPane.java @@ -267,10 +267,6 @@ public class WriteToolBarPane extends AbstractEditToolBarPane { @Override public void run() { ReportWebAttr reportWebAttr = ((ReportWebAttr) ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class)); - if (reportWebAttr == null) { - reportWebAttr = new ReportWebAttr(); - ConfigManager.getProviderInstance().putGlobalAttribute(ReportWebAttr.class, reportWebAttr); - } reportWebAttr.setWebWrite(serverPageToolBarPane.updateBean()); } diff --git a/designer/src/com/fr/design/widget/ui/ParameterTreeComboBox.java b/designer/src/com/fr/design/widget/ui/ParameterTreeComboBox.java index 2c80b8e461..9571edac18 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().getGlobeParameters(); + parameters = ServerConfig.getInstance().getGlobal_Parameters(); if (!ArrayUtils.isEmpty(parameters)) { groupList.add(new ParameterGroup(Inter.getLocText("M_Server-Global_Parameters"), parameters)); } diff --git a/designer/src/com/fr/start/module/PreStartActivator.java b/designer/src/com/fr/start/module/PreStartActivator.java index 75ba423e36..e02d42dbd9 100644 --- a/designer/src/com/fr/start/module/PreStartActivator.java +++ b/designer/src/com/fr/start/module/PreStartActivator.java @@ -1,7 +1,5 @@ package com.fr.start.module; -import com.fr.base.ConfigManagerCreatorProxy; -import com.fr.base.ConfigManagerFactory; import com.fr.base.FRContext; import com.fr.design.DesignerEnvManager; import com.fr.design.RestartHelper; @@ -10,7 +8,6 @@ import com.fr.general.GeneralContext; import com.fr.general.Inter; import com.fr.general.SiteCenter; import com.fr.module.Activator; -import com.fr.plugin.conversion.PluginConversionModule; import com.fr.stable.BuildContext; /** @@ -22,11 +19,8 @@ public class PreStartActivator extends Activator { public void start() { RestartHelper.deleteRecordFilesWhenStart(); - ConfigManagerFactory.registerConfigManagerProxy(new ConfigManagerCreatorProxy()); BuildContext.setBuildFilePath(buildPropertiesPath()); SiteCenter.getInstance(); - //标记一下是设计器启动 - PluginConversionModule.getInstance().markDesignerStart(); initLanguage(); // 在 initLanguage 之后加载设计器国际化文件，确保是正确的语言环境 diff --git a/designer_base/src/com/fr/design/formula/VariableResolverAdapter.java b/designer_base/src/com/fr/design/formula/VariableResolverAdapter.java index b14ee1b804..e1e6078081 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.getGlobeParameters(); + Parameter[] globalParameters = reportServerManager.getGlobal_Parameters(); 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 0de52dbd77..3ef162fc0c 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().getGlobeParameters(); + Parameter[] parameters = ServerConfig.getInstance().getGlobal_Parameters(); 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 18a203331c..0640f4795a 100644 --- a/designer_base/src/com/fr/design/parameter/ParameterManagerPane.java +++ b/designer_base/src/com/fr/design/parameter/ParameterManagerPane.java @@ -1,17 +1,14 @@ package com.fr.design.parameter; -import com.fr.base.FRContext; import com.fr.config.ServerConfig; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.Inter; -import com.fr.stable.project.ProjectConstants; import javax.swing.*; import java.awt.*; -import java.io.File; public class ParameterManagerPane extends BasicPane { @@ -44,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.getGlobeParameters()); + this.parameterArrayPane.populate(configManager.getGlobal_Parameters()); } 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 7206a25298..ba596d06c3 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().getGlobeParameters(); + parameters = ServerConfig.getInstance().getGlobal_Parameters(); if (!ArrayUtils.isEmpty(parameters)) { groupList.add(new ParameterGroup(Inter.getLocText("M_Server-Global_Parameters"), parameters)); }