Browse Source

修改属性

feature/big-screen
Qinghui.Liu 4 years ago
parent
commit
d24aee2fa9
  1. 24
      designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java
  2. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java
  3. 32
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRefreshTooltipContentPane.java
  4. 122
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
  5. 3
      designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java
  6. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/label/LabelContentPaneWithCate.java
  7. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/component/label/LabelContentPaneWithCateValue.java
  8. 6
      designer-chart/src/main/java/com/fr/van/chart/designer/component/label/LabelContentPaneWithOutCate.java
  9. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/label/LabelContentPaneWithPercent.java
  10. 28
      designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/RefreshTooltipContentPaneWithOutSeries.java
  11. 12
      designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/TooltipContentPaneWithOutSeries.java
  12. 29
      designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java
  13. 28
      designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelRefreshTooltipContentPane.java
  14. 28
      designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java
  15. 23
      designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java
  16. 16
      designer-chart/src/main/java/com/fr/van/chart/map/designer/style/label/VanChartMapLabelContentPane.java
  17. 40
      designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapRefreshTooltipContentPane.java
  18. 16
      designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipContentPane.java
  19. 19
      designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapTooltipContentPane.java
  20. 17
      designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieLabelContentPane.java
  21. 17
      designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieTooltipContentPane.java
  22. 32
      designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMutiPieRefreshTooltipContentPane.java
  23. 22
      designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterRefreshTooltipContentPane.java
  24. 8
      designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterTooltipContentPane.java
  25. 24
      designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java
  26. 44
      designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureRefreshTooltipContentPane.java
  27. 42
      designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java
  28. 79
      designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTooltipContentPane.java
  29. 73
      designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTootipContentPane.java
  30. 26
      designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java

24
designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java

@ -36,8 +36,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
} }
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane); setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));
seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane); setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
number = new VanChartFormatPaneWithCheckBox(parent, showOnPane) { number = new VanChartFormatPaneWithCheckBox(parent, showOnPane) {
protected String getCheckBoxText() { protected String getCheckBoxText() {
@ -98,8 +98,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
double[] rowSize = {p, p}; double[] rowSize = {p, p};
Component[][] cateAndSeries = new Component[][]{ Component[][] cateAndSeries = new Component[][]{
new Component[]{categoryNameFormatPane, null}, new Component[]{getCategoryNameFormatPane(), null},
new Component[]{seriesNameFormatPane, null} new Component[]{getSeriesNameFormatPane(), null}
}; };
return TableLayoutHelper.createTableLayoutPane(cateAndSeries, rowSize, columnSize); return TableLayoutHelper.createTableLayoutPane(cateAndSeries, rowSize, columnSize);
@ -152,8 +152,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
} }
public boolean isDirty() { public boolean isDirty() {
return categoryNameFormatPane.isDirty() return getCategoryNameFormatPane().isDirty()
|| seriesNameFormatPane.isDirty() || getSeriesNameFormatPane().isDirty()
|| number.isDirty() || number.isDirty()
|| max.isDirty() || max.isDirty()
|| q3.isDirty() || q3.isDirty()
@ -164,8 +164,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
} }
public void setDirty(boolean isDirty) { public void setDirty(boolean isDirty) {
categoryNameFormatPane.setDirty(isDirty); getCategoryNameFormatPane().setDirty(isDirty);
seriesNameFormatPane.setDirty(isDirty); getSeriesNameFormatPane().setDirty(isDirty);
number.setDirty(isDirty); number.setDirty(isDirty);
max.setDirty(isDirty); max.setDirty(isDirty);
q3.setDirty(isDirty); q3.setDirty(isDirty);
@ -180,8 +180,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
} }
protected void populateFormatPane(AttrTooltipContent attrTooltipContent) { protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
categoryNameFormatPane.populate(attrTooltipContent.getCategoryFormat()); getCategoryNameFormatPane().populate(attrTooltipContent.getCategoryFormat());
seriesNameFormatPane.populate(attrTooltipContent.getSeriesFormat()); getSeriesNameFormatPane().populate(attrTooltipContent.getSeriesFormat());
if (attrTooltipContent instanceof AttrBoxTooltipContent) { if (attrTooltipContent instanceof AttrBoxTooltipContent) {
AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent; AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
@ -199,8 +199,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
} }
protected void updateFormatPane(AttrTooltipContent attrTooltipContent) { protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
categoryNameFormatPane.update(attrTooltipContent.getCategoryFormat()); getCategoryNameFormatPane().update(attrTooltipContent.getCategoryFormat());
seriesNameFormatPane.update(attrTooltipContent.getSeriesFormat()); getSeriesNameFormatPane().update(attrTooltipContent.getSeriesFormat());
if (attrTooltipContent instanceof AttrBoxTooltipContent) { if (attrTooltipContent instanceof AttrBoxTooltipContent) {
AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent; AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;

4
designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java

@ -56,7 +56,7 @@ import com.fr.van.chart.scatter.component.label.VanChartScatterPlotLabelPane;
import com.fr.van.chart.structure.desinger.style.VanChartStructureLabelContentPane; import com.fr.van.chart.structure.desinger.style.VanChartStructureLabelContentPane;
import com.fr.van.chart.structure.desinger.style.VanChartStructureRefreshTooltipContentPane; import com.fr.van.chart.structure.desinger.style.VanChartStructureRefreshTooltipContentPane;
import com.fr.van.chart.structure.desinger.style.VanChartStructureTooltipContentPane; import com.fr.van.chart.structure.desinger.style.VanChartStructureTooltipContentPane;
import com.fr.van.chart.wordcloud.designer.style.VanChartWordCloudRefreshTootipContentPane; import com.fr.van.chart.wordcloud.designer.style.VanChartWordCloudRefreshTooltipContentPane;
import com.fr.van.chart.wordcloud.designer.style.VanChartWordCloudTooltipContentPane; import com.fr.van.chart.wordcloud.designer.style.VanChartWordCloudTooltipContentPane;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
@ -182,7 +182,7 @@ public class PlotFactory {
refreshTooltipContentMap.put(VanChartMultiPiePlot.class, VanChartMutiPieRefreshTooltipContentPane.class); refreshTooltipContentMap.put(VanChartMultiPiePlot.class, VanChartMutiPieRefreshTooltipContentPane.class);
refreshTooltipContentMap.put(VanChartTreeMapPlot.class, VanChartMutiPieRefreshTooltipContentPane.class); refreshTooltipContentMap.put(VanChartTreeMapPlot.class, VanChartMutiPieRefreshTooltipContentPane.class);
refreshTooltipContentMap.put(VanChartFunnelPlot.class, VanChartFunnelRefreshTooltipContentPane.class); refreshTooltipContentMap.put(VanChartFunnelPlot.class, VanChartFunnelRefreshTooltipContentPane.class);
refreshTooltipContentMap.put(VanChartWordCloudPlot.class, VanChartWordCloudRefreshTootipContentPane.class); refreshTooltipContentMap.put(VanChartWordCloudPlot.class, VanChartWordCloudRefreshTooltipContentPane.class);
refreshTooltipContentMap.put(VanChartStructurePlot.class, VanChartStructureRefreshTooltipContentPane.class); refreshTooltipContentMap.put(VanChartStructurePlot.class, VanChartStructureRefreshTooltipContentPane.class);
} }

32
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRefreshTooltipContentPane.java

@ -26,37 +26,37 @@ public class VanChartRefreshTooltipContentPane extends VanChartTooltipContentPan
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initFormatPane(parent, showOnPane); super.initFormatPane(parent, showOnPane);
changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane); setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane); setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
} }
@Override @Override
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initRichTextFormatPane(parent, showOnPane); super.initRichTextFormatPane(parent, showOnPane);
richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
} }
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{categoryNameFormatPane,null}, new Component[]{getCategoryNameFormatPane(), null},
new Component[]{seriesNameFormatPane,null}, new Component[]{getSeriesNameFormatPane(), null},
new Component[]{valueFormatPane,null}, new Component[]{getValueFormatPane(), null},
new Component[]{changedValueFormatPane,null}, new Component[]{getChangedValueFormatPane(), null},
new Component[]{percentFormatPane,null}, new Component[]{getPercentFormatPane(), null},
new Component[]{changedPercentFormatPane,null}, new Component[]{getChangedPercentFormatPane(), null},
}; };
} }
protected Component[][] getRichTextComponents() { protected Component[][] getRichTextComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{richTextCategoryNameFormatPane, null}, new Component[]{getRichTextCategoryNameFormatPane(), null},
new Component[]{richTextSeriesNameFormatPane, null}, new Component[]{getRichTextSeriesNameFormatPane(), null},
new Component[]{richTextValueFormatPane, null}, new Component[]{getRichTextValueFormatPane(), null},
new Component[]{richTextChangedValueFormatPane, null}, new Component[]{getRichTextChangedValueFormatPane(), null},
new Component[]{richTextPercentFormatPane, null}, new Component[]{getRichTextPercentFormatPane(), null},
new Component[]{richTextChangedPercentFormatPane, null} new Component[]{getRichTextChangedPercentFormatPane(), null}
}; };
} }

