Browse Source

重构调整

research/10.0
Wim.Zhai 6 years ago
parent
commit
32b09725d1
  1. 2
      designer-base/src/main/java/com/fr/design/style/BorderPane.java
  2. 8
      designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java
  3. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java
  4. 4
      designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java
  5. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java
  6. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java
  7. 10
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java
  8. 6
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
  9. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java
  10. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
  11. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java
  12. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java
  13. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java
  14. 2
      designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java
  15. 2
      designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java
  16. 2
      designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java
  17. 2
      designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java

2
designer-base/src/main/java/com/fr/design/style/BorderPane.java

@ -108,7 +108,7 @@ public class BorderPane extends BasicPane {
// current color and current style excepting inside borders // current color and current style excepting inside borders
borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("External"))); borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("External")));
borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Inside"))); borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Inner")));
// Control // Control
JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();

8
designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java

@ -35,10 +35,10 @@ public class FontSizeStylePane extends JPanel {
fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Font_Size"), null)); fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Font_Size"), null));
String[] styles = { String[] styles = {
com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Plain"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Italic"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")}; com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold_Italic")};
styleField = new UITextField(); styleField = new UITextField();
styleField.setEditable(false); styleField.setEditable(false);

2
designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java

@ -45,7 +45,7 @@ public class MapCubeDataPane extends UIComboBoxPane<TopDefinitionProvider> {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("LayerData"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Data");
} }
/** /**

4
designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java

@ -122,7 +122,7 @@ public class MapImageEditPane extends BasicBeanPane<String> {
UIScrollPane pane = new UIScrollPane(recordTable); UIScrollPane pane = new UIScrollPane(recordTable);
pane.setPreferredSize(new Dimension(150, 320)); pane.setPreferredSize(new Dimension(150, 320));
pane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "WF-Name"}))); pane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Filed_Name")));
this.add(pane, BorderLayout.EAST); this.add(pane, BorderLayout.EAST);
} }
@ -480,7 +480,7 @@ public class MapImageEditPane extends BasicBeanPane<String> {
}); });
bg.setSize(NAME_EDIT_PANE_WIDTH, NAME_EDIT_PANE_HEIGHT); bg.setSize(NAME_EDIT_PANE_WIDTH, NAME_EDIT_PANE_HEIGHT);
bg.setLocation((int) (e.getLocationOnScreen().getX()) + LOCATIONOFFSET, (int) e.getLocationOnScreen().getY()); bg.setLocation((int) (e.getLocationOnScreen().getX()) + LOCATIONOFFSET, (int) e.getLocationOnScreen().getY());
bg.setTitle(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Filed", "WF-Name"})); bg.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Filed_Name_Edit"));
bg.setVisible(true); bg.setVisible(true);
} }

4
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java

@ -53,8 +53,8 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
JPanel namePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel namePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
pane.add(namePane); pane.add(namePane);
namePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_TrendLine" , "WF-Name"}), null)); namePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trendline_Name"), null));
namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Define", "WF-Name"}))); namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Define_Name")));
namePane.add(nameLabel = new UITextField("", 6)); namePane.add(nameLabel = new UITextField("", 6));
pane.add(linePane = new BorderAttriPane()); pane.add(linePane = new BorderAttriPane());

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java

@ -25,7 +25,7 @@ public class DataLabelContentsPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return "Label"; return "Fine-Design_Chart_Label";
} }
/** /**

10
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java

@ -40,10 +40,10 @@ public class DataLabelStylePane extends BasicPane {
nameBox.setPreferredSize(new Dimension(80, 20)); nameBox.setPreferredSize(new Dimension(80, 20));
String[] styles = { String[] styles = {
com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Plain"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Italic"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")}; com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold_Italic")};
this.add(fontStyleBox = new UIComboBox(styles)); this.add(fontStyleBox = new UIComboBox(styles));
fontStyleBox.setPreferredSize(new Dimension(80, 20)); fontStyleBox.setPreferredSize(new Dimension(80, 20));
@ -66,7 +66,7 @@ public class DataLabelStylePane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return "Label"; return "Fine-Design_Chart_Label";
} }
public void populate(AttrContents seriesAttrContents) { public void populate(AttrContents seriesAttrContents) {

6
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java

@ -69,7 +69,7 @@ public class DataLabelPane extends TooltipContentsPane {
protected Component[] createComponents4ShowSeriesName() { protected Component[] createComponents4ShowSeriesName() {
if (showSeriesNameCB == null) { if (showSeriesNameCB == null) {
showSeriesNameCB = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF-Series", "WF-Name"})); showSeriesNameCB = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
} }
return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Include"}) + ":"), showSeriesNameCB}; return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Include"}) + ":"), showSeriesNameCB};
} }
@ -82,7 +82,7 @@ public class DataLabelPane extends TooltipContentsPane {
} }
protected String getCategoryString(){ protected String getCategoryString(){
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"StyleFormat-Category", "WF-Name"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Format_Category_Name");
} }
@ -105,7 +105,7 @@ public class DataLabelPane extends TooltipContentsPane {
JPanel labelStylePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel labelStylePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
JPanel westPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); JPanel westPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
labelStylePane.add(westPane, BorderLayout.WEST); labelStylePane.add(westPane, BorderLayout.WEST);
westPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "FRFont"}) + ":")); westPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Font") + ":"));
labelStylePane.add(stylePane = new DataLabelStylePane(), BorderLayout.CENTER); labelStylePane.add(stylePane = new DataLabelStylePane(), BorderLayout.CENTER);
return labelStylePane; return labelStylePane;
} }

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java

@ -38,7 +38,7 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa
com.fr.design.i18n.Toolkit.i18nText("Bubble-Series_Name"), com.fr.design.i18n.Toolkit.i18nText("Bubble-Series_Name"),
com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"),
com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-Size") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Size")
}; };
} }

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java

@ -33,7 +33,7 @@ public class ChartAxisLineStylePane extends BasicPane{
axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS); axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS);
axisLineColor = new ColorSelectBox(100); axisLineColor = new ColorSelectBox(100);
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None")}; String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Inner"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None")};
Integer[] valueArray = {Constants.TICK_MARK_OUTSIDE, Constants.TICK_MARK_INSIDE, Constants.TICK_MARK_CROSS, Constants.TICK_MARK_NONE}; Integer[] valueArray = {Constants.TICK_MARK_OUTSIDE, Constants.TICK_MARK_INSIDE, Constants.TICK_MARK_CROSS, Constants.TICK_MARK_NONE};
Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/external.png"), Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/external.png"),
BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/inside.png"), BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/inside.png"),

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java

@ -87,12 +87,12 @@ public class ChartLabelFontPane extends BasicScrollPane<Chart> {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Label"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label");
} }
private class ContentPane extends JPanel { private class ContentPane extends JPanel {
private UILabel value = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value")); private UILabel value = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value"));
private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units")); private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units"));
public ContentPane() { public ContentPane() {
this.initComponents(); this.initComponents();

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java

@ -78,7 +78,7 @@ public class ChartLegendPane extends BasicScrollPane<Chart>{
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{null,textAttrPane}, new Component[]{null,textAttrPane},
new Component[]{new JSeparator(),null}, new Component[]{new JSeparator(),null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Layout")),location} , new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")),location} ,
new Component[]{new JSeparator(),null}, new Component[]{new JSeparator(),null},
new Component[]{borderPane,null}, new Component[]{borderPane,null},
new Component[]{backgroundPane,null} new Component[]{backgroundPane,null}

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java

@ -78,7 +78,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane {
JPanel orderPane = TableLayoutHelper.createTableLayoutPane(tmpComponent, rowSize, columnSize); JPanel orderPane = TableLayoutHelper.createTableLayoutPane(tmpComponent, rowSize, columnSize);
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Needle_Max_Range") + ":", SwingUtilities.LEFT), angleMax}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Needle_Max_Range") + ":", SwingUtilities.LEFT), angleMax},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units") + ":", SwingUtilities.LEFT), unit}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units") + ":", SwingUtilities.LEFT), unit},
new Component[]{new JSeparator(), null}, new Component[]{new JSeparator(), null},
new Component[]{orderPane, null}, new Component[]{orderPane, null},
new Component[]{colorPickerPane, null}, new Component[]{colorPickerPane, null},
@ -90,7 +90,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane {
return components; return components;
} else { } else {
components = new Component[][]{ components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units") + ":", SwingUtilities.LEFT), unit}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units") + ":", SwingUtilities.LEFT), unit},
new Component[]{new JSeparator(), null}, new Component[]{new JSeparator(), null},
new Component[]{orderPane, null}, new Component[]{orderPane, null},
new Component[]{colorPickerPane, null}, new Component[]{colorPickerPane, null},

2
designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java

@ -72,7 +72,7 @@ public class ChartPreStyleAction extends UpdateAction {
@Override @Override
public String getMenuName() { public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Menu-Server_Chart_PreStyle"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Server_PreStyle");
} }
@Override @Override

2
designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java

@ -26,7 +26,7 @@ public class ReportFontBoldAction extends AbstractStyleAction implements ToggleB
public ReportFontBoldAction(ElementCasePane t) { public ReportFontBoldAction(ElementCasePane t) {
super(t); super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("FRFont-bold")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold"));
this.setSmallIcon(ICONS, true); this.setSmallIcon(ICONS, true);
} }

2
designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java

@ -27,7 +27,7 @@ public class ReportFontSizeAction extends AbstractStyleAction {
public ReportFontSizeAction(ElementCasePane t) { public ReportFontSizeAction(ElementCasePane t) {
super(t); super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("FRFont-Size")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Size"));
} }
/** /**

2
designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java

@ -238,7 +238,7 @@ public class HFAttributesEditDialog extends BasicPane {
} }
private void addReportFontPaneToTab() { private void addReportFontPaneToTab() {
this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FRFont"), this.frFontPane); this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font"), this.frFontPane);
} }
private void addFormatPaneToTab() { private void addFormatPaneToTab() {

Loading…
Cancel
Save