Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #1693 in BA/design from ~KERRY/design:feature/10.0 to feature/10.0 

* commit '39a28c729bb172c0c2491b3f86dc6e35f21ffd23':
  wu
  wu
  REPORT-6956 设计器适配10.0配置写法
master
superman 6 years ago
parent
134ff4bad8 39a28c729b
commit
1020b8d7e8
15 changed files with 96 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      designer/src/com/fr/design/actions/report/ReportWebAttrAction.java
  2. 4
      designer/src/com/fr/design/actions/server/ServerConfigManagerAction.java
  3. 22
      designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java
  4. 16
      designer/src/com/fr/design/webattr/CommonPane.java
  5. 13
      designer/src/com/fr/design/webattr/EditReportServerParameterPane.java
  6. 13
      designer/src/com/fr/design/webattr/PageToolBarPane.java
  7. 6
      designer/src/com/fr/design/webattr/PageWebSettingPane.java
  8. 10
      designer/src/com/fr/design/webattr/ReportWebAttrPane.java
  9. 13
      designer/src/com/fr/design/webattr/ViewToolBarPane.java
  10. 6
      designer/src/com/fr/design/webattr/ViewWebSettingPane.java
  11. 6
      designer/src/com/fr/design/webattr/WebCssPane.java
  12. 6
      designer/src/com/fr/design/webattr/WebJsPane.java
  13. 25
      designer/src/com/fr/design/webattr/WebSettingPane.java
  14. 13
      designer/src/com/fr/design/webattr/WriteToolBarPane.java
  15. 6
      designer/src/com/fr/design/webattr/WriteWebSettingPane.java

7
designer/src/com/fr/design/actions/report/ReportWebAttrAction.java
Unescape View File

@ -15,7 +15,7 @@ import com.fr.general.IOUtils;
import com.fr.main.TemplateWorkBook;
import com.fr.transaction.Configurations;
import com.fr.transaction.Worker;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
import java.awt.event.ActionEvent;
@ -46,8 +46,7 @@ public class ReportWebAttrAction extends JWorkBookAction {
final ReportWebAttrPane reportWebAttrPane = new ReportWebAttrPane() {
@Override
public void complete() {
ReportWebConfig config = wbTpl.getReportWebAttr();
populate((ReportWebConfig) config.clone());
populate(wbTpl.getReportWebAttr());
}
};
final BasicDialog dialog = reportWebAttrPane.showWindow(
@ -66,7 +65,7 @@ public class ReportWebAttrAction extends JWorkBookAction {
@Override
public Class<? extends Configuration>[] targets() {
return new Class[]{ReportWebConfig.class};
return new Class[]{ReportWebAttr.class};
}
});

4
designer/src/com/fr/design/actions/server/ServerConfigManagerAction.java
Unescape View File

@ -15,7 +15,7 @@ import com.fr.general.IOUtils;
import com.fr.general.Inter;
import com.fr.transaction.Configurations;
import com.fr.transaction.Worker;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
import javax.swing.*;
import java.awt.event.ActionEvent;
@ -60,7 +60,7 @@ public class ServerConfigManagerAction extends UpdateAction {
@Override
public Class<? extends Configuration>[] targets() {
return new Class[]{ReportWebConfig.class, ServerConfig.class};
return new Class[]{ReportWebAttr.class, ServerConfig.class};
}
});

22
designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java
Unescape View File