122
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java

@ -51,23 +51,23 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
private static final long serialVersionUID = 8825929000117843641L; private static final long serialVersionUID = 8825929000117843641L;
protected UIButtonGroup<Integer> content; private UIButtonGroup<Integer> content;
protected CategoryNameFormatPaneWithCheckBox categoryNameFormatPane; private CategoryNameFormatPaneWithCheckBox categoryNameFormatPane;
protected SeriesNameFormatPaneWithCheckBox seriesNameFormatPane; private SeriesNameFormatPaneWithCheckBox seriesNameFormatPane;
protected ValueFormatPaneWithCheckBox valueFormatPane; private ValueFormatPaneWithCheckBox valueFormatPane;
protected PercentFormatPaneWithCheckBox percentFormatPane; private PercentFormatPaneWithCheckBox percentFormatPane;
//监控刷新时,自动数据点提示使用 //监控刷新时,自动数据点提示使用
protected ChangedValueFormatPaneWithCheckBox changedValueFormatPane; private ChangedValueFormatPaneWithCheckBox changedValueFormatPane;
protected ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane; private ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane;
protected CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane; private CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane;
protected SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane; private SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane;
protected ValueFormatPaneWithoutCheckBox richTextValueFormatPane; private ValueFormatPaneWithoutCheckBox richTextValueFormatPane;
protected PercentFormatPaneWithoutCheckBox richTextPercentFormatPane; private PercentFormatPaneWithoutCheckBox richTextPercentFormatPane;
protected ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane; private ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane;
protected ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane; private ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane;
private JPanel centerPanel; private JPanel centerPanel;
private JPanel commonPanel; private JPanel commonPanel;
@ -82,6 +82,102 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
private AttrTooltipRichText richText; private AttrTooltipRichText richText;
public CategoryNameFormatPaneWithCheckBox getCategoryNameFormatPane() {
return categoryNameFormatPane;
}
public void setCategoryNameFormatPane(CategoryNameFormatPaneWithCheckBox categoryNameFormatPane) {
this.categoryNameFormatPane = categoryNameFormatPane;
}
public SeriesNameFormatPaneWithCheckBox getSeriesNameFormatPane() {
return seriesNameFormatPane;
}
public void setSeriesNameFormatPane(SeriesNameFormatPaneWithCheckBox seriesNameFormatPane) {
this.seriesNameFormatPane = seriesNameFormatPane;
}
public ValueFormatPaneWithCheckBox getValueFormatPane() {
return valueFormatPane;
}
public void setValueFormatPane(ValueFormatPaneWithCheckBox valueFormatPane) {
this.valueFormatPane = valueFormatPane;
}
public PercentFormatPaneWithCheckBox getPercentFormatPane() {
return percentFormatPane;
}
public void setPercentFormatPane(PercentFormatPaneWithCheckBox percentFormatPane) {
this.percentFormatPane = percentFormatPane;
}
public ChangedValueFormatPaneWithCheckBox getChangedValueFormatPane() {
return changedValueFormatPane;
}
public void setChangedValueFormatPane(ChangedValueFormatPaneWithCheckBox changedValueFormatPane) {
this.changedValueFormatPane = changedValueFormatPane;
}
public ChangedPercentFormatPaneWithCheckBox getChangedPercentFormatPane() {
return changedPercentFormatPane;
}
public void setChangedPercentFormatPane(ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane) {
this.changedPercentFormatPane = changedPercentFormatPane;
}
public CategoryNameFormatPaneWithoutCheckBox getRichTextCategoryNameFormatPane() {
return richTextCategoryNameFormatPane;
}
public void setRichTextCategoryNameFormatPane(CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane) {
this.richTextCategoryNameFormatPane = richTextCategoryNameFormatPane;
}
public SeriesNameFormatPaneWithoutCheckBox getRichTextSeriesNameFormatPane() {
return richTextSeriesNameFormatPane;
}
public void setRichTextSeriesNameFormatPane(SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane) {
this.richTextSeriesNameFormatPane = richTextSeriesNameFormatPane;
}
public ValueFormatPaneWithoutCheckBox getRichTextValueFormatPane() {
return richTextValueFormatPane;
}
public void setRichTextValueFormatPane(ValueFormatPaneWithoutCheckBox richTextValueFormatPane) {
this.richTextValueFormatPane = richTextValueFormatPane;
}
public PercentFormatPaneWithoutCheckBox getRichTextPercentFormatPane() {
return richTextPercentFormatPane;
}
public void setRichTextPercentFormatPane(PercentFormatPaneWithoutCheckBox richTextPercentFormatPane) {
this.richTextPercentFormatPane = richTextPercentFormatPane;
}
public ChangedValueFormatPaneWithoutCheckBox getRichTextChangedValueFormatPane() {
return richTextChangedValueFormatPane;
}
public void setRichTextChangedValueFormatPane(ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane) {
this.richTextChangedValueFormatPane = richTextChangedValueFormatPane;
}
public ChangedPercentFormatPaneWithoutCheckBox getRichTextChangedPercentFormatPane() {
return richTextChangedPercentFormatPane;
}
public void setRichTextChangedPercentFormatPane(ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane) {
this.richTextChangedPercentFormatPane = richTextChangedPercentFormatPane;
}
public VanChartTooltipContentPane(VanChartStylePane parent, JPanel showOnPane){ public VanChartTooltipContentPane(VanChartStylePane parent, JPanel showOnPane){
this.parent = parent; this.parent = parent;
this.showOnPane = showOnPane; this.showOnPane = showOnPane;

3
designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java

@ -1,6 +1,7 @@
package com.fr.van.chart.designer.component.label; package com.fr.van.chart.designer.component.label;
import com.fr.design.i18n.Toolkit;
import com.fr.van.chart.designer.component.VanChartLabelContentPane; import com.fr.van.chart.designer.component.VanChartLabelContentPane;
import com.fr.van.chart.designer.style.VanChartStylePane; import com.fr.van.chart.designer.style.VanChartStylePane;
@ -16,7 +17,7 @@ public class GaugeLabelContentPane extends VanChartLabelContentPane {
} }
protected String getLabelContentTitle() { protected String getLabelContentTitle() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content"); return Toolkit.i18nText("Fine-Design_Chart_Content");
} }
protected JPanel getLabelContentPane(JPanel contentPane) { protected JPanel getLabelContentPane(JPanel contentPane) {

2
designer-chart/src/main/java/com/fr/van/chart/designer/component/label/LabelContentPaneWithCate.java

@ -27,7 +27,7 @@ public class LabelContentPaneWithCate extends GaugeLabelContentPane {
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{categoryNameFormatPane,null}, new Component[]{getCategoryNameFormatPane(),null},
}; };
} }
} }

