From a6770fbc2f62c02d6fdc734d6067cd3b63eb9701 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Thu, 12 Oct 2017 14:02:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hyperlink/AbstractHyperLinkPane.java | 7 +- .../hyperlink/AbstractHyperNorthPane.java | 207 +++---- .../hyperlink/ReporletHyperNorthPane.java | 8 +- .../design/hyperlink/WebHyperNorthPane.java | 116 ++-- .../fr/design/hyperlink/WebHyperlinkPane.java | 171 +++--- .../impl/ChartHyperPoplinkPane.java | 149 ++--- .../impl/ChartHyperRelateCellLinkPane.java | 158 +++--- .../impl/ChartHyperRelateFloatLinkPane.java | 182 +++---- .../impl/FormHyperlinkPane.java | 25 +- .../chart/gui/other/ChartInteractivePane.java | 515 +++++++++--------- 10 files changed, 773 insertions(+), 765 deletions(-) diff --git a/designer_base/src/com/fr/design/hyperlink/AbstractHyperLinkPane.java b/designer_base/src/com/fr/design/hyperlink/AbstractHyperLinkPane.java index 7c8cc1b8d9..bdd46a9ecd 100644 --- a/designer_base/src/com/fr/design/hyperlink/AbstractHyperLinkPane.java +++ b/designer_base/src/com/fr/design/hyperlink/AbstractHyperLinkPane.java @@ -34,11 +34,12 @@ public abstract class AbstractHyperLinkPane extends FurtherBasicBeanPane { this.parameterViewPane = parameterViewPane; } - public boolean accept(Object ob){ + public boolean accept(Object ob) { return ob instanceof JavaScript; } - public void reset() {} + public void reset() { + } protected int getChartParaType() { return hyperLinkEditorMap != null ? ParameterTableModel.CHART_NORMAL_USE : ParameterTableModel.NO_CHART_USE; @@ -48,7 +49,7 @@ public abstract class AbstractHyperLinkPane extends FurtherBasicBeanPane { return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType(), hyperLinkEditorMap); } - protected boolean needRenamePane(){ + protected boolean needRenamePane() { return needRenamePane; } diff --git a/designer_base/src/com/fr/design/hyperlink/AbstractHyperNorthPane.java b/designer_base/src/com/fr/design/hyperlink/AbstractHyperNorthPane.java index 6a04ebafb3..149fecead9 100644 --- a/designer_base/src/com/fr/design/hyperlink/AbstractHyperNorthPane.java +++ b/designer_base/src/com/fr/design/hyperlink/AbstractHyperNorthPane.java @@ -15,130 +15,131 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; public abstract class AbstractHyperNorthPane extends BasicBeanPane { - public static final int NEW_WINDOW = 0; - public static final int DIALOG = 1; - public static final int SELF = 2; - public static final int DEFAULT_H_VALUE = 400; - public static final int DEFAULT_V_VALUE = 600; - - private JPanel headerPane; - private UIComboBox targetFrameComboBox; - - private UINumberField heightTextFiled; - private UINumberField widthTextFiled; - - - public AbstractHyperNorthPane() { - this.initComponents(); - } - - protected void initComponents() { - this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); - headerPane = this.setHeaderPanel(); - this.add(headerPane, BorderLayout.NORTH); - this.add(centerPane, BorderLayout.CENTER); - targetFrameComboBox = new UIComboBox(getTargetFrames()); - targetFrameComboBox.setRenderer(new DefaultListCellRenderer() { - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - return this; - } - }); - JPanel targetFramePanel = new JPanel(); - targetFramePanel.add(new UILabel(Inter.getLocText("Hyperlink-Link_Opened_in"))); - targetFramePanel.add(targetFrameComboBox); - targetFrameComboBox.setEditable(true); - targetFrameComboBox.setPreferredSize(new Dimension(100, 20)); - - final JPanel newWindowConfPane = new JPanel(); - newWindowConfPane.add(new UILabel(Inter.getLocText("FR-Designer_Height") + ": ")); - heightTextFiled = new UINumberField(); + public static final int NEW_WINDOW = 0; + public static final int DIALOG = 1; + public static final int SELF = 2; + public static final int DEFAULT_H_VALUE = 400; + public static final int DEFAULT_V_VALUE = 600; + + private JPanel headerPane; + private UIComboBox targetFrameComboBox; + + private UINumberField heightTextFiled; + private UINumberField widthTextFiled; + + + public AbstractHyperNorthPane() { + this.initComponents(); + } + + protected void initComponents() { + this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); + JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); + headerPane = this.setHeaderPanel(); + this.add(headerPane, BorderLayout.NORTH); + this.add(centerPane, BorderLayout.CENTER); + targetFrameComboBox = new UIComboBox(getTargetFrames()); + targetFrameComboBox.setRenderer(new DefaultListCellRenderer() { + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); + return this; + } + }); + JPanel targetFramePanel = new JPanel(); + targetFramePanel.add(new UILabel(Inter.getLocText("Hyperlink-Link_Opened_in"))); + targetFramePanel.add(targetFrameComboBox); + targetFrameComboBox.setEditable(true); + targetFrameComboBox.setPreferredSize(new Dimension(100, 20)); + + final JPanel newWindowConfPane = new JPanel(); + newWindowConfPane.add(new UILabel(Inter.getLocText("FR-Designer_Height") + ": ")); + heightTextFiled = new UINumberField(); heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE)); - heightTextFiled.setPreferredSize(new Dimension(40, 20)); - newWindowConfPane.add(heightTextFiled); - newWindowConfPane.add(new UILabel(" " + Inter.getLocText("FR-Designer_Width") + ": ")); - widthTextFiled = new UINumberField(); + heightTextFiled.setPreferredSize(new Dimension(40, 20)); + newWindowConfPane.add(heightTextFiled); + newWindowConfPane.add(new UILabel(" " + Inter.getLocText("FR-Designer_Width") + ": ")); + widthTextFiled = new UINumberField(); widthTextFiled.setText(String.valueOf(DEFAULT_V_VALUE)); - widthTextFiled.setPreferredSize(new Dimension(40, 20)); - newWindowConfPane.add(widthTextFiled); + widthTextFiled.setPreferredSize(new Dimension(40, 20)); + newWindowConfPane.add(widthTextFiled); - JPanel centerPanel = new JPanel(new BorderLayout()); - centerPanel.add(targetFramePanel, BorderLayout.WEST); - centerPanel.add(newWindowConfPane, BorderLayout.EAST); + JPanel centerPanel = new JPanel(new BorderLayout()); + centerPanel.add(targetFramePanel, BorderLayout.WEST); + centerPanel.add(newWindowConfPane, BorderLayout.EAST); newWindowConfPane.setVisible(false); - centerPane.add(centerPanel); - targetFrameComboBox.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - newWindowConfPane.setVisible(DIALOG == targetFrameComboBox.getSelectedIndex()); - } - }); + centerPane.add(centerPanel); + targetFrameComboBox.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + newWindowConfPane.setVisible(DIALOG == targetFrameComboBox.getSelectedIndex()); + } + }); - this.add(this.setFootPanel(), BorderLayout.SOUTH); - } - protected String[] getTargetFrames(){ - return new String[]{Inter.getLocText("Hyperlink-New_Window"), Inter.getLocText("FR-Hyperlink_Dialog"), Inter.getLocText("Hyperlink-Self_Window")}; - } + this.add(this.setFootPanel(), BorderLayout.SOUTH); + } - protected abstract JPanel setHeaderPanel(); + protected String[] getTargetFrames() { + return new String[]{Inter.getLocText("Hyperlink-New_Window"), Inter.getLocText("FR-Hyperlink_Dialog"), Inter.getLocText("Hyperlink-Self_Window")}; + } - protected abstract JPanel setFootPanel(); + protected abstract JPanel setHeaderPanel(); - protected abstract void populateSubHyperlinkBean(T link); + protected abstract JPanel setFootPanel(); - public UIComboBox getTargetFrameComboBox() { - return targetFrameComboBox; - } + protected abstract void populateSubHyperlinkBean(T link); - public void setTargetFrameComboBox(UIComboBox targetFrameComboBox) { - this.targetFrameComboBox = targetFrameComboBox; - } + public UIComboBox getTargetFrameComboBox() { + return targetFrameComboBox; + } - public UINumberField getHeightTextFiled() { - return heightTextFiled; - } + public void setTargetFrameComboBox(UIComboBox targetFrameComboBox) { + this.targetFrameComboBox = targetFrameComboBox; + } - public void setHeightTextFiled(UINumberField heightTextFiled) { - this.heightTextFiled = heightTextFiled; - } + public UINumberField getHeightTextFiled() { + return heightTextFiled; + } - public UINumberField getWidthTextFiled() { - return widthTextFiled; - } + public void setHeightTextFiled(UINumberField heightTextFiled) { + this.heightTextFiled = heightTextFiled; + } - public void setWidthTextFiled(UINumberField widthTextFiled) { - this.widthTextFiled = widthTextFiled; - } + public UINumberField getWidthTextFiled() { + return widthTextFiled; + } - @Override - public void populateBean(T link) { - String name = link.getTargetFrame(); - targetFrameComboBox.setSelectedIndex(HyperlinkTargetFrame.convert(name)); - heightTextFiled.setText(String.valueOf(link.getHeight() == 0 ? DEFAULT_H_VALUE : link.getHeight())); - widthTextFiled.setText(String.valueOf(link.getWidth() == 0 ? DEFAULT_V_VALUE : link.getWidth())); - populateSubHyperlinkBean(link); - } + public void setWidthTextFiled(UINumberField widthTextFiled) { + this.widthTextFiled = widthTextFiled; + } - protected abstract T updateSubHyperlinkBean(); + @Override + public void populateBean(T link) { + String name = link.getTargetFrame(); + targetFrameComboBox.setSelectedIndex(HyperlinkTargetFrame.convert(name)); + heightTextFiled.setText(String.valueOf(link.getHeight() == 0 ? DEFAULT_H_VALUE : link.getHeight())); + widthTextFiled.setText(String.valueOf(link.getWidth() == 0 ? DEFAULT_V_VALUE : link.getWidth())); + populateSubHyperlinkBean(link); + } - protected abstract void updateSubHyperlinkBean(T t); + protected abstract T updateSubHyperlinkBean(); - @Override - public T updateBean() { - T link = updateSubHyperlinkBean(); + protected abstract void updateSubHyperlinkBean(T t); - updateBean(link); + @Override + public T updateBean() { + T link = updateSubHyperlinkBean(); - return link; - } + updateBean(link); - public void updateBean(T link) { - updateSubHyperlinkBean(link); - link.setTargetFrame(HyperlinkTargetFrame.parse(targetFrameComboBox.getSelectedIndex()).getName()); - link.setHeight(Utils.objectToNumber(heightTextFiled.getText(), false).intValue()); - link.setWidth(Utils.objectToNumber(widthTextFiled.getText(), false).intValue()); - } + return link; + } + + public void updateBean(T link) { + updateSubHyperlinkBean(link); + link.setTargetFrame(HyperlinkTargetFrame.parse(targetFrameComboBox.getSelectedIndex()).getName()); + link.setHeight(Utils.objectToNumber(heightTextFiled.getText(), false).intValue()); + link.setWidth(Utils.objectToNumber(widthTextFiled.getText(), false).intValue()); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/hyperlink/ReporletHyperNorthPane.java b/designer_base/src/com/fr/design/hyperlink/ReporletHyperNorthPane.java index 8971483794..b450f6ddad 100644 --- a/designer_base/src/com/fr/design/hyperlink/ReporletHyperNorthPane.java +++ b/designer_base/src/com/fr/design/hyperlink/ReporletHyperNorthPane.java @@ -84,11 +84,11 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane { private UITextField itemNameTextField; private boolean needRenamePane = false; - private UITextField urlTextField; + private UITextField urlTextField; - public WebHyperNorthPane(boolean needRenamePane){ + public WebHyperNorthPane(boolean needRenamePane) { this.needRenamePane = needRenamePane; this.inits(); } - public WebHyperNorthPane() { - this.inits(); - } + public WebHyperNorthPane() { + this.inits(); + } - /** - * 初始化 - * - * @date 2014-4-11 - */ - public void inits() { - super.initComponents(); - } + /** + * 初始化 + * + * @date 2014-4-11 + */ + public void inits() { + super.initComponents(); + } - @Override - protected JPanel setHeaderPanel() { - JPanel headerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); + @Override + protected JPanel setHeaderPanel() { + JPanel headerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); JPanel urlPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); urlTextField = new UITextField(24); @@ -55,57 +55,57 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane { urlWithHelp.add(GUICoreUtils.createNamedPane(urlPane, "URL:")); //urlWithHelp.add(label); - if(this.needRenamePane){ - headerPane.setLayout(new BorderLayout(LayoutConstants.VGAP_LARGE,LayoutConstants.VGAP_SMALL)); + if (this.needRenamePane) { + headerPane.setLayout(new BorderLayout(LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_SMALL)); itemNameTextField = new UITextField(); headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("FR-Designer_Name") + ":"), BorderLayout.NORTH); headerPane.add(urlWithHelp, BorderLayout.CENTER); - }else{ + } else { headerPane.add(urlWithHelp, BorderLayout.NORTH); } - return headerPane; - } - - public String getURL() { - return this.urlTextField.getText(); - } - - @Override - protected String title4PopupWindow() { - return "web"; - } - - @Override - protected void populateSubHyperlinkBean(WebHyperlink link) { - String url = link.getURL(); - if (StringUtils.isBlank(url)) { - url = ConfigManager.getProviderInstance().getHyperlinkAddress(); - } - this.urlTextField.setText(url); - if(itemNameTextField != null){ + return headerPane; + } + + public String getURL() { + return this.urlTextField.getText(); + } + + @Override + protected String title4PopupWindow() { + return "web"; + } + + @Override + protected void populateSubHyperlinkBean(WebHyperlink link) { + String url = link.getURL(); + if (StringUtils.isBlank(url)) { + url = ConfigManager.getProviderInstance().getHyperlinkAddress(); + } + this.urlTextField.setText(url); + if (itemNameTextField != null) { this.itemNameTextField.setText(link.getItemName()); } - } - - @Override - protected WebHyperlink updateSubHyperlinkBean() { - WebHyperlink webHyperlink = new WebHyperlink(); - updateSubHyperlinkBean(webHyperlink); - - return webHyperlink; - } - - protected void updateSubHyperlinkBean(WebHyperlink webHyperlink) { - webHyperlink.setURL(this.urlTextField.getText()); - if(itemNameTextField != null){ + } + + @Override + protected WebHyperlink updateSubHyperlinkBean() { + WebHyperlink webHyperlink = new WebHyperlink(); + updateSubHyperlinkBean(webHyperlink); + + return webHyperlink; + } + + protected void updateSubHyperlinkBean(WebHyperlink webHyperlink) { + webHyperlink.setURL(this.urlTextField.getText()); + if (itemNameTextField != null) { webHyperlink.setItemName(this.itemNameTextField.getText()); } - } + } - @Override - protected JPanel setFootPanel() { - return new JPanel(); - } + @Override + protected JPanel setFootPanel() { + return new JPanel(); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java index 176753bd95..25d698e86f 100644 --- a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java +++ b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java @@ -16,111 +16,112 @@ import java.util.HashMap; import java.util.List; public class WebHyperlinkPane extends AbstractHyperLinkPane { - private WebHyperNorthPane northPane; + private WebHyperNorthPane northPane; private UICheckBox useCJKCheckBox; - + private UICheckBox extendParametersCheckBox; - public WebHyperlinkPane() { - super(); - this.initComponents(); - } - - public WebHyperlinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) { - super(hyperLinkEditorMap, needRenamePane); - this.initComponents(); - } - - protected void initComponents() { - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); - - northPane = new WebHyperNorthPane(needRenamePane()); - this.add(northPane, BorderLayout.NORTH); - - parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); - this.add(parameterViewPane, BorderLayout.CENTER); - parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Parameters"), null)); - - useCJKCheckBox = new UICheckBox(Inter.getLocText("Hyperlink-Use_CJK_to_encode_parameter")); + public WebHyperlinkPane() { + super(); + this.initComponents(); + } + + public WebHyperlinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) { + super(hyperLinkEditorMap, needRenamePane); + this.initComponents(); + } + + protected void initComponents() { + this.setLayout(FRGUIPaneFactory.createBorderLayout()); + this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); + + northPane = new WebHyperNorthPane(needRenamePane()); + this.add(northPane, BorderLayout.NORTH); + + parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); + this.add(parameterViewPane, BorderLayout.CENTER); + parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Parameters"), null)); + + useCJKCheckBox = new UICheckBox(Inter.getLocText("Hyperlink-Use_CJK_to_encode_parameter")); extendParametersCheckBox = new UICheckBox(Inter.getLocText("Hyperlink-Extends_Report_Parameters")); - this.add(GUICoreUtils.createFlowPane(new Component[] {useCJKCheckBox, extendParametersCheckBox}, FlowLayout.LEFT), BorderLayout.SOUTH); - } - - @Override - public String title4PopupWindow() { - return Inter.getLocText("Hyperlink-Web_link"); - } - - @Override - public void populateBean(WebHyperlink ob) { - northPane.populateBean(ob); - //parameter - List parameterList = this.parameterViewPane.update(); - parameterList.clear(); - - ParameterProvider[] parameters = ob.getParameters(); - parameterViewPane.populate(parameters); - useCJKCheckBox.setSelected(ob.isUseCJK()); - extendParametersCheckBox.setSelected(ob.isExtendParameters()); - } + this.add(GUICoreUtils.createFlowPane(new Component[]{useCJKCheckBox, extendParametersCheckBox}, FlowLayout.LEFT), BorderLayout.SOUTH); + } @Override - public WebHyperlink updateBean() { - WebHyperlink webHyperlink = new WebHyperlink(); - - updateBean(webHyperlink); - - return webHyperlink; - } - + public String title4PopupWindow() { + return Inter.getLocText("Hyperlink-Web_link"); + } + + @Override + public void populateBean(WebHyperlink ob) { + northPane.populateBean(ob); + //parameter + List parameterList = this.parameterViewPane.update(); + parameterList.clear(); + + ParameterProvider[] parameters = ob.getParameters(); + parameterViewPane.populate(parameters); + useCJKCheckBox.setSelected(ob.isUseCJK()); + extendParametersCheckBox.setSelected(ob.isExtendParameters()); + } + + @Override + public WebHyperlink updateBean() { + WebHyperlink webHyperlink = new WebHyperlink(); + + updateBean(webHyperlink); + + return webHyperlink; + } + public void updateBean(WebHyperlink webHyperlink) { - northPane.updateBean(webHyperlink); - //Parameter. - List parameterList = this.parameterViewPane.update(); - if (!parameterList.isEmpty()) { - Parameter[] parameters = new Parameter[parameterList.size()]; - parameterList.toArray(parameters); - - webHyperlink.setParameters(parameters); - } else { - webHyperlink.setParameters(null); - } - webHyperlink.setUseCJK(this.useCJKCheckBox.isSelected()); - webHyperlink.setExtendParameters(this.extendParametersCheckBox.isSelected()); + northPane.updateBean(webHyperlink); + //Parameter. + List parameterList = this.parameterViewPane.update(); + if (!parameterList.isEmpty()) { + Parameter[] parameters = new Parameter[parameterList.size()]; + parameterList.toArray(parameters); + + webHyperlink.setParameters(parameters); + } else { + webHyperlink.setParameters(null); + } + webHyperlink.setUseCJK(this.useCJKCheckBox.isSelected()); + webHyperlink.setExtendParameters(this.extendParametersCheckBox.isSelected()); } - public static class CHART_NO_RENAME extends WebHyperlinkPane{ - protected boolean needRenamePane(){ + public static class CHART_NO_RENAME extends WebHyperlinkPane { + protected boolean needRenamePane() { return false; } + protected int getChartParaType() { return ParameterTableModel.CHART_NORMAL_USE; } } - public WebHyperNorthPane getNorthPane() { - return northPane; - } + public WebHyperNorthPane getNorthPane() { + return northPane; + } - public void setNorthPane(WebHyperNorthPane northPane) { - this.northPane = northPane; - } + public void setNorthPane(WebHyperNorthPane northPane) { + this.northPane = northPane; + } - public UICheckBox getUseCJKCheckBox() { - return useCJKCheckBox; - } + public UICheckBox getUseCJKCheckBox() { + return useCJKCheckBox; + } - public void setUseCJKCheckBox(UICheckBox useCJKCheckBox) { - this.useCJKCheckBox = useCJKCheckBox; - } + public void setUseCJKCheckBox(UICheckBox useCJKCheckBox) { + this.useCJKCheckBox = useCJKCheckBox; + } - public UICheckBox getExtendParametersCheckBox() { - return extendParametersCheckBox; - } + public UICheckBox getExtendParametersCheckBox() { + return extendParametersCheckBox; + } - public void setExtendParametersCheckBox(UICheckBox extendParametersCheckBox) { - this.extendParametersCheckBox = extendParametersCheckBox; - } + public void setExtendParametersCheckBox(UICheckBox extendParametersCheckBox) { + this.extendParametersCheckBox = extendParametersCheckBox; + } } \ No newline at end of file diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java index 2556412b18..d1ddd235d2 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java @@ -20,115 +20,116 @@ import java.awt.*; import java.util.HashMap; /** - * 类说明: 图表超链 -- 弹出 悬浮窗. + * 类说明: 图表超链 -- 弹出 悬浮窗. + * * @author kunsnat E-mail:kunsnat@gmail.com * @version 创建时间：2011-12-28 上午10:41:39 */ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane { - private static final long serialVersionUID = 2469115951510144738L; - private static final int EDIT_PANE_WIDTH = 248; - private UITextField itemNameTextField; - private ChartHyperEditPane hyperEditPane; - private ChartComponent chartComponent; + private static final long serialVersionUID = 2469115951510144738L; + private static final int EDIT_PANE_WIDTH = 248; + private UITextField itemNameTextField; + private ChartHyperEditPane hyperEditPane; + private ChartComponent chartComponent; + public ChartHyperPoplinkPane() { + this(null, false); + } - public ChartHyperPoplinkPane() { - this(null, false); - } - - public ChartHyperPoplinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) { - super(hyperLinkEditorMap, needRenamePane); - this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); + public ChartHyperPoplinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) { + super(hyperLinkEditorMap, needRenamePane); + this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - if(this.needRenamePane()){ + if (this.needRenamePane()) { itemNameTextField = new UITextField(); this.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("FR-Chart-Use_Name") + ":"), BorderLayout.NORTH); } - hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); - hyperEditPane.setPreferredSize(new Dimension(EDIT_PANE_WIDTH, (int)hyperEditPane.getPreferredSize().getHeight()));// 固定属性配置面板大小,灵活调整图表显示面板. - this.add(hyperEditPane, BorderLayout.WEST); + hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); + hyperEditPane.setPreferredSize(new Dimension(EDIT_PANE_WIDTH, (int) hyperEditPane.getPreferredSize().getHeight()));// 固定属性配置面板大小,灵活调整图表显示面板. + this.add(hyperEditPane, BorderLayout.WEST); ChartCollection cc = createChartCollection(); - - chartComponent = new ChartComponent(); - chartComponent.setPreferredSize(new Dimension((int)this.getPreferredSize().getWidth()-EDIT_PANE_WIDTH, 170));// 在单元格弹出时 需要调整保证属性表的大小. - chartComponent.setSupportEdit(false); - chartComponent.populate(cc); - - this.add(chartComponent, BorderLayout.CENTER); - - hyperEditPane.populate(cc); - - hyperEditPane.useChartComponent(chartComponent); - } + + chartComponent = new ChartComponent(); + chartComponent.setPreferredSize(new Dimension((int) this.getPreferredSize().getWidth() - EDIT_PANE_WIDTH, 170));// 在单元格弹出时 需要调整保证属性表的大小. + chartComponent.setSupportEdit(false); + chartComponent.populate(cc); + + this.add(chartComponent, BorderLayout.CENTER); + + hyperEditPane.populate(cc); + + hyperEditPane.useChartComponent(chartComponent); + } private ChartCollection createChartCollection() { ChartCollection cc = new ChartCollection(); Chart chart = ChartTypeManager.getFirstChart(); - if (chart != null){ + if (chart != null) { try { - cc.addChart((Chart)chart.clone()); + cc.addChart((Chart) chart.clone()); } catch (CloneNotSupportedException e) { FRLogger.getLogger().error(e.getMessage(), e); } - }else { + } else { cc.addChart(new Chart(new Bar2DPlot())); } return cc; } - - @Override - public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Pop_Chart"); - } - - @Override - public void populateBean(ChartHyperPoplink chartHyperlink) { - if(itemNameTextField != null){ + + @Override + public String title4PopupWindow() { + return Inter.getLocText("FR-Chart-Pop_Chart"); + } + + @Override + public void populateBean(ChartHyperPoplink chartHyperlink) { + if (itemNameTextField != null) { this.itemNameTextField.setText(chartHyperlink.getItemName()); } - BaseChartCollection cc = chartHyperlink.getChartCollection(); - if (cc == null || cc.getChartCount() < 1) { - cc = createChartCollection(); - chartHyperlink.setChartCollection(cc); - } - - hyperEditPane.populateHyperLink(chartHyperlink); - chartComponent.populate(cc); - } - - /** - * 超链数组HyperlinkGoup切换时 updateBean. - * @return 返回的弹出超链. - */ - public ChartHyperPoplink updateBean() { - ChartHyperPoplink chartLink = new ChartHyperPoplink(); - updateBean(chartLink); - if(itemNameTextField != null){ + BaseChartCollection cc = chartHyperlink.getChartCollection(); + if (cc == null || cc.getChartCount() < 1) { + cc = createChartCollection(); + chartHyperlink.setChartCollection(cc); + } + + hyperEditPane.populateHyperLink(chartHyperlink); + chartComponent.populate(cc); + } + + /** + * 超链数组HyperlinkGoup切换时 updateBean. + * + * @return 返回的弹出超链. + */ + public ChartHyperPoplink updateBean() { + ChartHyperPoplink chartLink = new ChartHyperPoplink(); + updateBean(chartLink); + if (itemNameTextField != null) { chartLink.setItemName(this.itemNameTextField.getText()); } - return chartLink; - } - - /** - * 属性表 对应update - */ - public void updateBean(ChartHyperPoplink chartHyperlink) { - hyperEditPane.updateHyperLink(chartHyperlink); - chartHyperlink.setChartCollection(chartComponent.update()); - - DesignModuleFactory.getChartPropertyPane().getChartEditPane().fire();// 响应整个图表保存事件等. - if(itemNameTextField != null){ + return chartLink; + } + + /** + * 属性表 对应update + */ + public void updateBean(ChartHyperPoplink chartHyperlink) { + hyperEditPane.updateHyperLink(chartHyperlink); + chartHyperlink.setChartCollection(chartComponent.update()); + + DesignModuleFactory.getChartPropertyPane().getChartEditPane().fire();// 响应整个图表保存事件等. + if (itemNameTextField != null) { chartHyperlink.setItemName(this.itemNameTextField.getText()); } - } + } - public static class CHART_NO_RENAME extends ChartHyperPoplinkPane{ - protected boolean needRenamePane(){ + public static class CHART_NO_RENAME extends ChartHyperPoplinkPane { + protected boolean needRenamePane() { return false; } } diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java index 2429430aaa..0904957c76 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java @@ -20,104 +20,104 @@ import java.util.List; /** * @author kunsnat E-mail:kunsnat@gmail.com * @version 创建时间：2011-12-28 下午02:51:10 - * 类说明: 图表超链 -- 关联单元格图表. + * 类说明: 图表超链 -- 关联单元格图表. */ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane { - private static final long serialVersionUID = 7874948047886548990L; + private static final long serialVersionUID = 7874948047886548990L; private UITextField itemNameTextField; - private ColumnRowVerticalPane colRowPane; - private ReportletParameterViewPane parameterViewPane; + private ColumnRowVerticalPane colRowPane; + private ReportletParameterViewPane parameterViewPane; - public ChartHyperRelateCellLinkPane() { - this.initComponent(); - } + public ChartHyperRelateCellLinkPane() { + this.initComponent(); + } - public ChartHyperRelateCellLinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) { - super(hyperLinkEditorMap, needRenamePane); - this.initComponent(); - } + public ChartHyperRelateCellLinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) { + super(hyperLinkEditorMap, needRenamePane); + this.initComponent(); + } - private void initComponent() { - this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - if(needRenamePane()){ + private void initComponent() { + this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); + if (needRenamePane()) { itemNameTextField = new UITextField(); this.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("Name") + ":"), BorderLayout.NORTH); } - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); - this.add(centerPane, BorderLayout.CENTER); - - centerPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"Related", "Cell"}))); - - colRowPane = new ColumnRowVerticalPane(); - centerPane.add(colRowPane, BorderLayout.NORTH); - - parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); - parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Parameters"))); - parameterViewPane.setPreferredSize(new Dimension(500, 200)); - this.add(parameterViewPane, BorderLayout.SOUTH); - } - - @Override - public void populateBean(ChartHyperRelateCellLink ob) { - if(ob == null) { - return; - } - if(itemNameTextField != null){ + JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); + this.add(centerPane, BorderLayout.CENTER); + + centerPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"Related", "Cell"}))); + + colRowPane = new ColumnRowVerticalPane(); + centerPane.add(colRowPane, BorderLayout.NORTH); + + parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); + parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Parameters"))); + parameterViewPane.setPreferredSize(new Dimension(500, 200)); + this.add(parameterViewPane, BorderLayout.SOUTH); + } + + @Override + public void populateBean(ChartHyperRelateCellLink ob) { + if (ob == null) { + return; + } + if (itemNameTextField != null) { itemNameTextField.setText(ob.getItemName()); } - if(ob.getRelateCCName() != null) { - ColumnRow colRow = ColumnRow.valueOf(ob.getRelateCCName()); - colRowPane.populate(colRow); - } else { - colRowPane.populate(ColumnRow.valueOf("A1")); - } - - List parameterList = this.parameterViewPane.update(); - parameterList.clear(); - - ParameterProvider[] parameters = ob.getParameters(); - parameterViewPane.populate(parameters); - } - - @Override - public ChartHyperRelateCellLink updateBean() { - ChartHyperRelateCellLink chartLink = new ChartHyperRelateCellLink(); - updateBean(chartLink); - if(itemNameTextField != null){ + if (ob.getRelateCCName() != null) { + ColumnRow colRow = ColumnRow.valueOf(ob.getRelateCCName()); + colRowPane.populate(colRow); + } else { + colRowPane.populate(ColumnRow.valueOf("A1")); + } + + List parameterList = this.parameterViewPane.update(); + parameterList.clear(); + + ParameterProvider[] parameters = ob.getParameters(); + parameterViewPane.populate(parameters); + } + + @Override + public ChartHyperRelateCellLink updateBean() { + ChartHyperRelateCellLink chartLink = new ChartHyperRelateCellLink(); + updateBean(chartLink); + if (itemNameTextField != null) { chartLink.setItemName(this.itemNameTextField.getText()); } - return chartLink; - } - - /** - * 属性表 对应update - */ - public void updateBean(ChartHyperRelateCellLink chartLink) { - chartLink.setRelateCCName(Utils.objectToString(colRowPane.update())); - - List parameterList = this.parameterViewPane.update(); - if (parameterList != null && !parameterList.isEmpty()) { - ParameterProvider[] parameters = new ParameterProvider[parameterList.size()]; - parameterList.toArray(parameters); - - chartLink.setParameters(parameters); - } else { - chartLink.setParameters(null); - } - if(itemNameTextField != null){ + return chartLink; + } + + /** + * 属性表 对应update + */ + public void updateBean(ChartHyperRelateCellLink chartLink) { + chartLink.setRelateCCName(Utils.objectToString(colRowPane.update())); + + List parameterList = this.parameterViewPane.update(); + if (parameterList != null && !parameterList.isEmpty()) { + ParameterProvider[] parameters = new ParameterProvider[parameterList.size()]; + parameterList.toArray(parameters); + + chartLink.setParameters(parameters); + } else { + chartLink.setParameters(null); + } + if (itemNameTextField != null) { chartLink.setItemName(this.itemNameTextField.getText()); } - } + } - @Override - public String title4PopupWindow() { - return Inter.getLocText(new String[]{"Related", "Cell"}); - } + @Override + public String title4PopupWindow() { + return Inter.getLocText(new String[]{"Related", "Cell"}); + } - public static class CHART_NO_RENAME extends ChartHyperRelateCellLinkPane{ - protected boolean needRenamePane(){ + public static class CHART_NO_RENAME extends ChartHyperRelateCellLinkPane { + protected boolean needRenamePane() { return false; } } diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java index c26b4d131b..e12f08ed1f 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java @@ -25,120 +25,120 @@ import java.util.List; /** * @author kunsnat E-mail:kunsnat@gmail.com * @version 创建时间：2011-12-28 下午03:02:43 - * 类说明: 图表超链 关联悬浮元素 + * 类说明: 图表超链 关联悬浮元素 */ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane { - private static final long serialVersionUID = -3308412003405587689L; + private static final long serialVersionUID = -3308412003405587689L; private UITextField itemNameTextField; - private UIComboBox floatNameBox; + private UIComboBox floatNameBox; - public ChartHyperRelateFloatLinkPane() { - this.initComponent(); - } + public ChartHyperRelateFloatLinkPane() { + this.initComponent(); + } + + public ChartHyperRelateFloatLinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) { + super(hyperLinkEditorMap, needRenamePane); + this.initComponent(); + } + + private void initComponent() { + this.setLayout(FRGUIPaneFactory.createBorderLayout()); - public ChartHyperRelateFloatLinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) { - super(hyperLinkEditorMap, needRenamePane); - this.initComponent(); - } - - private void initComponent() { - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); + JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); - if(needRenamePane()){ + if (needRenamePane()) { itemNameTextField = new UITextField(); this.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("Name") + ":"), BorderLayout.NORTH); } - this.add(centerPane, BorderLayout.CENTER); - floatNameBox = new UIComboBox(getFloatNames()); - floatNameBox.setPreferredSize(new Dimension(90, 20)); - - JPanel pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); - pane.add(new UILabel(Inter.getLocText("M_Insert-Float") + ":")); - pane.add(floatNameBox); - - Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR); - Font font = null; - TitledBorder border = new TitledBorder(boder, Inter.getLocText(new String[]{"Related", "M_Insert-Float"}), 4, 2, font, new Color(1, 159, 222)); - // 圆角不行 - centerPane.setBorder(border); - - centerPane.add(pane, BorderLayout.NORTH); - - parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); - parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Parameters"))); - parameterViewPane.setPreferredSize(new Dimension(500, 200)); - this.add(parameterViewPane, BorderLayout.SOUTH); - } - - private String[] getFloatNames() { - DesignModelAdapter adapter = DesignModelAdapter.getCurrentModelAdapter(); - if(adapter != null ) { - return adapter.getFloatNames(); - } - return new String[0]; - } - - @Override - public void populateBean(ChartHyperRelateFloatLink ob) { - if(ob == null) { - return ; - } - - if(itemNameTextField != null){ + this.add(centerPane, BorderLayout.CENTER); + floatNameBox = new UIComboBox(getFloatNames()); + floatNameBox.setPreferredSize(new Dimension(90, 20)); + + JPanel pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); + pane.add(new UILabel(Inter.getLocText("M_Insert-Float") + ":")); + pane.add(floatNameBox); + + Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR); + Font font = null; + TitledBorder border = new TitledBorder(boder, Inter.getLocText(new String[]{"Related", "M_Insert-Float"}), 4, 2, font, new Color(1, 159, 222)); + // 圆角不行 + centerPane.setBorder(border); + + centerPane.add(pane, BorderLayout.NORTH); + + parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); + parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Parameters"))); + parameterViewPane.setPreferredSize(new Dimension(500, 200)); + this.add(parameterViewPane, BorderLayout.SOUTH); + } + + private String[] getFloatNames() { + DesignModelAdapter adapter = DesignModelAdapter.getCurrentModelAdapter(); + if (adapter != null) { + return adapter.getFloatNames(); + } + return new String[0]; + } + + @Override + public void populateBean(ChartHyperRelateFloatLink ob) { + if (ob == null) { + return; + } + + if (itemNameTextField != null) { itemNameTextField.setText(ob.getItemName()); } - floatNameBox.setSelectedItem(ob.getRelateCCName()); - - List parameterList = this.parameterViewPane.update(); - parameterList.clear(); + floatNameBox.setSelectedItem(ob.getRelateCCName()); - ParameterProvider[] parameters = ob.getParameters(); - parameterViewPane.populate(parameters); - } + List parameterList = this.parameterViewPane.update(); + parameterList.clear(); + + ParameterProvider[] parameters = ob.getParameters(); + parameterViewPane.populate(parameters); + } - @Override - public ChartHyperRelateFloatLink updateBean() { - ChartHyperRelateFloatLink chartLink = new ChartHyperRelateFloatLink(); - updateBean(chartLink); - if(itemNameTextField != null){ + @Override + public ChartHyperRelateFloatLink updateBean() { + ChartHyperRelateFloatLink chartLink = new ChartHyperRelateFloatLink(); + updateBean(chartLink); + if (itemNameTextField != null) { chartLink.setItemName(this.itemNameTextField.getText()); } - return chartLink; - } - - public void updateBean(ChartHyperRelateFloatLink chartLink) { - - if(floatNameBox.getSelectedItem() != null) { - chartLink.setRelateCCName(Utils.objectToString(floatNameBox.getSelectedItem())); - } - - List parameterList = this.parameterViewPane.update(); - if (parameterList != null && !parameterList.isEmpty()) { - ParameterProvider[] parameters = new ParameterProvider[parameterList.size()]; - parameterList.toArray(parameters); - - chartLink.setParameters(parameters); - } else { - chartLink.setParameters(null); - } - if(itemNameTextField != null){ + return chartLink; + } + + public void updateBean(ChartHyperRelateFloatLink chartLink) { + + if (floatNameBox.getSelectedItem() != null) { + chartLink.setRelateCCName(Utils.objectToString(floatNameBox.getSelectedItem())); + } + + List parameterList = this.parameterViewPane.update(); + if (parameterList != null && !parameterList.isEmpty()) { + ParameterProvider[] parameters = new ParameterProvider[parameterList.size()]; + parameterList.toArray(parameters); + + chartLink.setParameters(parameters); + } else { + chartLink.setParameters(null); + } + if (itemNameTextField != null) { chartLink.setItemName(this.itemNameTextField.getText()); } - } + } - @Override - public String title4PopupWindow() { - return Inter.getLocText(new String[]{"Related", "M_Insert-Float"}); - } + @Override + public String title4PopupWindow() { + return Inter.getLocText(new String[]{"Related", "M_Insert-Float"}); + } - public static class CHART_NO_RENAME extends ChartHyperRelateFloatLinkPane{ - protected boolean needRenamePane(){ + public static class CHART_NO_RENAME extends ChartHyperRelateFloatLinkPane { + protected boolean needRenamePane() { return false; } } diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java index 7bb95bcee4..5924f89dad 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java @@ -46,14 +46,14 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane parameterList = this.parameterViewPane.update(); @@ -92,10 +92,11 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane implements UIObserver{ - private static final long serialVersionUID = 3477409806918835992L; +public class ChartInteractivePane extends BasicScrollPane implements UIObserver { + private static final long serialVersionUID = 3477409806918835992L; private static HashMap normalMap = new HashMap(); private static final int TIME_SWITCH_GAP = 40; - private UICheckBox isChartAnimation;// 动态 + private UICheckBox isChartAnimation;// 动态 private UICheckBox isSeriesDragEnable; //系列拖拽 private UICheckBox isAxisZoom;// 缩放 - private UICheckBox isDatapointValue;// 数据点提示 - private UIButton dataPointValueFormat; + private UICheckBox isDatapointValue;// 数据点提示 + private UIButton dataPointValueFormat; - private UICheckBox isDatapointPercent; - private UIButton dataPointPercentFormat; + private UICheckBox isDatapointPercent; + private UIButton dataPointPercentFormat; private UILabel tooltipStyleLabel; private UIComboBox tooltipStyle; @@ -102,24 +102,24 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb private UICheckBox isAddress; private UICheckBox isAddressName; - private UICheckBox isAxisShowToolTip;// 坐标轴提示 + private UICheckBox isAxisShowToolTip;// 坐标轴提示 - protected UICheckBox isAutoRefresh;// 自动刷新 - protected UISpinner autoRefreshTime; + protected UICheckBox isAutoRefresh;// 自动刷新 + protected UISpinner autoRefreshTime; - private UICorrelationComboBoxPane superLink;// 超链 + private UICorrelationComboBoxPane superLink;// 超链 - private FormatPane valueFormatPane; - private FormatPane percentFormatPane; - private Format valueFormat; - private Format percentFormat; + private FormatPane valueFormatPane; + private FormatPane percentFormatPane; + private Format valueFormat; + private Format percentFormat; - private JPanel tooltipPane; - private JPanel axisShowPane; - private JPanel autoRefreshPane; - private JPanel superlinkPane; + private JPanel tooltipPane; + private JPanel axisShowPane; + private JPanel autoRefreshPane; + private JPanel superlinkPane; - private ChartOtherPane parent; + private ChartOtherPane parent; private UICheckBox timeSwitch; @@ -128,47 +128,49 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb protected Plot plot; - private static final int SIZEX = 258; - private static final int SIZEY = 209; - private static final int DET = 20; - public ChartInteractivePane(ChartOtherPane parent) { - super(); - this.parent = parent; - } + private static final int SIZEX = 258; + private static final int SIZEY = 209; + private static final int DET = 20; - /** - * 界面标题. + public ChartInteractivePane(ChartOtherPane parent) { + super(); + this.parent = parent; + } + + /** + * 界面标题. + * * @return 返回标题. - */ - public String title4PopupWindow() { - return Inter.getLocText("Chart-Interactive_Tab"); - } - - @Override - protected JPanel createContentPane() { - isChartAnimation = new UICheckBox(Inter.getLocText("Chart-Animation_JSShow")); + */ + public String title4PopupWindow() { + return Inter.getLocText("Chart-Interactive_Tab"); + } + + @Override + protected JPanel createContentPane() { + isChartAnimation = new UICheckBox(Inter.getLocText("Chart-Animation_JSShow")); isSeriesDragEnable = new UICheckBox(Inter.getLocText("Chart-Series_Drag")); - isDatapointValue = new UICheckBox(Inter.getLocText("Chart-Use_Value")); - dataPointValueFormat = new UIButton(Inter.getLocText("Chart-Use_Format")); - isDatapointPercent = new UICheckBox(Inter.getLocText("Chart-Value_Percent")); - dataPointPercentFormat = new UIButton(Inter.getLocText("Chart-Use_Format")); - tooltipStyle = new UIComboBox(new String []{Inter.getLocText("Chart-White_Black"), Inter.getLocText("Chart-Black_White")}); + isDatapointValue = new UICheckBox(Inter.getLocText("Chart-Use_Value")); + dataPointValueFormat = new UIButton(Inter.getLocText("Chart-Use_Format")); + isDatapointPercent = new UICheckBox(Inter.getLocText("Chart-Value_Percent")); + dataPointPercentFormat = new UIButton(Inter.getLocText("Chart-Use_Format")); + tooltipStyle = new UIComboBox(new String[]{Inter.getLocText("Chart-White_Black"), Inter.getLocText("Chart-Black_White")}); tooltipStyleLabel = new UILabel(Inter.getLocText("Chart-Style_Name")); - tooltipShowType = new UIComboBox(new String []{Inter.getLocText("Chart-Series_SingleData"), Inter.getLocText("Chart-Series_AllData")}); + tooltipShowType = new UIComboBox(new String[]{Inter.getLocText("Chart-Series_SingleData"), Inter.getLocText("Chart-Series_AllData")}); tooltipShowTypeLabel = new UILabel(Inter.getLocText("Chart-Use_Show")); isAddressTittle = new UICheckBox(Inter.getLocText("Chart-Area_Title")); isAddress = new UICheckBox(Inter.getLocText("Chart-Gis_Address")); isAddressName = new UICheckBox(Inter.getLocText("Chart-Address_Name")); - isAxisShowToolTip = new UICheckBox(Inter.getLocText("Chart-Interactive_AxisTooltip")); - isAxisZoom = new UICheckBox(Inter.getLocText("Chart-Use_Zoom")); - isAutoRefresh = new UICheckBox(Inter.getLocText(new String[]{"Chart-Use_Auto", "Chart-Use_Refresh"})); - autoRefreshTime = new UISpinner(1, Integer.MAX_VALUE, 1); - superLink = new UICorrelationComboBoxPane(); + isAxisShowToolTip = new UICheckBox(Inter.getLocText("Chart-Interactive_AxisTooltip")); + isAxisZoom = new UICheckBox(Inter.getLocText("Chart-Use_Zoom")); + isAutoRefresh = new UICheckBox(Inter.getLocText(new String[]{"Chart-Use_Auto", "Chart-Use_Refresh"})); + autoRefreshTime = new UISpinner(1, Integer.MAX_VALUE, 1); + superLink = new UICorrelationComboBoxPane(); - isAutoRefresh.addActionListener(new ActionListener() { + isAutoRefresh.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { checkAutoRefresh(); @@ -176,9 +178,9 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb }); timeSwitch = new UICheckBox(Inter.getLocText("FR-Chart-Interactive_timeSwitch")); timeSwitchPane = new TimeSwitchPane(); - initFormatListener(); - return initPaneWithListener(); - } + initFormatListener(); + return initPaneWithListener(); + } private void initFormatListener() { @@ -188,7 +190,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb @Override public void itemStateChanged(ItemEvent e) { timeSwitch.setEnabled(isAxisZoom.isSelected()); - if(!isAxisZoom.isSelected()){ + if (!isAxisZoom.isSelected()) { timeSwitch.setSelected(false); } } @@ -254,19 +256,20 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb }); } - private void checkAutoRefresh() { - GUICoreUtils.setEnabled(autoRefreshTime, isAutoRefresh.isSelected()); - } + private void checkAutoRefresh() { + GUICoreUtils.setEnabled(autoRefreshTime, isAutoRefresh.isSelected()); + } - /** - * 反正后面还有relayout,这边init一下就好了 保证所有的init 加入界面 并且加载入事件. - * @return - */ - private JPanel initPaneWithListener() { - initDataPointToolTipPane(); - initAxisShowPane(); - initAutoRefreshPane(); - initSuperlinkPane(); + /** + * 反正后面还有relayout,这边init一下就好了 保证所有的init 加入界面 并且加载入事件. + * + * @return + */ + private JPanel initPaneWithListener() { + initDataPointToolTipPane(); + initAxisShowPane(); + initAutoRefreshPane(); + initSuperlinkPane(); initTimeSwitchPane(); @@ -285,34 +288,33 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb }; //初始化界面时 加载事件 return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - } + } - private void initTimeSwitchPane(){ + private void initTimeSwitchPane() { timeSwitchContainer = new JPanel(new BorderLayout()); timeSwitchContainer.add(timeSwitch, BorderLayout.CENTER); } - /** * 全部初始化, 对所有的界面 都加入, 然后会加载事件响应. 后续再relayout. */ - private void initDataPointToolTipPane() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = new double[]{p, f}; - double[] rowSize = new double[]{p, p, p, p, p, p, p}; + private void initDataPointToolTipPane() { + double p = TableLayout.PREFERRED; + double f = TableLayout.FILL; + double[] columnSize = new double[]{p, f}; + double[] rowSize = new double[]{p, p, p, p, p, p, p}; Component[][] components = new Component[][]{ new Component[]{isDatapointValue, dataPointValueFormat}, new Component[]{isDatapointPercent, dataPointPercentFormat}, new Component[]{isAddress, null}, - new Component[]{isAddressName,null}, + new Component[]{isAddressName, null}, new Component[]{isAddressTittle, null}, new Component[]{tooltipShowTypeLabel, tooltipShowType}, new Component[]{tooltipStyleLabel, tooltipStyle} }; - tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"},components, rowSize, columnSize); - } + tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize); + } private void relayoutDataPointToolTipPane(Plot plot) { double p = TableLayout.PREFERRED; @@ -320,21 +322,21 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb double[] columnSize = new double[]{p, f}; double[] rowSize = new double[]{p, p}; - if(plot.isShowAllDataPointLabel()) { + if (plot.isShowAllDataPointLabel()) { isDatapointPercent.setText(Inter.getLocText("Chart-Value_Conversion")); } - if(plot.isSupportAddress4Gis()) { + if (plot.isSupportAddress4Gis()) { UIButton tmpButton = new UIButton(); //用来调整对齐 tmpButton.setVisible(false); rowSize = new double[]{p, p, p, p, p}; Component[][] components = new Component[][]{ new Component[]{isAddress, null}, - new Component[]{isAddressName,null}, + new Component[]{isAddressName, null}, new Component[]{isAddressTittle, tmpButton}, new Component[]{isDatapointValue, dataPointValueFormat}, }; - tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"},components, rowSize, columnSize); - } else if(plot.isSupportValuePercent()) { + tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize); + } else if (plot.isSupportValuePercent()) { Component[][] components; if (plot.isSupportTooltipSeriesType()) { rowSize = new double[]{p, p, p, p}; @@ -347,18 +349,18 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb } else { rowSize = new double[]{p, p, p}; components = new Component[][]{ - new Component[]{isDatapointValue, dataPointValueFormat}, - new Component[]{isDatapointPercent, dataPointPercentFormat}, + new Component[]{isDatapointValue, dataPointValueFormat}, + new Component[]{isDatapointPercent, dataPointPercentFormat}, getTooltipStyleComponent() }; } - tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"},components, rowSize, columnSize); + tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize); } else { Component[][] components = new Component[][]{ new Component[]{isDatapointValue, dataPointValueFormat}, getTooltipStyleComponent() }; - tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"},components, rowSize, columnSize); + tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize); } } @@ -369,8 +371,8 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb new Component[]{tooltipShowTypeLabel, tooltipShowType} }; double[] newColumnSize = new double[]{f, p}; - double []newRowSize = new double[]{p}; - return new Component[] {TableLayoutHelper.createTableLayoutPane(newComponents, newRowSize, newColumnSize), null}; + double[] newRowSize = new double[]{p}; + return new Component[]{TableLayoutHelper.createTableLayoutPane(newComponents, newRowSize, newColumnSize), null}; } private Component[] getTooltipStyleComponent() { @@ -380,53 +382,53 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb new Component[]{tooltipStyleLabel, tooltipStyle} }; double[] newColumnSize = new double[]{f, p}; - double []newRowSize = new double[]{p}; - return new Component[] {TableLayoutHelper.createTableLayoutPane(newComponents, newRowSize, newColumnSize), null}; - } - - private void initAxisShowPane() { - double p = TableLayout.PREFERRED; - double[] columnSize = new double[]{p}; - double[] rowSize = new double[]{p}; - Component[][] components = new Component[][]{ - new Component[]{isAxisShowToolTip}, - }; - axisShowPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Axis", "Chart-Interactive"},components, rowSize, columnSize); - } - - private void initAutoRefreshPane() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = new double[]{p, f}; - double[] rowSize = new double[]{p, p, p,p}; - - Component[][] components = new Component[][]{ - new Component[]{isAutoRefresh,null}, - new Component[]{GUICoreUtils.createFlowPane(new Component[]{ - new UILabel(Inter.getLocText("Chart-Time_Interval")), - autoRefreshTime, - new UILabel(Inter.getLocText("Chart-Time_Seconds")) - }, 1)}, + double[] newRowSize = new double[]{p}; + return new Component[]{TableLayoutHelper.createTableLayoutPane(newComponents, newRowSize, newColumnSize), null}; + } + + private void initAxisShowPane() { + double p = TableLayout.PREFERRED; + double[] columnSize = new double[]{p}; + double[] rowSize = new double[]{p}; + Component[][] components = new Component[][]{ + new Component[]{isAxisShowToolTip}, + }; + axisShowPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Axis", "Chart-Interactive"}, components, rowSize, columnSize); + } + + private void initAutoRefreshPane() { + double p = TableLayout.PREFERRED; + double f = TableLayout.FILL; + double[] columnSize = new double[]{p, f}; + double[] rowSize = new double[]{p, p, p, p}; + + Component[][] components = new Component[][]{ + new Component[]{isAutoRefresh, null}, + new Component[]{GUICoreUtils.createFlowPane(new Component[]{ + new UILabel(Inter.getLocText("Chart-Time_Interval")), + autoRefreshTime, + new UILabel(Inter.getLocText("Chart-Time_Seconds")) + }, 1)}, new Component[]{new UILabel("" + Inter.getLocText("FR-Chart-AutoRefresh_NotSupportIMGAndReportData") + ""), null}, - }; - autoRefreshPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data-Check"},components, rowSize, columnSize); - } - - private void initSuperlinkPane() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = new double[]{p, f}; - double[] rowSize = new double[]{p}; - Component[][] components = new Component[][]{ - new Component[]{superLink, null}, - - }; - superlinkPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Hyperlink"},components, rowSize, columnSize); - } - - private void relayoutWithPlot(Plot plot) { - this.removeAll(); - double p = TableLayout.PREFERRED; + }; + autoRefreshPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data-Check"}, components, rowSize, columnSize); + } + + private void initSuperlinkPane() { + double p = TableLayout.PREFERRED; + double f = TableLayout.FILL; + double[] columnSize = new double[]{p, f}; + double[] rowSize = new double[]{p}; + Component[][] components = new Component[][]{ + new Component[]{superLink, null}, + + }; + superlinkPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Hyperlink"}, components, rowSize, columnSize); + } + + private void relayoutWithPlot(Plot plot) { + this.removeAll(); + double p = TableLayout.PREFERRED; double[] columnSize = new double[]{TableLayout.FILL}; double[] rowSize = new double[]{p, p, p}; @@ -441,11 +443,11 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb double[] row = new double[]{p, p, p, p, p, p}; reloaPane(TableLayoutHelper.createTableLayoutPane(components, row, columnSize)); - } + } private Component[] getChartAnimatePane(Plot plot, double[] row, double[] col) { - if(plot.isSupportAnimate() && plot.isSupportSeriesDrag()) { + if (plot.isSupportAnimate() && plot.isSupportSeriesDrag()) { return new Component[]{TableLayoutHelper.createTableLayoutPane( new Component[][]{ new Component[]{isChartAnimation}, @@ -453,7 +455,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb new Component[]{new JSeparator()} }, row, col) }; - }else if(plot.isSupportAnimate() && !plot.isSupportSeriesDrag()){ + } else if (plot.isSupportAnimate() && !plot.isSupportSeriesDrag()) { return new Component[]{TableLayoutHelper.createTableLayoutPane( new Component[][]{ new Component[]{isChartAnimation}, @@ -461,36 +463,36 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb }, row, col) }; } - return new Component[]{null}; + return new Component[]{null}; } - private void relayoutTimeSwitchPane(){ + private void relayoutTimeSwitchPane() { timeSwitchContainer.removeAll(); timeSwitchContainer.add(timeSwitch, BorderLayout.CENTER); - if(timeSwitch.isSelected()){ + if (timeSwitch.isSelected()) { double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = new double[]{TIME_SWITCH_GAP,f}; - double[] rowSize = new double[]{p}; + double f = TableLayout.FILL; + double[] columnSize = new double[]{TIME_SWITCH_GAP, f}; + double[] rowSize = new double[]{p}; Component[][] components = new Component[][]{ new Component[]{null, timeSwitchPane}, }; - JPanel panel= TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); timeSwitchContainer.add(panel, BorderLayout.SOUTH); } timeSwitchContainer.revalidate(); } private Component[] getChartScalePane(Plot plot, double[] row, double[] col) { - boolean isNeedTimeSwitch = plot.getxAxis()!=null && plot.getxAxis().isDate(); - if(plot.isSupportZoomCategoryAxis() && !isNeedTimeSwitch) { + boolean isNeedTimeSwitch = plot.getxAxis() != null && plot.getxAxis().isDate(); + if (plot.isSupportZoomCategoryAxis() && !isNeedTimeSwitch) { return new Component[]{TableLayoutHelper.createTableLayoutPane( new Component[][]{ new Component[]{isAxisZoom}, new Component[]{new JSeparator()} }, row, col) }; - }else if(plot.isSupportZoomCategoryAxis() && isNeedTimeSwitch){ + } else if (plot.isSupportZoomCategoryAxis() && isNeedTimeSwitch) { return new Component[]{TableLayoutHelper.createTableLayoutPane( new Component[][]{ new Component[]{isAxisZoom}, @@ -499,29 +501,29 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb }, row, col) }; } - return new Component[]{null}; + return new Component[]{null}; } private Component[] getDataTooltipPane(Plot plot, double[] row, double[] col) { relayoutDataPointToolTipPane(plot); - if(plot.isSupportTooltipInInteractivePane()) { + if (plot.isSupportTooltipInInteractivePane()) { return new Component[]{TableLayoutHelper.createTableLayoutPane(new Component[][]{ new Component[]{tooltipPane}, new Component[]{new JSeparator()}}, row, col)}; } - return new Component[]{null}; + return new Component[]{null}; } private Component[] getAxisTipPane(Plot plot, double[] row, double[] col) { - if(plot.isSupportAxisTip()) { + if (plot.isSupportAxisTip()) { return new Component[]{TableLayoutHelper.createTableLayoutPane(new Component[][]{ new Component[]{axisShowPane}, new Component[]{new JSeparator()}}, row, col)}; } - return new Component[]{null}; + return new Component[]{null}; } private Component[] getAutoRefreshPane(Plot plot, double[] row, double[] col) { - if(plot.isSupportAutoRefresh()) { + if (plot.isSupportAutoRefresh()) { return new Component[]{TableLayoutHelper.createTableLayoutPane( new Component[][]{ new Component[]{autoRefreshPane}, @@ -537,16 +539,16 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb return new Component[]{superlinkPane}; } - @Override - public void populateBean(Chart chart) { - if (chart == null || chart.getPlot() == null) { - return; - } + @Override + public void populateBean(Chart chart) { + if (chart == null || chart.getPlot() == null) { + return; + } - Plot plot = chart.getPlot(); - this.plot =plot; + Plot plot = chart.getPlot(); + this.plot = plot; relayoutWithGis(chart, plot); - relayoutWithPlot(plot); + relayoutWithPlot(plot); populateChartAnimate(chart, plot); populateChartScale(plot); @@ -555,63 +557,63 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb populateAutoRefresh(chart); populateHyperlink(plot); - checkAutoRefresh(); - } + checkAutoRefresh(); + } private void relayoutWithGis(Chart chart, Plot plot) { - if(plot.isSupportAddress4Gis()) { + if (plot.isSupportAddress4Gis()) { TopDefinitionProvider definition = chart.getFilterDefinition(); boolean addressType = true; - if(definition instanceof GisMapTableDefinition){ - addressType = ((GisMapTableDefinition)definition).isAddress(); - }else if(definition instanceof GisMapReportDefinition){ - addressType = ((GisMapReportDefinition)definition).isAddress(); + if (definition instanceof GisMapTableDefinition) { + addressType = ((GisMapTableDefinition) definition).isAddress(); + } else if (definition instanceof GisMapReportDefinition) { + addressType = ((GisMapReportDefinition) definition).isAddress(); } - if(addressType){ + if (addressType) { this.isAddress.setText(Inter.getLocText("Chart-Use_Address")); - }else{ + } else { this.isAddress.setText(Inter.getLocText("Chart-Use_LatLng")); } } } private void populateChartAnimate(Chart chart, Plot plot) { - if(plot.isSupportAnimate()) { + if (plot.isSupportAnimate()) { isChartAnimation.setSelected(chart.isJSDraw()); } - if(plot.isSupportSeriesDrag()){ + if (plot.isSupportSeriesDrag()) { isSeriesDragEnable.setSelected(plot.isSeriesDragEnable()); } } private void populateChartScale(Plot plot) { - if(plot.isSupportZoomCategoryAxis()) { + if (plot.isSupportZoomCategoryAxis()) { isAxisZoom.setSelected(plot.getxAxis() != null && plot.getxAxis().isZoom()); } timeSwitch.setSelected(false); timeSwitch.setEnabled(false); //只有坐标轴为时间坐标轴,并且勾选了图表缩放的时候，才支持时间切换 - if(!plot.isSupportZoomCategoryAxis() || !isAxisZoom.isSelected()){ - return; + if (!plot.isSupportZoomCategoryAxis() || !isAxisZoom.isSelected()) { + return; } - if(plot.getxAxis() ==null && !plot.getxAxis().isDate()){ + if (plot.getxAxis() == null && !plot.getxAxis().isDate()) { return; } timeSwitch.setEnabled(true); - ArrayList timeMap=plot.getxAxis().getTimeSwitchMap(); + ArrayList timeMap = plot.getxAxis().getTimeSwitchMap(); timeSwitch.setSelected(timeMap != null && !timeMap.isEmpty()); - if(timeSwitch.isSelected()){ + if (timeSwitch.isSelected()) { timeSwitchPane.populate(plot); } } private void populateDataTooltip(Plot plot) { - if(plot.isSupportTooltipInInteractivePane()) { + if (plot.isSupportTooltipInInteractivePane()) { AttrContents contents = plot.getHotTooltipStyle(); if (contents == null) { return; @@ -627,12 +629,12 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb } else { tooltipStyle.setSelectedIndex(1); } - if(plot.isSupportValuePercent()) { + if (plot.isSupportValuePercent()) { percentFormat = contents.getPercentFormat(); isDatapointPercent.setSelected(dataLabel.contains(ChartConstants.PERCENT_PARA)); } - if(plot.isSupportAddress4Gis()) { + if (plot.isSupportAddress4Gis()) { isAddressTittle.setSelected(dataLabel.contains(ChartConstants.AREA_TITTLE_PARA)); isAddress.setSelected(dataLabel.contains(ChartConstants.ADDRESS_PARA)); isAddressName.setSelected(dataLabel.contains(ChartConstants.ADDRESS_NAME_PARA)); @@ -649,14 +651,14 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb } private void populateAxisTip(Plot plot) { - if(plot.isSupportAxisTip()) { + if (plot.isSupportAxisTip()) { isAxisShowToolTip.setSelected(plot.isInteractiveAxisTooltip()); } } protected void populateAutoRefresh(Chart chart) { Plot plot = chart.getPlot(); - if(plot.isSupportAutoRefresh()) { + if (plot.isSupportAutoRefresh()) { if (plot.getAutoRefreshPerSecond() < 1) { isAutoRefresh.setSelected(false); autoRefreshTime.setValue(2); @@ -682,9 +684,9 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb List hyperList = new ArrayList(); NameJavaScriptGroup nameGroup = plot.getHotHyperLink(); - for(int i = 0; nameGroup != null && i < nameGroup.size(); i++) { + for (int i = 0; nameGroup != null && i < nameGroup.size(); i++) { NameJavaScript javaScript = nameGroup.getNameHyperlink(i); - if(javaScript != null && javaScript.getJavaScript() != null) { + if (javaScript != null && javaScript.getJavaScript() != null) { JavaScript script = javaScript.getJavaScript(); hyperList.add(new ChartUIMenuNameableCreator(plot.getHyperLinkEditorMap(), javaScript.getName(), script, getUseMap(paneMap, script.getClass()))); } @@ -694,13 +696,13 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb superLink.doLayout(); } - @Override - public void updateBean(Chart chart) { - if (chart == null || chart.getPlot() == null) { - return; - } + @Override + public void updateBean(Chart chart) { + if (chart == null || chart.getPlot() == null) { + return; + } - Plot plot = chart.getPlot(); + Plot plot = chart.getPlot(); updateChartAnimate(chart, plot); updateChartScale(plot); @@ -708,38 +710,38 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb updateAxisTip(plot); updateAutoRefresh(plot); updateHyperlink(plot); - } + } private void updateChartAnimate(Chart chart, Plot plot) { - if(plot.isSupportAnimate()) { + if (plot.isSupportAnimate()) { chart.setJSDraw(isChartAnimation.isSelected()); } - if(plot.isSupportSeriesDrag()){ + if (plot.isSupportSeriesDrag()) { plot.setSeriesDragEnable(isSeriesDragEnable.isSelected()); } } private void updateChartScale(Plot plot) { - if(plot.isSupportZoomCategoryAxis() && plot.getxAxis() != null) { + if (plot.isSupportZoomCategoryAxis() && plot.getxAxis() != null) { plot.getxAxis().setZoom(isAxisZoom.isSelected()); } - if(plot.getxAxis() == null){ + if (plot.getxAxis() == null) { return; } - boolean isNeedTimeSwitch = plot.getxAxis()!=null && plot.getxAxis().isDate(); - boolean isClear = !isNeedTimeSwitch || !timeSwitch.isSelected(); - if(isClear && plot.getxAxis().getTimeSwitchMap() != null){ + boolean isNeedTimeSwitch = plot.getxAxis() != null && plot.getxAxis().isDate(); + boolean isClear = !isNeedTimeSwitch || !timeSwitch.isSelected(); + if (isClear && plot.getxAxis().getTimeSwitchMap() != null) { plot.getxAxis().getTimeSwitchMap().clear(); return; } - if(plot.getxAxis().isDate() && timeSwitch.isSelected()){ + if (plot.getxAxis().isDate() && timeSwitch.isSelected()) { timeSwitchPane.update(plot); } } private void updateDataTooltip(Plot plot) { - if(plot.isSupportTooltipInInteractivePane()) { + if (plot.isSupportTooltipInInteractivePane()) { AttrContents seriesAttrContents = plot.getHotTooltipStyle(); if (seriesAttrContents == null) { seriesAttrContents = new AttrContents(); @@ -747,18 +749,18 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb String contents = plot.isSupportAddress4Gis() ? getGisTooltipContent() : getTooltipContent(plot); seriesAttrContents.setSeriesLabel(contents); - if(tooltipStyle != null){ + if (tooltipStyle != null) { boolean isWhiteBackground = tooltipStyle.getSelectedIndex() == 0; seriesAttrContents.setWhiteBackground(isWhiteBackground); } - if(tooltipShowType != null){ + if (tooltipShowType != null) { boolean isShowMutiSeries = plot.isSupportTooltipSeriesType() && tooltipShowType.getSelectedIndex() == 1; seriesAttrContents.setShowMutiSeries(isShowMutiSeries); } seriesAttrContents.setFormat(valueFormat); - if(plot.isSupportValuePercent()) { + if (plot.isSupportValuePercent()) { if (percentFormat != null) { seriesAttrContents.setPercentFormat(percentFormat); } @@ -786,23 +788,24 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb String contents = StringUtils.EMPTY; contents += ChartConstants.SERIES_PARA + ChartConstants.BREAKLINE_PARA + ChartConstants.CATEGORY_PARA; boolean noPara = true; - if(isDatapointValue.isSelected()){ + if (isDatapointValue.isSelected()) { contents += ChartConstants.BREAKLINE_PARA + ChartConstants.VALUE_PARA; noPara = false; } - if(isAddressTittle.isSelected()){ + if (isAddressTittle.isSelected()) { contents += ChartConstants.BREAKLINE_PARA + ChartConstants.AREA_TITTLE_PARA; noPara = false; } - if(isAddress.isSelected()){ + if (isAddress.isSelected()) { contents += ChartConstants.BREAKLINE_PARA + ChartConstants.ADDRESS_PARA; noPara = false; } - if(isAddressName.isSelected()){ - contents += ChartConstants.BREAKLINE_PARA + ChartConstants.ADDRESS_NAME_PARA;; + if (isAddressName.isSelected()) { + contents += ChartConstants.BREAKLINE_PARA + ChartConstants.ADDRESS_NAME_PARA; + ; noPara = false; } - if(noPara){ + if (noPara) { contents = null; } @@ -816,8 +819,8 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb } private void updateAutoRefresh(Plot plot) { - if(plot.isSupportAutoRefresh()) { - if(isAutoRefresh.isSelected() && autoRefreshTime.getValue() >= 2) { + if (plot.isSupportAutoRefresh()) { + if (isAutoRefresh.isSelected() && autoRefreshTime.getValue() >= 2) { plot.setAutoRefreshPerSecond((int) autoRefreshTime.getValue()); } else { plot.setAutoRefreshPerSecond(0); @@ -831,62 +834,62 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb superLink.resetItemName(); List list = superLink.updateBean(); - for(int i = 0; i < list.size(); i++) { - UIMenuNameableCreator menu = (UIMenuNameableCreator)list.get(i); - NameJavaScript nameJava = new NameJavaScript(menu.getName(), (JavaScript)menu.getObj()); + for (int i = 0; i < list.size(); i++) { + UIMenuNameableCreator menu = (UIMenuNameableCreator) list.get(i); + NameJavaScript nameJava = new NameJavaScript(menu.getName(), (JavaScript) menu.getObj()); nameGroup.addNameHyperlink(nameJava); } plot.setHotHyperLink(nameGroup); } - protected Class getUseMap(HashMap map, Object key) { - if(map.get(key) != null){ - return (Class)map.get(key); + protected Class getUseMap(HashMap map, Object key) { + if (map.get(key) != null) { + return (Class) map.get(key); } //引擎在这边放了个provider。。 Iterator iterator = map.keySet().iterator(); - while (iterator.hasNext()){ - Class clz = (Class)iterator.next(); - if(clz.isAssignableFrom((Class)key)){ - return (Class)map.get(clz); + while (iterator.hasNext()) { + Class clz = (Class) iterator.next(); + if (clz.isAssignableFrom((Class) key)) { + return (Class) map.get(clz); } } return null; - } - - protected List refreshList(HashMap map) { - List list = new ArrayList(); + } + + protected List refreshList(HashMap map) { + List list = new ArrayList(); java.util.HashMap hyperLinkEditorMap = plot.getHyperLinkEditorMap(); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Reportlet"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Reportlet"), new ReportletHyperlink(), getUseMap(map, ReportletHyperlink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Mail"), new EmailJavaScript(), ChartEmailPane.class)); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Web"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Mail"), new EmailJavaScript(), ChartEmailPane.class)); + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Web"), new WebHyperlink(), getUseMap(map, WebHyperlink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Dynamic_Parameters"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Dynamic_Parameters"), new ParameterJavaScript(), getUseMap(map, ParameterJavaScript.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class))); + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Float_Chart"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Float_Chart"), new ChartHyperPoplink(), getUseMap(map, ChartHyperPoplink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Cell"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Cell"), new ChartHyperRelateCellLink(), getUseMap(map, ChartHyperRelateCellLink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Float"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Float"), new ChartHyperRelateFloatLink(), getUseMap(map, ChartHyperRelateFloatLink.class))); - - FormHyperlinkProvider hyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); + + FormHyperlinkProvider hyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Form"), - hyperlink, getUseMap(map, FormHyperlinkProvider.class))); - - return list; - } + hyperlink, getUseMap(map, FormHyperlinkProvider.class))); + + return list; + } private HashMap getPlotHyperMap() { - if(normalMap.isEmpty()) { - FormHyperlinkProvider fp = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); - + if (normalMap.isEmpty()) { + FormHyperlinkProvider fp = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); + normalMap.put(ReportletHyperlink.class, ReportletHyperlinkPane.class); normalMap.put(EmailJavaScript.class, ChartEmailPane.class); normalMap.put(WebHyperlink.class, WebHyperlinkPane.class); @@ -899,33 +902,33 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb normalMap.put(FormHyperlinkProvider.class, FormHyperlinkPane.class); //兼容老的FormHyperlink.class - if(fp != null){ + if (fp != null) { normalMap.put(fp.getClass(), FormHyperlinkPane.class); } } return normalMap; } - - @Override - public Chart updateBean() { - return null; - } + + @Override + public Chart updateBean() { + return null; + } /** - * 给组件登记一个观察者监听事件 - * - * @param listener 观察者监听事件 - */ + * 给组件登记一个观察者监听事件 + * + * @param listener 观察者监听事件 + */ public void registerChangeListener(UIObserverListener listener) { timeSwitch.registerChangeListener(listener); timeSwitchPane.registerChangeListener(listener); } /** - * 组件是否需要响应添加的观察者事件 - * - * @return 如果需要响应观察者事件则返回true，否则返回false - */ + * 组件是否需要响应添加的观察者事件 + * + * @return 如果需要响应观察者事件则返回true，否则返回false + */ public boolean shouldResponseChangeListener() { return true; }