@ -1,5 +1,7 @@
package com.fr.design.mainframe;
import com.fr.base.ConfigManager;
import com.fr.base.ConfigManagerProvider;
import com.fr.base.FRContext;
import com.fr.common.inputevent.InputEventBaseOnOS;
import com.fr.design.beans.BasicBeanPane;
@ -22,7 +24,7 @@ import com.fr.report.web.Location;
import com.fr.report.web.ToolBarManager;
import com.fr.report.web.WebContent;
import com.fr.stable.ArrayUtils;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
import javax.swing.*;
import java.awt.*;
@ -34,7 +36,7 @@ import java.util.List;
* Date: 13-9-9
* Time: 下午4:58
*/
public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<ReportWebConfig> implements AuthorityEditToolBarComponent {
public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<ReportWebAttr> implements AuthorityEditToolBarComponent {
private static final int SMALL_GAP = 13;
private static final int GAP = 25;
private static final int PRE_GAP = 9;
@ -193,7 +195,7 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
}
private ReportWebConfig getReportWebAttr() {
private ReportWebAttr getReportWebAttr() {
JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
if (!editingTemplate.isJWorkBook()) {
return null;
@ -213,8 +215,9 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
JWorkBook editingWorkBook = (JWorkBook) editingTemplate;
TemplateWorkBook wbTpl = editingWorkBook.getTarget();
ReportWebConfig rw = wbTpl.getReportWebAttr();
ReportWebConfig webAttr = ReportWebConfig.getInstance();
ReportWebAttr rw = wbTpl.getReportWebAttr();
ConfigManagerProvider cm = ConfigManager.getProviderInstance();
ReportWebAttr webAttr = ((ReportWebAttr) cm.getGlobalAttribute(ReportWebAttr.class));
//wbTpl.clear先清空
//再将所有的保存进去
@ -261,7 +264,7 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
}
public void populateBean(ReportWebConfig reportWebAttr) {
public void populateBean(ReportWebAttr reportWebAttr) {
this.remove(title);
// 如果是空值就说明采用服务器配置了
if (reportWebAttr == null || this.getWebContent(reportWebAttr) == null) {
@ -277,7 +280,7 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
populate(webContent.getToolBarManagers());
}
public ReportWebConfig updateBean() {
public ReportWebAttr updateBean() {
return null;
}
@ -315,7 +318,8 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
private void populateServerSettings() {
ReportWebConfig webAttr = (ReportWebConfig)ReportWebConfig.getInstance().clone();
ConfigManagerProvider cm = ConfigManager.getProviderInstance();
ReportWebAttr webAttr = ((ReportWebAttr) cm.getGlobalAttribute(ReportWebAttr.class));
if (this.getWebContent(webAttr) != null) {
populate(this.getWebContent(webAttr).getToolBarManagers());
}
@ -326,7 +330,7 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
}
private T getWebContent(ReportWebConfig reportWebAttr) {
private T getWebContent(ReportWebAttr reportWebAttr) {
if (choseComboBox.getSelectedIndex() == 0) {
return reportWebAttr == null ? null : (T) reportWebAttr.getWebPage();
} else if (choseComboBox.getSelectedIndex() == 1) {

16
designer/src/com/fr/design/webattr/CommonPane.java
Unescape View File

@ -17,15 +17,15 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.editor.editor.LongEditor;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
public class CommonPane extends JPanel {
private UITextField titleTextField;
private LongEditor cacheValidateTimeEditor;
public CommonPane() {
this.initComponents();
}
@ -38,12 +38,12 @@ public class CommonPane extends JPanel {
this.titleTextField = new UITextField(24);
this.cacheValidateTimeEditor = new LongEditor();
JComponent[][] comps = {
{new UILabel(Inter.getLocText("Title") + ":"), this.titleTextField, null},
{new UILabel(Inter.getLocText("CacheValidateTime") + ":"), this.cacheValidateTimeEditor, new UILabel("milliseconds")}
};
this.add(
TableLayoutHelper.createCommonTableLayoutPane(
comps,
@ -53,15 +53,15 @@ public class CommonPane extends JPanel {
BorderLayout.CENTER);
}
public void populate(ReportWebConfig reportWebAttr) {
public void populate(ReportWebAttr reportWebAttr) {
if (reportWebAttr.getTitle() != null && reportWebAttr.getTitle().length() > 0) {
this.titleTextField.setText(reportWebAttr.getTitle());
}
this.cacheValidateTimeEditor.setValue(Long.valueOf(reportWebAttr.getCacheValidateTime()));
}
public void update(ReportWebConfig reportWebAttr) {
public void update(ReportWebAttr reportWebAttr) {
if (!StringUtils.isEmpty(this.titleTextField.getText())) {
reportWebAttr.setTitle(this.titleTextField.getText());
} else {

13
designer/src/com/fr/design/webattr/EditReportServerParameterPane.java
Unescape View File

@ -3,6 +3,7 @@
*/
package com.fr.design.webattr;
import com.fr.base.ConfigManager;
import com.fr.base.FRContext;
import com.fr.config.ServerConfig;
import com.fr.design.gui.frpane.LoadingBasicPane;
@ -12,7 +13,7 @@ import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.Inter;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
import javax.swing.*;
import java.awt.*;
@ -30,7 +31,7 @@ public class EditReportServerParameterPane extends LoadingBasicPane {
//TODO 表单
// private FormToolBarPane formPane;
private WriteToolBarPane writePane;
private ReportWebConfig webAttr;
private ReportWebAttr webAttr;
private WebCssPane cssPane;
@ -78,7 +79,7 @@ public class EditReportServerParameterPane extends LoadingBasicPane {
// ProjectConstants.RESOURCES_NAME +
// File.separator + reportServerConfig.fileName());
webAttr = (ReportWebConfig) ReportWebConfig.getInstance().clone();
webAttr = ((ReportWebAttr) ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class));
if (webAttr != null) {
pagePane.populateBean(webAttr.getWebPage());
viewPane.populateBean(webAttr.getWebView());
@ -95,7 +96,11 @@ public class EditReportServerParameterPane extends LoadingBasicPane {
* Update.
*/
public void update(ServerConfig reportServerConfig) {
ReportWebConfig webAttr = ReportWebConfig.getInstance();
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());

13
designer/src/com/fr/design/webattr/PageToolBarPane.java
Unescape View File

@ -1,5 +1,6 @@
package com.fr.design.webattr;
import com.fr.base.ConfigManager;
import com.fr.config.Configuration;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
@ -18,7 +19,7 @@ import com.fr.report.web.WebContent;
import com.fr.report.web.WebPage;
import com.fr.transaction.Configurations;
import com.fr.transaction.Worker;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
import javax.swing.*;
import java.awt.*;
@ -166,7 +167,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
@Override
public void editServerToolBarPane() {
final PageToolBarPane serverPageToolBarPane = new PageToolBarPane();
ReportWebConfig reportWebAttr = ReportWebConfig.getInstance();
ReportWebAttr reportWebAttr = ((ReportWebAttr) ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class));
if (reportWebAttr != null) {
serverPageToolBarPane.populateBean(reportWebAttr.getWebPage());
}
@ -178,13 +179,17 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
Configurations.update(new Worker() {
@Override
public void run() {
ReportWebConfig reportWebAttr = ReportWebConfig.getInstance();
ReportWebAttr reportWebAttr = ((ReportWebAttr)ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class));
if (reportWebAttr == null) {
reportWebAttr = new ReportWebAttr();
ConfigManager.getProviderInstance().putGlobalAttribute(ReportWebAttr.class, reportWebAttr);
}
reportWebAttr.setWebPage(serverPageToolBarPane.updateBean());
}
@Override
public Class<? extends Configuration>[] targets() {
return new Class[]{ReportWebConfig.class};
return new Class[]{ReportWebAttr.class};
}
});

6
designer/src/com/fr/design/webattr/PageWebSettingPane.java
Unescape View File

@ -21,7 +21,7 @@ import com.fr.design.gui.core.WidgetOption;
import com.fr.general.Inter;
import com.fr.report.web.ToolBarManager;
import com.fr.report.web.WebPage;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
public class PageWebSettingPane extends WebSettingPane<WebPage> {
private UIRadioButton centerRadioButton;
@ -119,7 +119,7 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
}
@Override
protected WebPage getWebContent(ReportWebConfig reportWebAttr) {
protected WebPage getWebContent(ReportWebAttr reportWebAttr) {
return reportWebAttr == null ? null :reportWebAttr.getWebPage();
}
@ -129,7 +129,7 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
}
@Override
protected void setWebContent(ReportWebConfig reportWebAttr,WebPage webContent) {
protected void setWebContent(ReportWebAttr reportWebAttr,WebPage webContent) {
reportWebAttr.setWebPage(webContent);
}
}

10
designer/src/com/fr/design/webattr/ReportWebAttrPane.java
Unescape View File

@ -9,7 +9,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.style.background.BackgroundPane;
import com.fr.design.style.background.BackgroundPane4Browser;
import com.fr.general.Inter;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
import javax.swing.*;
import java.awt.*;
@ -18,7 +18,7 @@ import java.awt.*;
* ReportWebAttr Dialog
*/
public class ReportWebAttrPane extends LoadingBasicPane {
private ReportWebConfig reportWebAttr;
private ReportWebAttr reportWebAttr;
private UITabbedPane tabbedPane;
private CommonPane commonPane;
@ -60,9 +60,9 @@ public class ReportWebAttrPane extends LoadingBasicPane {
return Inter.getLocText("FR-Designer_Template_Web_Attributes");
}
public void populate(ReportWebConfig reportWebAttr) {
public void populate(ReportWebAttr reportWebAttr) {
if (reportWebAttr == null) {
reportWebAttr = ReportWebConfig.getInstance();
reportWebAttr = new ReportWebAttr();
}
this.reportWebAttr = reportWebAttr;
@ -79,7 +79,7 @@ public class ReportWebAttrPane extends LoadingBasicPane {
}
public ReportWebConfig update() {
public ReportWebAttr update() {
reportWebAttr.setPrinter(this.serverPrintPane.update());
pageWeb.update(reportWebAttr);
writeWeb.update(reportWebAttr);

13
designer/src/com/fr/design/webattr/ViewToolBarPane.java
Unescape View File

@ -1,5 +1,6 @@
package com.fr.design.webattr;
import com.fr.base.ConfigManager;
import com.fr.config.Configuration;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
@ -17,7 +18,7 @@ import com.fr.report.web.WebContent;
import com.fr.report.web.WebView;
import com.fr.transaction.Configurations;
import com.fr.transaction.Worker;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
import javax.swing.*;
import java.awt.*;
@ -136,7 +137,7 @@ public class ViewToolBarPane extends AbstractEditToolBarPane {
@Override
public void editServerToolBarPane() {
final ViewToolBarPane serverPageToolBarPane = new ViewToolBarPane();
ReportWebConfig reportWebAttr = ReportWebConfig.getInstance();
ReportWebAttr reportWebAttr = ((ReportWebAttr) ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class));
if (reportWebAttr != null) {
serverPageToolBarPane.populateBean(reportWebAttr.getWebView());
}
@ -148,13 +149,17 @@ public class ViewToolBarPane extends AbstractEditToolBarPane {
Configurations.update(new Worker() {
@Override
public void run() {
ReportWebConfig reportWebAttr = ReportWebConfig.getInstance();
ReportWebAttr reportWebAttr = ((ReportWebAttr)ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class));
if (reportWebAttr == null) {
reportWebAttr = new ReportWebAttr();
ConfigManager.getProviderInstance().putGlobalAttribute(ReportWebAttr.class, reportWebAttr);
}
reportWebAttr.setWebView(serverPageToolBarPane.updateBean());
}
@Override
public Class<? extends Configuration>[] targets() {
return new Class[]{ReportWebConfig.class};
return new Class[]{ReportWebAttr.class};
}
});

6
designer/src/com/fr/design/webattr/ViewWebSettingPane.java
Unescape View File

@ -8,7 +8,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.Inter;
import com.fr.report.web.ToolBarManager;
import com.fr.report.web.WebView;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
import javax.swing.*;
import java.awt.*;
@ -73,7 +73,7 @@ public class ViewWebSettingPane extends WebSettingPane<WebView> {
}
@Override
protected WebView getWebContent(ReportWebConfig reportWebAttr) {
protected WebView getWebContent(ReportWebAttr reportWebAttr) {
return reportWebAttr == null ? null : reportWebAttr.getWebView();
}
@ -83,7 +83,7 @@ public class ViewWebSettingPane extends WebSettingPane<WebView> {
}
@Override
protected void setWebContent(ReportWebConfig reportWebAttr, WebView webContent) {
protected void setWebContent(ReportWebAttr reportWebAttr, WebView webContent) {
reportWebAttr.setWebView(webContent);
}
@Override

6
designer/src/com/fr/design/webattr/WebCssPane.java
Unescape View File

@ -24,7 +24,7 @@ import com.fr.file.filter.ChooseFileFilter;
import com.fr.general.Inter;
import com.fr.stable.CoreConstants;
import com.fr.stable.StringUtils;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
public class WebCssPane extends BasicPane {
private UITextField localText;
@ -98,7 +98,7 @@ public class WebCssPane extends BasicPane {
return Inter.getLocText("ReportServerP-Import_Css");
}
public void populate(ReportWebConfig reportWebAttr) {
public void populate(ReportWebAttr reportWebAttr) {
if (reportWebAttr == null) {
centerPane.populateBean(new ArrayList<String>());
return;
@ -113,7 +113,7 @@ public class WebCssPane extends BasicPane {
centerPane.populateBean(list);
}
public void update(ReportWebConfig reportWebAttr) {
public void update(ReportWebAttr reportWebAttr) {
List<String> valueList = centerPane.updateBean();
reportWebAttr.clearCSSImportList();
for (int i = 0; i < valueList.size(); i++) {

6
designer/src/com/fr/design/webattr/WebJsPane.java
Unescape View File

@ -33,7 +33,7 @@ import com.fr.file.filter.ChooseFileFilter;
import com.fr.general.Inter;
import com.fr.stable.CoreConstants;
import com.fr.stable.StringUtils;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
public class WebJsPane extends BasicPane {
private UITextField localText;
@ -260,7 +260,7 @@ public class WebJsPane extends BasicPane {
chooseFile.setEnabled(false);
}
public void populate(ReportWebConfig reportWebAttr) {
public void populate(ReportWebAttr reportWebAttr) {
if (reportWebAttr == null) {
editingPane.populateBean(new ArrayList<String>());
return;
@ -274,7 +274,7 @@ public class WebJsPane extends BasicPane {
editingPane.populateBean(list);
}
public void update(ReportWebConfig reportWebAttr) {
public void update(ReportWebAttr reportWebAttr) {
List<String> valueList = editingPane.updateBean();
reportWebAttr.clearJSImportList();
for (int i = 0; i < valueList.size(); i++) {

25
designer/src/com/fr/design/webattr/WebSettingPane.java
Unescape View File

@ -1,5 +1,6 @@
package com.fr.design.webattr;
import com.fr.base.ConfigManager;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.core.WidgetOption;
import com.fr.design.gui.icombobox.UIComboBox;
@ -12,8 +13,9 @@ import com.fr.form.event.Listener;
import com.fr.general.Inter;
import com.fr.report.web.ToolBarManager;
import com.fr.report.web.WebContent;
import com.fr.base.ConfigManagerProvider;
import com.fr.stable.StringUtils;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
import javax.swing.*;
import java.awt.*;
@ -22,7 +24,7 @@ import java.awt.event.ItemListener;
import java.util.ArrayList;
import java.util.List;
public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane<ReportWebConfig> {
public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane<ReportWebAttr> {
private static final String[] CHOOSEITEM = new String[] {
Inter.getLocText("FR-Designer_I_Want_To_Set_Single"),
Inter.getLocText("FR-Designer_Using_Server_Report_View_Settings")
@ -31,7 +33,7 @@ public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane
private EventPane eventPane;
private ToolBarDragPane dragToolBarPane;
private UIComboBox choseComboBox;
private static final int SINGLE_SET = 0;
private static final int SERVER_SET = 1;
private static final int ZERO = 0;
@ -117,7 +119,7 @@ public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane
protected abstract String[] getEventNames();
@Override
public void populateBean(ReportWebConfig reportWebAttr) {
public void populateBean(ReportWebAttr reportWebAttr) {
if (reportWebAttr == null || this.getWebContent(reportWebAttr) == null) {// 如果是空值就说明采用服务器配置了
choseComboBox.removeItemListener(itemListener);
choseComboBox.setSelectedIndex(SERVER_SET);
@ -145,7 +147,7 @@ public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane
}
public void update(ReportWebConfig reportWebAttr) {
public void update(ReportWebAttr reportWebAttr) {
if (this.choseComboBox.getSelectedIndex() == SERVER_SET) {
setWebContent(reportWebAttr, null);
reportWebAttr = is_Null_ReportWebAttr(reportWebAttr) ? null : reportWebAttr;
@ -155,11 +157,11 @@ public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane
}
@Override
public ReportWebConfig updateBean() {
public ReportWebAttr updateBean() {
return null;
}
private ReportWebConfig TemplateupdateBean(ReportWebConfig reportWebAttr) {
private ReportWebAttr TemplateupdateBean(ReportWebAttr reportWebAttr) {
T webContent = updateSubWebSettingBean();
ToolBarManager[] toolBarManagers = dragToolBarPane.updateBean();
webContent.setToolBarManagers(toolBarManagers);
@ -171,13 +173,13 @@ public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane
return reportWebAttr;
}
protected abstract T getWebContent(ReportWebConfig reportWebAttr);
protected abstract T getWebContent(ReportWebAttr reportWebAttr);
protected abstract void populateSubWebSettingrBean(T ob);
protected abstract T updateSubWebSettingBean();
protected abstract void setWebContent(ReportWebConfig reportWebAttr, T ob);
protected abstract void setWebContent(ReportWebAttr reportWebAttr, T ob);
protected abstract WidgetOption[] getToolBarInstance();
@ -189,7 +191,8 @@ public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane
}
private void populateServerSettings() {
ReportWebConfig reportWebAttr = ReportWebConfig.getInstance();
ConfigManagerProvider configManager = ConfigManager.getProviderInstance();
ReportWebAttr reportWebAttr = ((ReportWebAttr)configManager.getGlobalAttribute(ReportWebAttr.class));
T webContent = this.getWebContent(reportWebAttr);
if(webContent == null){
return;
@ -214,7 +217,7 @@ public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane
*
* @return 模板web属性书否为空
*/
public static boolean is_Null_ReportWebAttr(ReportWebConfig reportWebAttr) {
public static boolean is_Null_ReportWebAttr(ReportWebAttr reportWebAttr) {
if (reportWebAttr == null) {
return true;
}

13
designer/src/com/fr/design/webattr/WriteToolBarPane.java
Unescape View File

@ -1,6 +1,7 @@
package com.fr.design.webattr;
import com.fr.base.BaseUtils;
import com.fr.base.ConfigManager;
import com.fr.config.Configuration;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.dialog.BasicDialog;
@ -22,7 +23,7 @@ import com.fr.report.web.WebWrite;
import com.fr.stable.Constants;
import com.fr.transaction.Configurations;
import com.fr.transaction.Worker;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
import javax.swing.*;
@ -253,7 +254,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
@Override
public void editServerToolBarPane() {
final WriteToolBarPane serverPageToolBarPane = new WriteToolBarPane();
ReportWebConfig reportWebAttr = ReportWebConfig.getInstance();
ReportWebAttr reportWebAttr = ((ReportWebAttr) ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class));
if (reportWebAttr != null) {
serverPageToolBarPane.populateBean(reportWebAttr.getWebWrite());
}
@ -265,13 +266,17 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
Configurations.update(new Worker() {
@Override
public void run() {
ReportWebConfig reportWebAttr = ReportWebConfig.getInstance();
ReportWebAttr reportWebAttr = ((ReportWebAttr) ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class));
if (reportWebAttr == null) {
reportWebAttr = new ReportWebAttr();
ConfigManager.getProviderInstance().putGlobalAttribute(ReportWebAttr.class, reportWebAttr);
}
reportWebAttr.setWebWrite(serverPageToolBarPane.updateBean());
}
@Override
public Class<? extends Configuration>[] targets() {
return new Class[]{ReportWebConfig.class};
return new Class[]{ReportWebAttr.class};
}
});

6
designer/src/com/fr/design/webattr/WriteWebSettingPane.java
Unescape View File

@ -13,7 +13,7 @@ import com.fr.general.Inter;
import com.fr.report.web.ToolBarManager;
import com.fr.report.web.WebWrite;
import com.fr.stable.Constants;
import com.fr.web.attr.ReportWebConfig;
import com.fr.web.attr.ReportWebAttr;
import javax.swing.*;
import java.awt.*;
@ -180,7 +180,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
}
@Override
protected WebWrite getWebContent(ReportWebConfig reportWebAttr) {
protected WebWrite getWebContent(ReportWebAttr reportWebAttr) {
return reportWebAttr == null ? null : reportWebAttr.getWebWrite();
}
@ -190,7 +190,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
}
@Override
protected void setWebContent(ReportWebConfig reportWebAttr, WebWrite webContent) {
protected void setWebContent(ReportWebAttr reportWebAttr, WebWrite webContent) {
reportWebAttr.setWebWrite(webContent);
}

Write Preview
Loading…
Cancel
Save