4
designer-chart/src/main/java/com/fr/van/chart/designer/component/label/LabelContentPaneWithCateValue.java

@ -27,8 +27,8 @@ public class LabelContentPaneWithCateValue extends GaugeLabelContentPane {
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{categoryNameFormatPane,null}, new Component[]{getCategoryNameFormatPane(),null},
new Component[]{valueFormatPane,null}, new Component[]{getValueFormatPane(),null},
}; };
} }
} }

6
designer-chart/src/main/java/com/fr/van/chart/designer/component/label/LabelContentPaneWithOutCate.java

@ -27,9 +27,9 @@ public class LabelContentPaneWithOutCate extends GaugeLabelContentPane {
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{seriesNameFormatPane, null}, new Component[]{getSeriesNameFormatPane(), null},
new Component[]{valueFormatPane, null}, new Component[]{getValueFormatPane(), null},
new Component[]{percentFormatPane, null}, new Component[]{getPercentFormatPane(), null},
}; };
} }
} }

2
designer-chart/src/main/java/com/fr/van/chart/designer/component/label/LabelContentPaneWithPercent.java

@ -26,7 +26,7 @@ public class LabelContentPaneWithPercent extends GaugeLabelContentPane {
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{percentFormatPane, null}, new Component[]{getPercentFormatPane(), null},
}; };
} }
} }

28
designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/RefreshTooltipContentPaneWithOutSeries.java

@ -21,16 +21,16 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initFormatPane(parent, showOnPane); super.initFormatPane(parent, showOnPane);
changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane); setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane); setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
} }
@Override @Override
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initRichTextFormatPane(parent, showOnPane); super.initRichTextFormatPane(parent, showOnPane);
richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
} }
protected double[] getRowSize(double p){ protected double[] getRowSize(double p){
@ -39,21 +39,21 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{categoryNameFormatPane,null}, new Component[]{getCategoryNameFormatPane(),null},
new Component[]{valueFormatPane,null}, new Component[]{getValueFormatPane(),null},
new Component[]{changedValueFormatPane,null}, new Component[]{getChangedValueFormatPane(),null},
new Component[]{percentFormatPane,null}, new Component[]{getPercentFormatPane(),null},
new Component[]{changedPercentFormatPane,null}, new Component[]{getChangedPercentFormatPane(),null},
}; };
} }
protected Component[][] getRichTextComponents() { protected Component[][] getRichTextComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{richTextCategoryNameFormatPane, null}, new Component[]{getRichTextCategoryNameFormatPane(), null},
new Component[]{richTextValueFormatPane, null}, new Component[]{getRichTextValueFormatPane(), null},
new Component[]{richTextChangedValueFormatPane, null}, new Component[]{getRichTextChangedValueFormatPane(), null},
new Component[]{richTextPercentFormatPane, null}, new Component[]{getRichTextPercentFormatPane(), null},
new Component[]{richTextChangedPercentFormatPane, null} new Component[]{getRichTextChangedPercentFormatPane(), null}
}; };
} }
} }

12
designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/TooltipContentPaneWithOutSeries.java

@ -23,17 +23,17 @@ public class TooltipContentPaneWithOutSeries extends VanChartTooltipContentPane
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{categoryNameFormatPane,null}, new Component[]{getCategoryNameFormatPane(),null},
new Component[]{valueFormatPane,null}, new Component[]{getValueFormatPane(),null},
new Component[]{percentFormatPane,null}, new Component[]{getPercentFormatPane(),null},
}; };
} }
protected Component[][] getRichTextComponents() { protected Component[][] getRichTextComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{richTextCategoryNameFormatPane, null}, new Component[]{getRichTextCategoryNameFormatPane(), null},
new Component[]{richTextValueFormatPane, null}, new Component[]{getRichTextValueFormatPane(), null},
new Component[]{richTextPercentFormatPane, null} new Component[]{getRichTextPercentFormatPane(), null}
}; };
} }
} }

29
designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java

@ -29,33 +29,34 @@ public class VanChartFunnelLabelContentPane extends VanChartLabelContentPane {
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{seriesNameFormatPane,null}, new Component[]{getSeriesNameFormatPane(), null},
new Component[]{valueFormatPane,null}, new Component[]{getValueFormatPane(), null},
new Component[]{percentFormatPane,null}, new Component[]{getPercentFormatPane(), null},
}; };
} }
protected Component[][] getRichTextComponents() { protected Component[][] getRichTextComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{richTextSeriesNameFormatPane, null}, new Component[]{getRichTextSeriesNameFormatPane(), null},
new Component[]{richTextValueFormatPane, null}, new Component[]{getRichTextValueFormatPane(), null},
new Component[]{richTextPercentFormatPane, null} new Component[]{getRichTextPercentFormatPane(), null}
}; };
} }
@Override @Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane); setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));
seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane); setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
percentFormatPane = new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane); setPercentFormatPane(new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane));
} }
@Override
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
richTextPercentFormatPane = new FunnelPercentFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextPercentFormatPane(new FunnelPercentFormatPaneWithoutCheckBox(parent, showOnPane));
} }
protected AttrTooltipContent createAttrTooltip() { protected AttrTooltipContent createAttrTooltip() {

28
designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelRefreshTooltipContentPane.java

@ -20,16 +20,16 @@ public class VanChartFunnelRefreshTooltipContentPane extends VanChartFunnelToolt
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initFormatPane(parent, showOnPane); super.initFormatPane(parent, showOnPane);
changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane); setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane); setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
} }
@Override @Override
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initRichTextFormatPane(parent, showOnPane); super.initRichTextFormatPane(parent, showOnPane);
richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
} }
protected double[] getRowSize(double p){ protected double[] getRowSize(double p){
@ -38,21 +38,21 @@ public class VanChartFunnelRefreshTooltipContentPane extends VanChartFunnelToolt
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{seriesNameFormatPane,null}, new Component[]{getSeriesNameFormatPane(), null},
new Component[]{valueFormatPane,null}, new Component[]{getValueFormatPane(), null},
new Component[]{changedValueFormatPane,null}, new Component[]{getChangedValueFormatPane(), null},
new Component[]{percentFormatPane,null}, new Component[]{getPercentFormatPane(), null},
new Component[]{changedPercentFormatPane,null}, new Component[]{getChangedPercentFormatPane(), null},
}; };
} }
protected Component[][] getRichTextComponents() { protected Component[][] getRichTextComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{richTextSeriesNameFormatPane, null}, new Component[]{getRichTextSeriesNameFormatPane(), null},
new Component[]{richTextValueFormatPane, null}, new Component[]{getRichTextValueFormatPane(), null},
new Component[]{richTextChangedValueFormatPane, null}, new Component[]{getRichTextChangedValueFormatPane(), null},
new Component[]{richTextPercentFormatPane, null}, new Component[]{getRichTextPercentFormatPane(), null},
new Component[]{richTextChangedPercentFormatPane, null} new Component[]{getRichTextChangedPercentFormatPane(), null}
}; };
} }
} }

28
designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java

@ -28,34 +28,34 @@ public class VanChartFunnelTooltipContentPane extends VanChartTooltipContentPane
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{seriesNameFormatPane,null}, new Component[]{getSeriesNameFormatPane(), null},
new Component[]{valueFormatPane,null}, new Component[]{getValueFormatPane(), null},
new Component[]{percentFormatPane,null}, new Component[]{getPercentFormatPane(), null},
}; };
} }
protected Component[][] getRichTextComponents() { protected Component[][] getRichTextComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{richTextSeriesNameFormatPane, null}, new Component[]{getRichTextSeriesNameFormatPane(), null},
new Component[]{richTextValueFormatPane, null}, new Component[]{getRichTextValueFormatPane(), null},
new Component[]{richTextPercentFormatPane, null} new Component[]{getRichTextPercentFormatPane(), null}
}; };
} }
@Override @Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane); setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));
seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane); setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
percentFormatPane = new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane); setPercentFormatPane(new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane));
} }
@Override @Override
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
richTextPercentFormatPane = new FunnelPercentFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextPercentFormatPane(new FunnelPercentFormatPaneWithoutCheckBox(parent, showOnPane));
} }
protected AttrTooltipContent createAttrTooltip() { protected AttrTooltipContent createAttrTooltip() {

23
designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java

@ -4,6 +4,7 @@ import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.style.FormatPane; import com.fr.design.gui.style.FormatPane;
import com.fr.design.i18n.Toolkit;
import com.fr.plugin.chart.base.AttrTooltipContent; import com.fr.plugin.chart.base.AttrTooltipContent;
import com.fr.plugin.chart.base.format.AttrTooltipDurationFormat; import com.fr.plugin.chart.base.format.AttrTooltipDurationFormat;
import com.fr.plugin.chart.base.format.AttrTooltipFormat; import com.fr.plugin.chart.base.format.AttrTooltipFormat;
@ -40,27 +41,27 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
processesFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane){ processesFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane){
@Override @Override
protected String getCheckBoxText() { protected String getCheckBoxText() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Project_Name"); return Toolkit.i18nText("Fine-Design_Chart_Project_Name");
} }
}; };
seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane); setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
startTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane){ startTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane){
@Override @Override
protected String getCheckBoxText() { protected String getCheckBoxText() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Time"); return Toolkit.i18nText("Fine-Design_Chart_Start_Time");
} }
}; };
endTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane){ endTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane){
@Override @Override
protected String getCheckBoxText() { protected String getCheckBoxText() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Time"); return Toolkit.i18nText("Fine-Design_Chart_End_Time");
} }
}; };
durationFormatPane = new VanChartFormatComBoxWithCheckBox(); durationFormatPane = new VanChartFormatComBoxWithCheckBox();
progressFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane){ progressFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane){
@Override @Override
protected String getCheckBoxText() { protected String getCheckBoxText() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Process"); return Toolkit.i18nText("Fine-Design_Chart_Process");
} }
}; };
} }
@ -68,7 +69,7 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{processesFormatPane,null}, new Component[]{processesFormatPane,null},
new Component[]{seriesNameFormatPane,null}, new Component[]{getSeriesNameFormatPane(),null},
new Component[]{startTimeFormatPane,null}, new Component[]{startTimeFormatPane,null},
new Component[]{endTimeFormatPane,null}, new Component[]{endTimeFormatPane,null},
new Component[]{durationFormatPane, null}, new Component[]{durationFormatPane, null},
@ -85,7 +86,7 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
if (attrTooltipContent instanceof AttrGanttTooltipContent){ if (attrTooltipContent instanceof AttrGanttTooltipContent){
AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent; AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
processesFormatPane.populate(ganttTooltipContent.getProcessesFormat()); processesFormatPane.populate(ganttTooltipContent.getProcessesFormat());
seriesNameFormatPane.populate(ganttTooltipContent.getSeriesFormat()); getSeriesNameFormatPane().populate(ganttTooltipContent.getSeriesFormat());
startTimeFormatPane.populate(ganttTooltipContent.getStartTimeFormat()); startTimeFormatPane.populate(ganttTooltipContent.getStartTimeFormat());
endTimeFormatPane.populate(ganttTooltipContent.getEndTimeFormat()); endTimeFormatPane.populate(ganttTooltipContent.getEndTimeFormat());
durationFormatPane.populate(ganttTooltipContent.getDurationFormat()); durationFormatPane.populate(ganttTooltipContent.getDurationFormat());
@ -97,7 +98,7 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
if (attrTooltipContent instanceof AttrGanttTooltipContent){ if (attrTooltipContent instanceof AttrGanttTooltipContent){
AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent; AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
processesFormatPane.update(ganttTooltipContent.getProcessesFormat()); processesFormatPane.update(ganttTooltipContent.getProcessesFormat());
seriesNameFormatPane.update(ganttTooltipContent.getSeriesFormat()); getSeriesNameFormatPane().update(ganttTooltipContent.getSeriesFormat());
startTimeFormatPane.update(ganttTooltipContent.getStartTimeFormat()); startTimeFormatPane.update(ganttTooltipContent.getStartTimeFormat());
endTimeFormatPane.update(ganttTooltipContent.getEndTimeFormat()); endTimeFormatPane.update(ganttTooltipContent.getEndTimeFormat());
durationFormatPane.update(ganttTooltipContent.getDurationFormat()); durationFormatPane.update(ganttTooltipContent.getDurationFormat());
@ -107,7 +108,7 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
public boolean isDirty() { public boolean isDirty() {
return processesFormatPane.isDirty() return processesFormatPane.isDirty()
|| seriesNameFormatPane.isDirty() || getSeriesNameFormatPane().isDirty()
|| startTimeFormatPane.isDirty() || startTimeFormatPane.isDirty()
|| endTimeFormatPane.isDirty() || endTimeFormatPane.isDirty()
|| durationFormatPane.isDirty() || durationFormatPane.isDirty()
@ -116,7 +117,7 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
public void setDirty(boolean isDirty) { public void setDirty(boolean isDirty) {
processesFormatPane.setDirty(isDirty); processesFormatPane.setDirty(isDirty);
seriesNameFormatPane.setDirty(isDirty); getSeriesNameFormatPane().setDirty(isDirty);
startTimeFormatPane.setDirty(isDirty); startTimeFormatPane.setDirty(isDirty);
endTimeFormatPane.setDirty(isDirty); endTimeFormatPane.setDirty(isDirty);
durationFormatPane.setDirty(isDirty); durationFormatPane.setDirty(isDirty);
@ -146,7 +147,7 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
private VanChartFormatComBoxWithCheckBox() { private VanChartFormatComBoxWithCheckBox() {
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
isSelectedBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Duration_Time")); isSelectedBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Duration_Time"));
formatComBox = new UIComboBox(IntervalTimeFormat.getFormats()); formatComBox = new UIComboBox(IntervalTimeFormat.getFormats());
isSelectedBox.addMouseListener(new MouseListener() { isSelectedBox.addMouseListener(new MouseListener() {
@Override @Override

16
designer-chart/src/main/java/com/fr/van/chart/map/designer/style/label/VanChartMapLabelContentPane.java

@ -26,18 +26,18 @@ public class VanChartMapLabelContentPane extends VanChartLabelContentPane {
@Override @Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
categoryNameFormatPane = new MapAreaNameFormatPaneWithCheckBox(parent, showOnPane); setCategoryNameFormatPane(new MapAreaNameFormatPaneWithCheckBox(parent, showOnPane));
seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane); setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane); setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
} }
@Override @Override
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
richTextCategoryNameFormatPane = new MapAreaNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextCategoryNameFormatPane(new MapAreaNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
} }
@Override @Override

40
designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapRefreshTooltipContentPane.java

@ -19,45 +19,45 @@ public class VanChartMapRefreshTooltipContentPane extends VanChartMapTooltipCont
super(null, showOnPane); super(null, showOnPane);
} }
protected double[] getRowSize(double p){
return new double[]{p,p,p,p,p,p};
}
@Override @Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initFormatPane(parent, showOnPane); super.initFormatPane(parent, showOnPane);
changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane); setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane); setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
} }
@Override @Override
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initRichTextFormatPane(parent, showOnPane); super.initRichTextFormatPane(parent, showOnPane);
richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
}
protected double[] getRowSize(double p){
return new double[]{p,p,p,p,p,p};
} }
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{categoryNameFormatPane,null}, new Component[]{getCategoryNameFormatPane(), null},
new Component[]{seriesNameFormatPane,null}, new Component[]{getSeriesNameFormatPane(), null},
new Component[]{valueFormatPane,null}, new Component[]{getValueFormatPane(), null},
new Component[]{changedValueFormatPane,null}, new Component[]{getChangedValueFormatPane(), null},
new Component[]{percentFormatPane,null}, new Component[]{getPercentFormatPane(), null},
new Component[]{changedPercentFormatPane,null}, new Component[]{getChangedPercentFormatPane(), null},
}; };
} }
protected Component[][] getRichTextComponents() { protected Component[][] getRichTextComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{richTextCategoryNameFormatPane, null}, new Component[]{getRichTextCategoryNameFormatPane(), null},
new Component[]{richTextSeriesNameFormatPane, null}, new Component[]{getRichTextSeriesNameFormatPane(), null},
new Component[]{richTextValueFormatPane, null}, new Component[]{getRichTextValueFormatPane(), null},
new Component[]{richTextChangedValueFormatPane, null}, new Component[]{getRichTextChangedValueFormatPane(), null},
new Component[]{richTextPercentFormatPane, null}, new Component[]{getRichTextPercentFormatPane(), null},
new Component[]{richTextChangedPercentFormatPane, null} new Component[]{getRichTextChangedPercentFormatPane(), null}
}; };
} }

16
designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipContentPane.java

@ -26,18 +26,18 @@ public class VanChartMapTooltipContentPane extends VanChartTooltipContentPane {
@Override @Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
categoryNameFormatPane = new MapAreaNameFormatPaneWithCheckBox(parent, showOnPane); setCategoryNameFormatPane(new MapAreaNameFormatPaneWithCheckBox(parent, showOnPane));
seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane); setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane); setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
} }
@Override @Override
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
richTextCategoryNameFormatPane = new MapAreaNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextCategoryNameFormatPane(new MapAreaNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
} }
@Override @Override

19
designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapTooltipContentPane.java

@ -4,7 +4,6 @@ import com.fr.plugin.chart.base.AttrTooltipContent;
import com.fr.plugin.chart.base.format.AttrTooltipStartAndEndNameFormat; import com.fr.plugin.chart.base.format.AttrTooltipStartAndEndNameFormat;
import com.fr.plugin.chart.base.format.AttrTooltipValueFormat; import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
import com.fr.van.chart.designer.component.VanChartTooltipContentPane; import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox; import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox; import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox; import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
@ -25,18 +24,18 @@ public class VanChartLineMapTooltipContentPane extends VanChartTooltipContentPan
@Override @Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane){ protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane){
categoryNameFormatPane = new StartAndEndNameFormatPaneWithCheckBox(parent, showOnPane); setCategoryNameFormatPane(new StartAndEndNameFormatPaneWithCheckBox(parent, showOnPane));
seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane); setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane); setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
} }
@Override
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
richTextCategoryNameFormatPane = new StartAndEndNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextCategoryNameFormatPane(new StartAndEndNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
} }
@Override @Override

17
designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieLabelContentPane.java

@ -21,17 +21,18 @@ public class VanChartMultiPieLabelContentPane extends VanChartLabelContentPane {
@Override @Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
categoryNameFormatPane = new MultiPieLevelNameFormatPaneWithCheckBox(parent, showOnPane); setCategoryNameFormatPane(new MultiPieLevelNameFormatPaneWithCheckBox(parent, showOnPane));
seriesNameFormatPane = new MultiPieSeriesNameFormatPaneWithCheckBox(parent, showOnPane); setSeriesNameFormatPane(new MultiPieSeriesNameFormatPaneWithCheckBox(parent, showOnPane));
valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane); setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
} }
@Override
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
richTextCategoryNameFormatPane = new MultiPieLevelNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextCategoryNameFormatPane(new MultiPieLevelNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextSeriesNameFormatPane = new MultiPieSeriesNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextSeriesNameFormatPane(new MultiPieSeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
} }
protected AttrTooltipContent createAttrTooltip() { protected AttrTooltipContent createAttrTooltip() {

17
designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieTooltipContentPane.java

@ -21,17 +21,18 @@ public class VanChartMultiPieTooltipContentPane extends VanChartTooltipContentPa
@Override @Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
categoryNameFormatPane = new MultiPieLevelNameFormatPaneWithCheckBox(parent, showOnPane); setCategoryNameFormatPane(new MultiPieLevelNameFormatPaneWithCheckBox(parent, showOnPane));
seriesNameFormatPane = new MultiPieSeriesNameFormatPaneWithCheckBox(parent, showOnPane); setSeriesNameFormatPane(new MultiPieSeriesNameFormatPaneWithCheckBox(parent, showOnPane));
valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane); setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
} }
@Override
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
richTextCategoryNameFormatPane = new MultiPieLevelNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextCategoryNameFormatPane(new MultiPieLevelNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextSeriesNameFormatPane = new MultiPieSeriesNameFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextSeriesNameFormatPane(new MultiPieSeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
} }
@Override @Override

32
designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMutiPieRefreshTooltipContentPane.java

@ -23,16 +23,16 @@ public class VanChartMutiPieRefreshTooltipContentPane extends VanChartMultiPieTo
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initFormatPane(parent, showOnPane); super.initFormatPane(parent, showOnPane);
changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane); setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane); setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
} }
@Override @Override
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initRichTextFormatPane(parent, showOnPane); super.initRichTextFormatPane(parent, showOnPane);
richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane); setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
} }
protected double[] getRowSize(double p){ protected double[] getRowSize(double p){
@ -41,23 +41,23 @@ public class VanChartMutiPieRefreshTooltipContentPane extends VanChartMultiPieTo
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{categoryNameFormatPane,null}, new Component[]{getCategoryNameFormatPane(), null},
new Component[]{seriesNameFormatPane,null}, new Component[]{getSeriesNameFormatPane(), null},
new Component[]{valueFormatPane,null}, new Component[]{getValueFormatPane(), null},
new Component[]{changedValueFormatPane,null}, new Component[]{getChangedValueFormatPane(), null},
new Component[]{percentFormatPane,null}, new Component[]{getPercentFormatPane(), null},
new Component[]{changedPercentFormatPane,null}, new Component[]{getChangedPercentFormatPane(), null},
}; };
} }
protected Component[][] getRichTextComponents() { protected Component[][] getRichTextComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{richTextCategoryNameFormatPane, null}, new Component[]{getRichTextCategoryNameFormatPane(), null},
new Component[]{richTextSeriesNameFormatPane, null}, new Component[]{getRichTextSeriesNameFormatPane(), null},
new Component[]{richTextValueFormatPane, null}, new Component[]{getRichTextValueFormatPane(), null},
new Component[]{richTextChangedValueFormatPane, null}, new Component[]{getRichTextChangedValueFormatPane(), null},
new Component[]{richTextPercentFormatPane, null}, new Component[]{getRichTextPercentFormatPane(), null},
new Component[]{richTextChangedPercentFormatPane, null} new Component[]{getRichTextChangedPercentFormatPane(), null}
}; };
} }

22
designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterRefreshTooltipContentPane.java

@ -27,14 +27,16 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initFormatPane(parent, showOnPane); super.initFormatPane(parent, showOnPane);
changedSizeFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane); changedSizeFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane); ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
setChangedPercentFormatPane(changedPercentFormatPane);
} }
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initRichTextFormatPane(parent, showOnPane); super.initRichTextFormatPane(parent, showOnPane);
richTextChangedSizeFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane); richTextChangedSizeFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane);
richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane); ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane);
setRichTextChangedPercentFormatPane(richTextChangedPercentFormatPane);
} }
protected double[] getRowSize(double p) { protected double[] getRowSize(double p) {
@ -43,24 +45,24 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
protected Component[][] getPaneComponents() { protected Component[][] getPaneComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{seriesNameFormatPane, null}, new Component[]{getSeriesNameFormatPane(), null},
new Component[]{getXFormatPane(), null}, new Component[]{getXFormatPane(), null},
new Component[]{getYFormatPane(), null}, new Component[]{getYFormatPane(), null},
new Component[]{getSizeFormatPane(), null}, new Component[]{getSizeFormatPane(), null},
new Component[]{changedSizeFormatPane, null}, new Component[]{changedSizeFormatPane, null},
new Component[]{changedPercentFormatPane, null}, new Component[]{getChangedPercentFormatPane(), null},
}; };
} }
@Override @Override
protected Component[][] getRichTextComponents() { protected Component[][] getRichTextComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{richTextSeriesNameFormatPane, null}, new Component[]{getRichTextSeriesNameFormatPane(), null},
new Component[]{getRichTextXFormatPane(), null}, new Component[]{getRichTextXFormatPane(), null},
new Component[]{getRichTextYFormatPane(), null}, new Component[]{getRichTextYFormatPane(), null},
new Component[]{getRichTextSizeFormatPane(), null}, new Component[]{getRichTextSizeFormatPane(), null},
new Component[]{richTextChangedSizeFormatPane, null}, new Component[]{richTextChangedSizeFormatPane, null},
new Component[]{richTextChangedPercentFormatPane, null} new Component[]{getRichTextChangedPercentFormatPane(), null}
}; };
} }
@ -71,7 +73,7 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
if (attrTooltipContent instanceof ScatterAttrTooltipContent) { if (attrTooltipContent instanceof ScatterAttrTooltipContent) {
ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent; ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent;
changedSizeFormatPane.populate(scatterAttrTooltipContent.getChangeSizeFormat()); changedSizeFormatPane.populate(scatterAttrTooltipContent.getChangeSizeFormat());
changedPercentFormatPane.populate(scatterAttrTooltipContent.getChangedSizePercentFormat()); getChangedPercentFormatPane().populate(scatterAttrTooltipContent.getChangedSizePercentFormat());
} }
} }
@ -82,7 +84,7 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
if (attrTooltipContent instanceof ScatterAttrTooltipContent) { if (attrTooltipContent instanceof ScatterAttrTooltipContent) {
ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent; ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent;
changedSizeFormatPane.update(scatterAttrTooltipContent.getChangeSizeFormat()); changedSizeFormatPane.update(scatterAttrTooltipContent.getChangeSizeFormat());
changedPercentFormatPane.update(scatterAttrTooltipContent.getChangedSizePercentFormat()); getChangedPercentFormatPane().update(scatterAttrTooltipContent.getChangedSizePercentFormat());
} }
} }
@ -90,13 +92,13 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
public void setDirty(boolean isDirty) { public void setDirty(boolean isDirty) {
super.setDirty(isDirty); super.setDirty(isDirty);
changedSizeFormatPane.setDirty(isDirty); changedSizeFormatPane.setDirty(isDirty);
changedPercentFormatPane.setDirty(isDirty); getChangedPercentFormatPane().setDirty(isDirty);
} }
@Override @Override
public boolean isDirty() { public boolean isDirty() {
return super.isDirty() || changedSizeFormatPane.isDirty() || changedPercentFormatPane.isDirty(); return super.isDirty() || changedSizeFormatPane.isDirty() || getChangedPercentFormatPane().isDirty();
} }
} }

8
designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterTooltipContentPane.java

@ -76,7 +76,7 @@ public class VanChartScatterTooltipContentPane extends VanChartTooltipContentPa
@Override @Override
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{seriesNameFormatPane,null}, new Component[]{getSeriesNameFormatPane(),null},
new Component[]{xFormatPane,null}, new Component[]{xFormatPane,null},
new Component[]{yFormatPane,null}, new Component[]{yFormatPane,null},
new Component[]{sizeFormatPane,null}, new Component[]{sizeFormatPane,null},
@ -86,7 +86,7 @@ public class VanChartScatterTooltipContentPane extends VanChartTooltipContentPa
@Override @Override
protected Component[][] getRichTextComponents() { protected Component[][] getRichTextComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{richTextSeriesNameFormatPane, null}, new Component[]{getRichTextSeriesNameFormatPane(), null},
new Component[]{richTextXFormatPane, null}, new Component[]{richTextXFormatPane, null},
new Component[]{richTextYFormatPane, null}, new Component[]{richTextYFormatPane, null},
new Component[]{richTextSizeFormatPane, null} new Component[]{richTextSizeFormatPane, null}
@ -120,12 +120,12 @@ public class VanChartScatterTooltipContentPane extends VanChartTooltipContentPa
xFormatPane.setDirty(isDirty); xFormatPane.setDirty(isDirty);
yFormatPane.setDirty(isDirty); yFormatPane.setDirty(isDirty);
sizeFormatPane.setDirty(isDirty); sizeFormatPane.setDirty(isDirty);
seriesNameFormatPane.setDirty(isDirty); getSeriesNameFormatPane().setDirty(isDirty);
} }
@Override @Override
public boolean isDirty() { public boolean isDirty() {
return xFormatPane.isDirty() || yFormatPane.isDirty() || sizeFormatPane.isDirty() || seriesNameFormatPane.isDirty(); return xFormatPane.isDirty() || yFormatPane.isDirty() || sizeFormatPane.isDirty() || getSeriesNameFormatPane().isDirty();
} }
@Override @Override

24
designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java

@ -1,6 +1,7 @@
package com.fr.van.chart.structure.desinger.style; package com.fr.van.chart.structure.desinger.style;
import com.fr.design.i18n.Toolkit;
import com.fr.plugin.chart.base.AttrTooltipContent; import com.fr.plugin.chart.base.AttrTooltipContent;
import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat; import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat;
import com.fr.van.chart.designer.component.VanChartLabelContentPane; import com.fr.van.chart.designer.component.VanChartLabelContentPane;
@ -24,28 +25,33 @@ public class VanChartStructureLabelContentPane extends VanChartLabelContentPane
@Override @Override
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{categoryNameFormatPane,null}, new Component[]{getCategoryNameFormatPane(),null},
new Component[]{seriesNameFormatPane,null}, new Component[]{getSeriesNameFormatPane(),null},
new Component[]{valueFormatPane,null} new Component[]{getValueFormatPane(),null}
}; };
} }
@Override @Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane){ protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane){
categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){ CategoryNameFormatPaneWithCheckBox categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){
@Override @Override
protected String getCheckBoxText() { protected String getCheckBoxText() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name"); return Toolkit.i18nText("Fine-Design_Chart_Node_Name");
} }
}; };
seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){ SeriesNameFormatPaneWithCheckBox seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){
@Override @Override
protected String getCheckBoxText() { protected String getCheckBoxText() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"); return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
} }
}; };
valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); ValueFormatPaneWithCheckBox valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane); PercentFormatPaneWithCheckBox percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
setCategoryNameFormatPane(categoryNameFormatPane);
setSeriesNameFormatPane(seriesNameFormatPane);
setValueFormatPane(valueFormatPane);
setPercentFormatPane(percentFormatPane);
} }
@Override @Override

44
designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureRefreshTooltipContentPane.java

@ -12,7 +12,7 @@ import java.awt.Component;
/** /**
* Created by mengao on 2017/6/9. * Created by mengao on 2017/6/9.
*/ */
public class VanChartStructureRefreshTooltipContentPane extends VanChartStructureTooltipContentPane{ public class VanChartStructureRefreshTooltipContentPane extends VanChartStructureTooltipContentPane {
public VanChartStructureRefreshTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) { public VanChartStructureRefreshTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
super(null, showOnPane); super(null, showOnPane);
} }
@ -21,40 +21,44 @@ public class VanChartStructureRefreshTooltipContentPane extends VanChartStructur
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initFormatPane(parent, showOnPane); super.initFormatPane(parent, showOnPane);
changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane); ChangedValueFormatPaneWithCheckBox changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane); ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
setChangedValueFormatPane(changedValueFormatPane);
setChangedPercentFormatPane(changedPercentFormatPane);
} }
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initRichTextFormatPane(parent, showOnPane); super.initRichTextFormatPane(parent, showOnPane);
richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane); ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane);
richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane); ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane);
setRichTextChangedValueFormatPane(richTextChangedValueFormatPane);
setRichTextChangedPercentFormatPane(richTextChangedPercentFormatPane);
} }
protected double[] getRowSize(double p){ protected double[] getRowSize(double p) {
return new double[]{p,p,p,p,p}; return new double[]{p, p, p, p, p};
} }
@Override protected Component[][] getPaneComponents() {
protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{categoryNameFormatPane,null}, new Component[]{getCategoryNameFormatPane(), null},
new Component[]{seriesNameFormatPane,null}, new Component[]{getSeriesNameFormatPane(), null},
new Component[]{valueFormatPane,null}, new Component[]{getValueFormatPane(), null},
new Component[]{changedValueFormatPane,null}, new Component[]{getChangedValueFormatPane(), null},
new Component[]{changedPercentFormatPane,null}, new Component[]{getChangedPercentFormatPane(), null},
}; };
} }
@Override
protected Component[][] getRichTextComponents() { protected Component[][] getRichTextComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{richTextCategoryNameFormatPane, null}, new Component[]{getRichTextCategoryNameFormatPane(), null},
new Component[]{richTextSeriesNameFormatPane, null}, new Component[]{getRichTextSeriesNameFormatPane(), null},
new Component[]{richTextValueFormatPane, null}, new Component[]{getRichTextValueFormatPane(), null},
new Component[]{richTextChangedValueFormatPane, null}, new Component[]{getRichTextChangedValueFormatPane(), null},
new Component[]{richTextChangedPercentFormatPane, null} new Component[]{getRichTextChangedPercentFormatPane(), null}
}; };
} }
} }

42
designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java

@ -27,54 +27,64 @@ public class VanChartStructureTooltipContentPane extends VanChartTooltipContentP
} }
@Override @Override
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{categoryNameFormatPane,null}, new Component[]{getCategoryNameFormatPane(), null},
new Component[]{seriesNameFormatPane,null}, new Component[]{getSeriesNameFormatPane(), null},
new Component[]{valueFormatPane,null} new Component[]{getValueFormatPane(), null}
}; };
} }
@Override @Override
protected Component[][] getRichTextComponents() { protected Component[][] getRichTextComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{richTextCategoryNameFormatPane, null}, new Component[]{getRichTextCategoryNameFormatPane(), null},
new Component[]{richTextSeriesNameFormatPane, null}, new Component[]{getRichTextSeriesNameFormatPane(), null},
new Component[]{richTextValueFormatPane, null} new Component[]{getRichTextValueFormatPane(), null}
}; };
} }
@Override @Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane){ protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){ CategoryNameFormatPaneWithCheckBox categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane) {
@Override @Override
protected String getCheckBoxText() { protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_Node_Name"); return Toolkit.i18nText("Fine-Design_Chart_Node_Name");
} }
}; };
seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){ SeriesNameFormatPaneWithCheckBox seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane) {
@Override @Override
protected String getCheckBoxText() { protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"); return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
} }
}; };
valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); ValueFormatPaneWithCheckBox valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane); PercentFormatPaneWithCheckBox percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
setCategoryNameFormatPane(categoryNameFormatPane);
setSeriesNameFormatPane(seriesNameFormatPane);
setValueFormatPane(valueFormatPane);
setPercentFormatPane(percentFormatPane);
} }
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane) { CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane) {
protected String getCheckBoxText() { protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_Node_Name"); return Toolkit.i18nText("Fine-Design_Chart_Node_Name");
} }
}; };
richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane) { SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane) {
protected String getCheckBoxText() { protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"); return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
} }
}; };
richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane); ValueFormatPaneWithoutCheckBox richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane);
richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane); PercentFormatPaneWithoutCheckBox richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane);
setRichTextCategoryNameFormatPane(richTextCategoryNameFormatPane);
setRichTextSeriesNameFormatPane(richTextSeriesNameFormatPane);
setRichTextValueFormatPane(richTextValueFormatPane);
setRichTextPercentFormatPane(richTextPercentFormatPane);
} }
@Override @Override

79
designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTooltipContentPane.java

@ -0,0 +1,79 @@
package com.fr.van.chart.wordcloud.designer.style;
import com.fr.design.i18n.Toolkit;
import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
import com.fr.van.chart.designer.style.VanChartStylePane;
import javax.swing.JPanel;
import java.awt.Component;
/**
* Created by mengao on 2017/6/9.
*/
public class VanChartWordCloudRefreshTooltipContentPane extends VanChartWordCloudTooltipContentPane {
public VanChartWordCloudRefreshTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
super(null, showOnPane);
}
@Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initFormatPane(parent, showOnPane);
ChangedValueFormatPaneWithCheckBox changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane) {
@Override
protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_Change_Word_Value");
}
};
ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
setChangedValueFormatPane(changedValueFormatPane);
setChangedPercentFormatPane(changedPercentFormatPane);
}
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initRichTextFormatPane(parent, showOnPane);
ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane) {
protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_Change_Word_Value");
}
};
ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane);
setRichTextChangedValueFormatPane(richTextChangedValueFormatPane);
setRichTextChangedPercentFormatPane(richTextChangedPercentFormatPane);
}
protected double[] getRowSize(double p) {
return new double[]{p, p, p, p, p, p};
}
protected Component[][] getPaneComponents() {
return new Component[][]{
new Component[]{getCategoryNameFormatPane(), null},
new Component[]{getSeriesNameFormatPane(), null},
new Component[]{getValueFormatPane(), null},
new Component[]{getChangedValueFormatPane(), null},
new Component[]{getPercentFormatPane(), null},
new Component[]{getChangedPercentFormatPane(), null},
};
}
protected Component[][] getRichTextComponents() {
return new Component[][]{
new Component[]{getRichTextCategoryNameFormatPane(), null},
new Component[]{getRichTextSeriesNameFormatPane(), null},
new Component[]{getRichTextValueFormatPane(), null},
new Component[]{getRichTextChangedValueFormatPane(), null},
new Component[]{getRichTextPercentFormatPane(), null},
new Component[]{getRichTextChangedPercentFormatPane(), null}
};
}
}

73
designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTootipContentPane.java

@ -1,73 +0,0 @@
package com.fr.van.chart.wordcloud.designer.style;
import com.fr.design.i18n.Toolkit;
import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
import com.fr.van.chart.designer.style.VanChartStylePane;
import javax.swing.JPanel;
import java.awt.Component;
/**
* Created by mengao on 2017/6/9.
*/
public class VanChartWordCloudRefreshTootipContentPane extends VanChartWordCloudTooltipContentPane {
public VanChartWordCloudRefreshTootipContentPane(VanChartStylePane parent, JPanel showOnPane) {
super(null, showOnPane);
}
@Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initFormatPane(parent, showOnPane);
changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane){
@Override
protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_Change_Word_Value");
}
};
changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
}
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
super.initRichTextFormatPane(parent, showOnPane);
richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane) {
protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_Change_Word_Value");
}
};
richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane);
}
protected double[] getRowSize(double p){
return new double[]{p,p,p,p,p,p};
}
protected Component[][] getPaneComponents(){
return new Component[][]{
new Component[]{categoryNameFormatPane,null},
new Component[]{seriesNameFormatPane,null},
new Component[]{valueFormatPane,null},
new Component[]{changedValueFormatPane,null},
new Component[]{percentFormatPane,null},
new Component[]{changedPercentFormatPane,null},
};
}
protected Component[][] getRichTextComponents() {
return new Component[][]{
new Component[]{richTextCategoryNameFormatPane, null},
new Component[]{richTextSeriesNameFormatPane, null},
new Component[]{richTextValueFormatPane, null},
new Component[]{richTextChangedValueFormatPane, null},
new Component[]{richTextPercentFormatPane, null},
new Component[]{richTextChangedPercentFormatPane, null}
};
}
}

26
designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java

@ -27,44 +27,54 @@ public class VanChartWordCloudTooltipContentPane extends VanChartTooltipContentP
@Override @Override
protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){ CategoryNameFormatPaneWithCheckBox categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane) {
@Override @Override
protected String getCheckBoxText() { protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"); return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
} }
}; };
seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){ SeriesNameFormatPaneWithCheckBox seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane) {
@Override @Override
protected String getCheckBoxText() { protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_Word_Name"); return Toolkit.i18nText("Fine-Design_Chart_Word_Name");
} }
}; };
valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane){ ValueFormatPaneWithCheckBox valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane) {
@Override @Override
protected String getCheckBoxText() { protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_Word_Value"); return Toolkit.i18nText("Fine-Design_Chart_Word_Value");
} }
}; };
percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane); PercentFormatPaneWithCheckBox percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
setCategoryNameFormatPane(categoryNameFormatPane);
setSeriesNameFormatPane(seriesNameFormatPane);
setValueFormatPane(valueFormatPane);
setPercentFormatPane(percentFormatPane);
} }
protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) { protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane){ CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane) {
protected String getCheckBoxText() { protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"); return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
} }
}; };
richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane){ SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane) {
protected String getCheckBoxText() { protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_Word_Name"); return Toolkit.i18nText("Fine-Design_Chart_Word_Name");
} }
}; };
richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane){ ValueFormatPaneWithoutCheckBox richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane) {
protected String getCheckBoxText() { protected String getCheckBoxText() {
return Toolkit.i18nText("Fine-Design_Chart_Word_Value"); return Toolkit.i18nText("Fine-Design_Chart_Word_Value");
} }
}; };
richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane); PercentFormatPaneWithoutCheckBox richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane);
setRichTextCategoryNameFormatPane(richTextCategoryNameFormatPane);
setRichTextSeriesNameFormatPane(richTextSeriesNameFormatPane);
setRichTextValueFormatPane(richTextValueFormatPane);
setRichTextPercentFormatPane(richTextPercentFormatPane);
} }
@Override @Override

Loading…
Cancel
Save