Browse Source

Merge branch 'release/9.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design into release/9.0

master
hzzz 7 years ago
parent
commit
6def124359
  1. 4
      designer/src/com/fr/design/actions/insert/cell/FormulaCellAction.java
  2. 11
      designer/src/com/fr/design/actions/insert/flot/FormulaFloatAction.java
  3. 10
      designer/src/com/fr/design/cell/editor/FormulaCellEditor.java
  4. 10
      designer/src/com/fr/design/cell/editor/FormulaFloatEditor.java
  5. 29
      designer/src/com/fr/design/cell/editor/RichTextToolBar.java
  6. 10
      designer/src/com/fr/design/dscolumn/DSColumnAdvancedPane.java
  7. 6
      designer/src/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java
  8. 16
      designer/src/com/fr/design/headerfooter/HFAttributesEditDialog.java
  9. 2
      designer/src/com/fr/design/mainframe/ElementCasePane.java
  10. 2
      designer/src/com/fr/design/module/DesignerModule.java
  11. 6
      designer/src/com/fr/design/report/RichTextEditingPane.java
  12. 29
      designer/src/com/fr/design/report/RichTextPane.java
  13. 6
      designer/src/com/fr/design/report/ValueVerifierEditPane.java
  14. 37
      designer/src/com/fr/design/widget/CellWidgetCardPane.java
  15. 63
      designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
  16. 4
      designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
  17. 19
      designer/src/com/fr/grid/GridUI.java
  18. 22
      designer/src/com/fr/grid/IntelliElements.java
  19. 18
      designer/src/com/fr/grid/selection/CellSelection.java
  20. 13
      designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
  21. 12
      designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java
  22. 8
      designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java
  23. 8
      designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java
  24. 42
      designer_base/src/com/fr/design/DesignerEnvManager.java
  25. 25
      designer_base/src/com/fr/design/actions/core/ActionFactory.java
  26. 37
      designer_base/src/com/fr/design/actions/file/PreferencePane.java
  27. 10
      designer_base/src/com/fr/design/condition/LiteConditionPane.java
  28. 239
      designer_base/src/com/fr/design/data/datapane/ChoosePaneSupportFormula.java
  29. 10
      designer_base/src/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java
  30. 4
      designer_base/src/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
  31. 28
      designer_base/src/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java
  32. 30
      designer_base/src/com/fr/design/dialog/AttrScrollPane.java
  33. 15
      designer_base/src/com/fr/design/dialog/BasicScrollPane.java
  34. 17
      designer_base/src/com/fr/design/editor/DoubleDeckValueEditorPane.java
  35. 17
      designer_base/src/com/fr/design/editor/ValueEditorPane.java
  36. 6
      designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java
  37. 8
      designer_base/src/com/fr/design/editor/editor/ConstantsEditor.java
  38. 31
      designer_base/src/com/fr/design/editor/editor/FormulaEditor.java
  39. 41
      designer_base/src/com/fr/design/formula/FormulaPane.java
  40. 8
      designer_base/src/com/fr/design/formula/FormulaPaneWhenReserveFormula.java
  41. 7
      designer_base/src/com/fr/design/formula/SortFormulaPane.java
  42. 11
      designer_base/src/com/fr/design/formula/TinyFormulaPane.java
  43. 8
      designer_base/src/com/fr/design/formula/UIFormula.java
  44. 28
      designer_base/src/com/fr/design/gui/frpane/JTreeAutoBuildPane.java
  45. 5
      designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java
  46. 2
      designer_base/src/com/fr/design/gui/ispinner/UISpinner.java
  47. 38
      designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
  48. 30
      designer_base/src/com/fr/design/mainframe/widget/accessibles/AccessibleDictionaryEditor.java
  49. 35
      designer_base/src/com/fr/design/parameter/ParameterInputPane.java
  50. 4
      designer_base/src/com/fr/design/present/dict/DatabaseDictPane.java
  51. 10
      designer_base/src/com/fr/design/present/dict/FormulaDictPane.java
  52. 4
      designer_base/src/com/fr/design/present/dict/TableDataDictPane.java
  53. 11
      designer_base/src/com/fr/design/widget/component/DateValuePane.java
  54. 5
      designer_base/src/com/fr/design/widget/component/NumberEditorValidatePane.java
  55. 64
      designer_base/src/com/fr/design/write/submit/DBManipulationPane.java
  56. 78
      designer_base/src/com/fr/start/BaseDesigner.java
  57. 6
      designer_chart/src/com/fr/design/chart/ChartSwingUtils.java
  58. 8
      designer_chart/src/com/fr/design/chart/axis/ChartAlertValuePane.java
  59. 14
      designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java
  60. 30
      designer_chart/src/com/fr/design/chart/report/GisMapReportDataContentPane.java
  61. 26
      designer_chart/src/com/fr/design/chart/report/MapMoreReportIndexPane.java
  62. 33
      designer_chart/src/com/fr/design/chart/report/MapReportDataSinglePane.java
  63. 6
      designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java
  64. 4
      designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java
  65. 4
      designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java
  66. 4
      designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
  67. 25
      designer_chart/src/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java
  68. 38
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java
  69. 6
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartAxisTitlePane.java
  70. 23
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
  71. 6
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
  72. 24
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java
  73. 24
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java
  74. 14
      designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java
  75. 8
      designer_chart/src/com/fr/plugin/chart/designer/style/VanChartTitlePane.java
  76. 12
      designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java
  77. 16
      designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartTimeAxisPane.java
  78. 6
      designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartValueAxisPane.java
  79. 6
      designer_chart/src/com/fr/plugin/chart/designer/style/axis/component/MinMaxValuePaneWithOutTick.java
  80. 13
      designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartAlertValuePane.java
  81. 6
      designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java
  82. 5
      designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java
  83. 12
      designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java
  84. 1
      designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java
  85. 4
      designer_form/src/com/fr/design/gui/xpane/JTreeAutoBuildPane.java
  86. 36
      designer_form/src/com/fr/design/gui/xtable/TableUtils.java
  87. 4
      designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleFormulaEditor.java
  88. 15
      designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
  89. 8
      designer_form/src/com/fr/design/mainframe/widget/wrappers/FormulaWrapper.java
  90. 2
      designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
  91. 18
      designer_form/src/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java
  92. 73
      designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
  93. 4
      designer_form/src/com/fr/design/widget/ui/designer/DirectWriteEditorDefinePane.java
  94. 9
      designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java
  95. 4
      designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java
  96. 7
      designer_form/src/com/fr/design/widget/ui/designer/MultiFileEditorPane.java
  97. 4
      designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java
  98. 4
      designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java
  99. 4
      designer_form/src/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java
  100. 38
      designer_form/src/com/fr/design/widget/ui/designer/component/FontSizeComboPane.java
  101. Some files were not shown because too many files have changed in this diff Show More

4
designer/src/com/fr/design/actions/insert/cell/FormulaCellAction.java

@ -3,8 +3,8 @@
*/
package com.fr.design.actions.insert.cell;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.Formula;
import com.fr.design.actions.core.WorkBookSupportable;
import com.fr.design.mainframe.ElementCasePane;
import com.fr.design.menu.MenuKeySet;
@ -48,6 +48,6 @@ public class FormulaCellAction extends AbstractCellAction implements WorkBookSup
@Override
public Class getCellValueClass() {
return Formula.class;
return BaseFormula.class;
}
}

11
designer/src/com/fr/design/actions/insert/flot/FormulaFloatAction.java

@ -3,9 +3,9 @@
*/
package com.fr.design.actions.insert.flot;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.DynamicUnitList;
import com.fr.base.Formula;
import com.fr.design.actions.ElementCaseAction;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
@ -15,22 +15,15 @@ import com.fr.design.formula.UIFormula;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.ElementCasePane;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.report.SelectImagePane;
import com.fr.general.Inter;
import com.fr.grid.Grid;
import com.fr.grid.selection.FloatSelection;
import com.fr.report.ReportHelper;
import com.fr.report.cell.FloatElement;
import com.fr.report.cell.cellattr.CellImage;
import com.fr.report.elementcase.TemplateElementCase;
import com.fr.stable.CoreGraphHelper;
import com.fr.stable.StringUtils;
import com.fr.stable.unit.FU;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.io.File;
/**
* Insert formula.
@ -108,7 +101,7 @@ public class FormulaFloatAction extends ElementCaseAction {
reportPane.stopEditing();
final FloatElement floatElement = new FloatElement();
final UIFormula formulaPane = FormulaFactory.createFormulaPane();
formulaPane.populate(new Formula(StringUtils.EMPTY));
formulaPane.populate(BaseFormula.createFormulaBuilder().build());
BasicDialog dialog = formulaPane.showLargeWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {

10
designer/src/com/fr/design/cell/editor/FormulaCellEditor.java

@ -3,7 +3,7 @@
*/
package com.fr.design.cell.editor;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.formula.FormulaFactory;
import com.fr.design.formula.UIFormula;
@ -34,7 +34,7 @@ public class FormulaCellEditor extends com.fr.design.cell.editor.AbstractCellEdi
*/
@Override
public Object getCellEditorValue() throws Exception {
Formula newFormula = this.formulaEditorPane.update();
BaseFormula newFormula = this.formulaEditorPane.update();
if (newFormula.getContent() != null && newFormula.getContent().trim().length() > 1) {
return newFormula;
} else {
@ -64,13 +64,13 @@ public class FormulaCellEditor extends com.fr.design.cell.editor.AbstractCellEdi
if (cellElement != null) {
value = cellElement.getValue();
}
if (value == null || !(value instanceof Formula)) {
value = new Formula("");
if (value == null || !(value instanceof BaseFormula)) {
value = BaseFormula.createFormulaBuilder().build();
}
this.formulaEditorPane = FormulaFactory.createFormulaPaneWhenReserveFormula();
this.formulaEditorPane.populate((Formula) value);
this.formulaEditorPane.populate((BaseFormula) value);
return this.formulaEditorPane.showLargeWindow(SwingUtilities.getWindowAncestor(grid), new DialogActionAdapter() {
@Override

10
designer/src/com/fr/design/cell/editor/FormulaFloatEditor.java

@ -3,7 +3,7 @@
*/
package com.fr.design.cell.editor;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.formula.FormulaFactory;
import com.fr.design.formula.UIFormula;
@ -31,7 +31,7 @@ public class FormulaFloatEditor extends AbstractFloatEditor {
*/
@Override
public Object getFloatEditorValue() throws Exception {
Formula newFormula = this.formulaEditorPane.update();
BaseFormula newFormula = this.formulaEditorPane.update();
if (newFormula.getContent() != null && newFormula.getContent().trim().length() > 1) {
return newFormula;
} else {
@ -59,12 +59,12 @@ public class FormulaFloatEditor extends AbstractFloatEditor {
public Component getFloatEditorComponent(Grid grid, FloatElement floatElement, int resolution) {
//populate data to UI
Object value = floatElement.getValue();
if (value == null || !(value instanceof com.fr.base.Formula)) {
value = new Formula("");
if (value == null || !(value instanceof BaseFormula)) {
value = BaseFormula.createFormulaBuilder().build();
}
this.formulaEditorPane = FormulaFactory.createFormulaPane();
this.formulaEditorPane.populate((Formula) value);
this.formulaEditorPane.populate((BaseFormula) value);
return this.formulaEditorPane.showLargeWindow(SwingUtilities.getWindowAncestor(grid), new DialogActionAdapter() {

29
designer/src/com/fr/design/cell/editor/RichTextToolBar.java

@ -3,9 +3,9 @@
*/
package com.fr.design.cell.editor;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.FRContext;
import com.fr.base.Formula;
import com.fr.base.Utils;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
@ -27,10 +27,27 @@ import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.text.*;
import javax.swing.event.CaretEvent;
import javax.swing.event.CaretListener;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
import javax.swing.text.Element;
import javax.swing.text.MutableAttributeSet;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
import javax.swing.text.StyledDocument;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.math.BigDecimal;
/**
@ -311,12 +328,12 @@ public class RichTextToolBar extends BasicPane{
private ActionListener formulaActionListener = new ActionListener() {
public void actionPerformed(ActionEvent evt) {
final UIFormula formulaPane = FormulaFactory.createFormulaPane();
formulaPane.populate(new Formula());
formulaPane.populate(BaseFormula.createFormulaBuilder().build());
formulaPane.showLargeWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
@Override
public void doOk() {
StyledDocument doc = (StyledDocument) textPane.getDocument();
Formula fm = formulaPane.update();
BaseFormula fm = formulaPane.update();
String content = RichTextConverter.asFormula(fm.getContent());
int start = textPane.getSelectionStart();
AttributeSet attrs = start > 0 ? doc.getCharacterElement(start - 1).getAttributes() : new SimpleAttributeSet();

10
designer/src/com/fr/design/dscolumn/DSColumnAdvancedPane.java

@ -1,6 +1,6 @@
package com.fr.design.dscolumn;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.data.util.SortOrder;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.dialog.BasicPane;
@ -31,7 +31,9 @@ import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.*;
import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.BOTTOM;
import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.SPECIFY;
import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.TOP;
public class DSColumnAdvancedPane extends BasicPane {
@ -460,7 +462,7 @@ public class DSColumnAdvancedPane extends BasicPane {
private ActionListener formulaButtonActionListener = new ActionListener() {
public void actionPerformed(ActionEvent evt) {
Formula valueFormula = new Formula();
BaseFormula valueFormula = BaseFormula.createFormulaBuilder().build();
String text = formulaTextField.getText();
if (text == null || text.length() <= 0) {
valueFormula.setContent(defaultValue);
@ -485,7 +487,7 @@ public class DSColumnAdvancedPane extends BasicPane {
formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(JFormulaField.this), new DialogActionAdapter() {
@Override
public void doOk() {
Formula valueFormula = formulaPane.update();
BaseFormula valueFormula = formulaPane.update();
if (valueFormula.getContent().length() <= 1) {
formulaTextField.setText(defaultValue);
} else {

6
designer/src/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java

@ -1,6 +1,6 @@
package com.fr.design.dscolumn;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.condition.DSColumnLiteConditionPane;
import com.fr.design.dialog.BasicPane;
@ -333,7 +333,7 @@ public class SpecifiedGroupAttrPane extends BasicPane {
formulaButton.setPreferredSize(new Dimension(25, valueField.getPreferredSize().height));
formulaButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
Formula valueFormula = new Formula();
BaseFormula valueFormula = BaseFormula.createFormulaBuilder().build();
String text = valueField.getText();
if (text == null || text.length() <= 0) {
valueFormula.setContent("$$$");
@ -347,7 +347,7 @@ public class SpecifiedGroupAttrPane extends BasicPane {
formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(FormulaGroupPane.this), new DialogActionAdapter(){
@Override
public void doOk() {
Formula valueFormula = formulaPane.update();
BaseFormula valueFormula = formulaPane.update();
if (valueFormula.getContent().length() <= 1) {
valueField.setText("$$$");
} else {

16
designer/src/com/fr/design/headerfooter/HFAttributesEditDialog.java

@ -3,8 +3,16 @@
*/
package com.fr.design.headerfooter;
import com.fr.base.Formula;
import com.fr.base.headerfooter.*;
import com.fr.base.BaseFormula;
import com.fr.base.headerfooter.DateHFElement;
import com.fr.base.headerfooter.FormulaHFElement;
import com.fr.base.headerfooter.HFElement;
import com.fr.base.headerfooter.ImageHFElement;
import com.fr.base.headerfooter.NewLineHFElement;
import com.fr.base.headerfooter.NumberOfPageHFElement;
import com.fr.base.headerfooter.PageNumberHFElement;
import com.fr.base.headerfooter.TextHFElement;
import com.fr.base.headerfooter.TimeHFElement;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.formula.FormulaFactory;
@ -121,7 +129,7 @@ public class HFAttributesEditDialog extends BasicPane {
formulaButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
Formula valueFormula = new Formula();
BaseFormula valueFormula = BaseFormula.createFormulaBuilder().build();
String text = formulaContentField.getText();
if (text == null || text.length() <= 0) {
valueFormula.setContent("");
@ -135,7 +143,7 @@ public class HFAttributesEditDialog extends BasicPane {
@Override
public void doOk() {
Formula valueFormula = formulaPane.update();
BaseFormula valueFormula = formulaPane.update();
if (valueFormula.getContent().length() <= 1) {
formulaContentField.setText("");
} else {

2
designer/src/com/fr/design/mainframe/ElementCasePane.java

@ -322,7 +322,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
private void initDefaultEditors() {
Grid grid = this.getGrid();
grid.setDefaultCellEditor(DSColumn.class, new DSColumnCellEditor(this));
grid.setDefaultCellEditor(Formula.class, new FormulaCellEditor(this));
grid.setDefaultCellEditor(BaseFormula.class, new FormulaCellEditor(this));
grid.setDefaultCellEditor(RichText.class, new RichTextCellEditor(this));
grid.setDefaultCellEditor(BiasTextPainter.class, new BiasTextPainterCellEditor(this));

2
designer/src/com/fr/design/module/DesignerModule.java

@ -112,7 +112,7 @@ public class DesignerModule extends DesignModule {
private void registerCellEditor() {
ActionFactory.registerCellEditor(String.class, CellStringQuickEditor.class);
ActionFactory.registerCellEditor(Number.class, CellStringQuickEditor.class);
ActionFactory.registerCellEditor(Formula.class, CellFormulaQuickEditor.class);
ActionFactory.registerCellEditor(BaseFormula.class, CellFormulaQuickEditor.class);
ActionFactory.registerCellEditor(SubReport.class, CellSubReportEditor.class);
ActionFactory.registerCellEditor(RichText.class, CellRichTextEditor.class);
ActionFactory.registerCellEditor(DSColumn.class, CellDSColumnEditor.class);

6
designer/src/com/fr/design/report/RichTextEditingPane.java

@ -3,8 +3,8 @@
*/
package com.fr.design.report;
import com.fr.base.BaseFormula;
import com.fr.base.FRContext;
import com.fr.base.Formula;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.formula.FormulaFactory;
import com.fr.design.formula.UIFormula;
@ -139,12 +139,12 @@ public class RichTextEditingPane extends UITextPane{
private void popUpFormulaEditPane(final String formulaContent, final int formulaStart,
final AttributeSet attrs){
final UIFormula formulaPane = FormulaFactory.createFormulaPane();
formulaPane.populate(new Formula(formulaContent));
formulaPane.populate(BaseFormula.createFormulaBuilder().build(formulaContent));
formulaPane.showLargeWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
@Override
public void doOk() {
StyledDocument doc = (StyledDocument) RichTextEditingPane.this.getDocument();
Formula fm = formulaPane.update();
BaseFormula fm = formulaPane.update();
String content = RichTextConverter.asFormula(fm.getContent());
try {
doc.remove(formulaStart, formulaContent.length() + WRAPPER_LEN);

29
designer/src/com/fr/design/report/RichTextPane.java

@ -1,21 +1,7 @@
package com.fr.design.report;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Font;
import java.math.BigDecimal;
import java.util.Iterator;
import javax.swing.JPanel;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
import javax.swing.text.DefaultStyledDocument;
import javax.swing.text.Element;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
import com.fr.base.BaseFormula;
import com.fr.base.FRContext;
import com.fr.base.Formula;
import com.fr.base.Style;
import com.fr.design.cell.editor.RichTextToolBar;
import com.fr.design.dialog.BasicPane;
@ -34,6 +20,17 @@ import com.fr.stable.Constants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import javax.swing.*;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
import javax.swing.text.DefaultStyledDocument;
import javax.swing.text.Element;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
import java.awt.*;
import java.math.BigDecimal;
import java.util.Iterator;
public class RichTextPane extends BasicPane {
//12号字体有个奇怪的bug, 字体下部分渲染会截断一部分, 换其他字体没问题, 字体改大小也没问题.
@ -82,7 +79,7 @@ public class RichTextPane extends BasicPane {
if(cellValue == null){
return;
}
if(cellValue instanceof Formula){
if(cellValue instanceof BaseFormula){
cellValue = RichTextConverter.asFormula(String.valueOf(cellValue));
}

6
designer/src/com/fr/design/report/ValueVerifierEditPane.java

@ -1,6 +1,6 @@
package com.fr.design.report;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.data.VerifyItem;
import com.fr.design.gui.itableeditorpane.ActionStyle;
import com.fr.design.gui.itableeditorpane.UIArrayFormulaTableModel;
@ -50,7 +50,7 @@ public class ValueVerifierEditPane extends JPanel {
if (!StableUtils.canBeFormula(msg)) {
msg = "\"" + msg + "\"";//如果报错信息是以前的写法(字符串)就拼上""
}
os[tableDataCount++] = new Object[]{formula, new Formula(msg)};
os[tableDataCount++] = new Object[]{formula, BaseFormula.createFormulaBuilder().build(msg)};
}
this.tableEditorPane.populate(os);
}
@ -63,7 +63,7 @@ public class ValueVerifierEditPane extends JPanel {
if (o == null || o[0] == null) {
continue;
}
VerifyItem item = new VerifyItem(new Formula(GeneralUtils.objectToString(o[0])), GeneralUtils.objectToString(o[1]));
VerifyItem item = new VerifyItem(BaseFormula.createFormulaBuilder().build(o[0]), GeneralUtils.objectToString(o[1]));
valueVerifier.addVerifyItem(item);
}
return valueVerifier;

37
designer/src/com/fr/design/widget/CellWidgetCardPane.java

@ -2,7 +2,7 @@ package com.fr.design.widget;
import com.fr.design.constants.UIConstants;
import com.fr.design.data.DataCreatorUI;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.dialog.AttrScrollPane;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.BasicScrollPane;
import com.fr.design.foldablepane.UIExpandablePane;
@ -51,38 +51,24 @@ public class CellWidgetCardPane extends BasicPane {
this.removeAll();
this.setLayout(FRGUIPaneFactory.createBorderLayout());
final JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
BasicScrollPane basicScrollPane = new BasicScrollPane() {
@Override
protected JPanel createContentPane() {
return jPanel;
}
@Override
public void populateBean(Object ob) {
}
@Override
protected String title4PopupWindow() {
return null;
}
};
this.add(basicScrollPane, BorderLayout.CENTER);
//k
tabbedPane = new CardLayout();
center = new JPanel(tabbedPane);
jPanel.add(center, BorderLayout.CENTER);
jPanel.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L6, 0, 0));
this.add(center, BorderLayout.CENTER);
attriTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
eventTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
eventTabPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
initPaneList();
eventPane = initWidgetEventPane(pane);
eventTabPane.add(eventPane, BorderLayout.CENTER);
//k
center.add(attriTabPane, Inter.getLocText("FR-Designer_Attribute"));
BasicScrollPane basicScrollPane = new AttrScrollPane() {
@Override
protected JPanel createContentPane() {
return attriTabPane;
}
};
center.add(basicScrollPane, Inter.getLocText("FR-Designer_Attribute"));
center.add(eventTabPane, Inter.getLocText("FR-Designer_Event"));
final String[] tabTitles = new String[]{Inter.getLocText("FR-Designer_Attribute"), Inter.getLocText("FR-Designer_Event")};
@ -100,7 +86,8 @@ public class CellWidgetCardPane extends BasicPane {
UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Basic"), 280, 24, widgetPropertyPane);
attriTabPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
attriTabPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10));
attriTabPane.add(uiExpandablePane, BorderLayout.NORTH);
attriCardPane = FRGUIPaneFactory.createCardLayout_S_Pane();

63
designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java

@ -1,7 +1,6 @@
package com.fr.design.widget.ui;
import com.fr.base.FRContext;
import com.fr.base.Formula;
import com.fr.data.core.FormatField;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.gui.ibutton.UIButtonGroup;
@ -13,11 +12,8 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.widget.component.DateValuePane;
import com.fr.design.widget.component.UIComboBoxNoArrow;
import com.fr.form.ui.DateEditor;
import com.fr.general.DateUtils;
import com.fr.general.Inter;
import com.fr.script.Calculator;
import com.fr.stable.ArrayUtils;
import com.fr.stable.UtilEvalError;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
@ -58,10 +54,17 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
UILabel formatLabel = new UILabel(Inter.getLocText("FR-Engine_Format"));
formatLabel.setVerticalAlignment(SwingConstants.TOP);
UILabel startDateLabel = new UILabel(Inter.getLocText("FS_Start_Date"));
startDateLabel.setVerticalAlignment(SwingConstants.TOP);
UILabel endDateLabel = new UILabel(Inter.getLocText("FS_End_Date"));
endDateLabel.setVerticalAlignment(SwingConstants.TOP);
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("FR-Engine_Format")), formatHead},
new Component[]{new UILabel(Inter.getLocText("FS_Start_Date")), startDv},
new Component[]{new UILabel(Inter.getLocText("FS_End_Date")), endDv},
new Component[]{formatLabel, formatHead},
new Component[]{startDateLabel, startDv},
new Component[]{endDateLabel, endDv},
new Component[]{waterMarkDictPane, null},
new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type")), returnTypeComboBox }
};
@ -207,52 +210,6 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
return ob;
}
/**
* 更新日期控件的起止日期
* @param dateWidgetEditor 日期控件
*/
public void updateStartEnd(DateEditor dateWidgetEditor) {
Object startObject = "";
Object endObject = endDv.update();
// wei : 对公式的处理
Calculator cal = null;
if (startObject instanceof Formula) {
cal = Calculator.createCalculator();
Formula startFormula = (Formula) startObject;
try {
startFormula.setResult(cal.evalValue(startFormula.getContent()));
} catch (UtilEvalError e) {
FRContext.getLogger().error(e.getMessage(), e);
}
startObject = startFormula.getResult();
dateWidgetEditor.setStartDateFM(startFormula);
dateWidgetEditor.setStartText(null);
} else {
try {
dateWidgetEditor.setStartText(startObject == null ? "" : DateUtils.getDate2Str("MM/dd/yyyy", (Date)startObject));
} catch(ClassCastException e) {
//wei : TODO 说明应用的公式不能转化成日期格式,应该做些处理。
}
}
if (endObject instanceof Formula) {
cal = Calculator.createCalculator();
Formula endFormula = (Formula) endObject;
try {
endFormula.setResult(cal.evalValue(endFormula.getContent()));
} catch (UtilEvalError e) {
FRContext.getLogger().error(e.getMessage(), e);
}
endObject = endFormula.getResult();
dateWidgetEditor.setEndDateFM(endFormula);
dateWidgetEditor.setEndText(null);
} else {
try {
dateWidgetEditor.setEndText(endObject == null ? "" : DateUtils.getDate2Str("MM/dd/yyyy", (Date)endObject));
} catch(ClassCastException e) {
}
}
}
private SimpleDateFormat getSimpleDateFormat() {
String text = (String) currentFormatComboBox.getSelectedItem();

4
designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java

@ -1,12 +1,12 @@
package com.fr.design.widget.ui;
import java.awt.*;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.widget.component.NumberEditorValidatePane;
import com.fr.form.ui.NumberEditor;
import java.awt.BorderLayout;
public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor> {
/**
* FieldEditorDefinePane

19
designer/src/com/fr/grid/GridUI.java

@ -1,6 +1,13 @@
package com.fr.grid;
import com.fr.base.*;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.DynamicUnitList;
import com.fr.base.FRContext;
import com.fr.base.GraphHelper;
import com.fr.base.Margin;
import com.fr.base.PaperSize;
import com.fr.base.Utils;
import com.fr.base.background.ColorBackground;
import com.fr.base.background.ImageBackground;
import com.fr.design.constants.UIConstants;
@ -41,8 +48,12 @@ import com.fr.third.antlr.ANTLRException;
import javax.swing.*;
import javax.swing.plaf.ComponentUI;
import java.awt.*;
import java.awt.geom.*;
import java.awt.geom.Area;
import java.awt.geom.GeneralPath;
import java.awt.geom.Line2D;
import java.awt.geom.Line2D.Double;
import java.awt.geom.Path2D;
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@ -768,8 +779,8 @@ public class GridUI extends ComponentUI {
private void paintGridSelectionForFormula(Graphics2D g2d, ElementCase report, CellSelection cs) {
// denny: 标记公式用到的单元格
if (report.getCellValue(cs.getColumn(), cs.getRow()) instanceof Formula) {
Formula tmpFormula = (Formula) report
if (report.getCellValue(cs.getColumn(), cs.getRow()) instanceof BaseFormula) {
BaseFormula tmpFormula = (BaseFormula) report
.getCellValue(cs.getColumn(), cs.getRow());
String statement = tmpFormula.getContent();
// denny: 获得公式中包含的所有单元格

22
designer/src/com/fr/grid/IntelliElements.java

@ -1,12 +1,8 @@
package com.fr.grid;
import java.awt.Rectangle;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.FRContext;
import com.fr.base.Formula;
import com.fr.design.cell.clipboard.CellElementsClip;
import com.fr.design.cell.clipboard.ElementsTransferable;
import com.fr.design.mainframe.ElementCasePane;
@ -19,6 +15,10 @@ import com.fr.report.cell.cellattr.core.group.DSColumn;
import com.fr.report.elementcase.TemplateElementCase;
import com.fr.stable.ColumnRow;
import java.awt.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Kevin Wang: inner class used by method intelliElements iterating in GridUtils.java.
*/
@ -199,8 +199,8 @@ public class IntelliElements {
newCellElement.setCellExpandAttr(sourceCellElement.getCellExpandAttr());
} else if (sourceCellElement.getValue() instanceof Number) {
newCellElement.setValue(processNumber((Number) sourceCellElement.getValue()));
} else if (sourceCellElement.getValue() instanceof Formula) {
Formula formula = (Formula) sourceCellElement.getValue();
} else if (sourceCellElement.getValue() instanceof BaseFormula) {
BaseFormula formula = (BaseFormula) sourceCellElement.getValue();
formula = this.generateSimpleFormula(formula, 1);
newCellElement.setValue(formula);
} else {
@ -231,12 +231,12 @@ public class IntelliElements {
protected abstract ColumnRow processColumnRow(ColumnRow org, int diff);
private Formula generateSimpleFormula(Formula formula, int diff) {
Formula newFormula;
private BaseFormula generateSimpleFormula(BaseFormula formula, int diff) {
BaseFormula newFormula;
try {
newFormula = (Formula) (formula.clone());
newFormula = formula.clone();
} catch (CloneNotSupportedException e) {
newFormula = new Formula();
newFormula = BaseFormula.createFormulaBuilder().build();
FRContext.getLogger().error(e.getMessage(), e);
}
String formulaContent = formula.getContent();

18
designer/src/com/fr/grid/selection/CellSelection.java

@ -1,10 +1,21 @@
package com.fr.grid.selection;
import com.fr.base.*;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.ConfigManager;
import com.fr.base.NameStyle;
import com.fr.base.Utils;
import com.fr.cache.list.IntList;
import com.fr.design.actions.UpdateAction;
import com.fr.design.actions.cell.*;
import com.fr.design.actions.cell.CellAttributeAction;
import com.fr.design.actions.cell.CellExpandAttrAction;
import com.fr.design.actions.cell.CellWidgetAttrAction;
import com.fr.design.actions.cell.CleanAuthorityAction;
import com.fr.design.actions.cell.ConditionAttributesAction;
import com.fr.design.actions.cell.EditCellAction;
import com.fr.design.actions.cell.GlobalStyleMenuDef;
import com.fr.design.actions.cell.GlobalStyleMenuDef.GlobalStyleSelection;
import com.fr.design.actions.cell.StyleAction;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.actions.edit.CopyAction;
import com.fr.design.actions.edit.CutAction;
@ -26,7 +37,6 @@ import com.fr.design.mainframe.JTemplate;
import com.fr.design.menu.KeySetUtils;
import com.fr.design.report.RowColumnPane;
import com.fr.design.selection.QuickEditor;
import com.fr.form.ui.CellWidget;
import com.fr.general.Inter;
import com.fr.grid.GridUtils;
import com.fr.report.cell.CellElement;
@ -293,7 +303,7 @@ public class CellSelection extends Selection {
for (int c = 0; c < lineTextArray.length; c++) {
String textValue = lineTextArray[c];
if (textValue.length() > 0 && textValue.charAt(0) == '=') {
ec.setCellValue(column + c, row + r, new Formula(textValue));
ec.setCellValue(column + c, row + r, BaseFormula.createFormulaBuilder().build(textValue));
} else {
Number number = Utils.string2Number(lineTextArray[c]);
if (number != null) {

13
designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@ -1,6 +1,6 @@
package com.fr.quickeditor.cellquick;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.actions.UpdateAction;
import com.fr.design.actions.columnrow.DSColumnConditionAction;
import com.fr.design.actions.core.ActionFactory;
@ -47,7 +47,12 @@ import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.ArrayList;
import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.*;
import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.BOTTOM;
import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.EVEN;
import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.ODD;
import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.SPECIFY;
import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.TOP;
import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.UNDEFINE;
/**
@ -974,7 +979,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
private ActionListener formulaButtonActionListener = new ActionListener() {
public void actionPerformed(ActionEvent evt) {
Formula valueFormula = new Formula();
BaseFormula valueFormula = BaseFormula.createFormulaBuilder().build();
String text = formulaTextField.getText();
if (text == null || text.length() <= 0) {
valueFormula.setContent(defaultValue);
@ -991,7 +996,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(DSColumnAdvancedEditorPane.JFormulaField.this), new DialogActionAdapter() {
@Override
public void doOk() {
Formula valueFormula = formulaPane.update();
BaseFormula valueFormula = formulaPane.update();
if (valueFormula.getContent().length() <= 1) {
formulaTextField.setText(defaultValue);
} else {

12
designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java

@ -1,6 +1,6 @@
package com.fr.quickeditor.cellquick;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Style;
import com.fr.base.TextFormat;
import com.fr.design.actions.core.ActionFactory;
@ -99,11 +99,11 @@ public class CellFormulaQuickEditor extends CellQuickEditor {
public void actionPerformed(ActionEvent evt) {
String text = formulaTextField.getText();
final UIFormula formulaPane = FormulaFactory.createFormulaPane();
formulaPane.populate(new Formula(text));
formulaPane.populate(BaseFormula.createFormulaBuilder().build(text));
formulaPane.showLargeWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
@Override
public void doOk() {
Formula fm = formulaPane.update();
BaseFormula fm = formulaPane.update();
if (fm.getContent().length() <= 1) {
formulaTextField.setText(DEFAULT_FORMULA);
} else {
@ -146,7 +146,7 @@ public class CellFormulaQuickEditor extends CellQuickEditor {
tc.getEditingElementCase().addCellElement(cellElement, false);
}
if (tmpText != null && (tmpText.length() > 0 && tmpText.charAt(0) == '=')) {
Formula textFormula = new Formula(tmpText);
BaseFormula textFormula = BaseFormula.createFormulaBuilder().build(tmpText);
textFormula.setReserveInResult(reserveInResult);
textFormula.setReserveOnWriteOrAnaly(reserveOnWriteOrAnaly);
cellElement.setValue(textFormula);
@ -175,8 +175,8 @@ public class CellFormulaQuickEditor extends CellQuickEditor {
Object value = cellElement.getValue();
if (value == null) {
str = StringUtils.EMPTY;
} else if (value instanceof Formula) {
Formula formula = (Formula) value;
} else if (value instanceof BaseFormula) {
BaseFormula formula = (BaseFormula) value;
str = formula.getContent();
reserveInResult = formula.isReserveInResult();
reserveOnWriteOrAnaly = formula.isReserveOnWriteOrAnaly();

8
designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java

@ -1,6 +1,6 @@
package com.fr.quickeditor.cellquick;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Style;
import com.fr.base.TextFormat;
import com.fr.design.gui.itextarea.UITextArea;
@ -110,7 +110,7 @@ public class CellStringQuickEditor extends CellQuickEditor {
tc.getEditingElementCase().addCellElement(cellElement, false);
}
if (tmpText != null && (tmpText.length() > 0 && tmpText.charAt(0) == '=')) {
Formula textFormula = new Formula(tmpText);
BaseFormula textFormula = BaseFormula.createFormulaBuilder().build(tmpText);
textFormula.setReserveInResult(reserveInResult);
textFormula.setReserveOnWriteOrAnaly(reserveOnWriteOrAnaly);
cellElement.setValue(textFormula);
@ -139,8 +139,8 @@ public class CellStringQuickEditor extends CellQuickEditor {
Object value = cellElement.getValue();
if (value == null) {
str = StringUtils.EMPTY;
} else if (value instanceof Formula) {
Formula formula = (Formula) value;
} else if (value instanceof BaseFormula) {
BaseFormula formula = (BaseFormula) value;
str = formula.getContent();
reserveInResult = formula.isReserveInResult();
reserveOnWriteOrAnaly = formula.isReserveOnWriteOrAnaly();

8
designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java

@ -1,7 +1,7 @@
package com.fr.quickeditor.floatquick;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.Formula;
import com.fr.base.Style;
import com.fr.base.TextFormat;
import com.fr.design.constants.UIConstants;
@ -68,10 +68,10 @@ public class FloatStringQuickEditor extends FloatQuickEditor {
Object value = floatElement.getValue();
if (value == null) {
str = StringUtils.EMPTY;
} else if (value instanceof Formula) {
} else if (value instanceof BaseFormula) {
//MoMeak: 没拆文本框和公式所以需要这么个玩意
formulaButton.setVisible(true);
Formula formula = (Formula) value;
BaseFormula formula = (BaseFormula) value;
str = formula.getContent();
stringTextField.setLineWrap(false);
this.setBorder(BorderFactory.createEmptyBorder(10, 75, 10, 10));
@ -110,7 +110,7 @@ public class FloatStringQuickEditor extends FloatQuickEditor {
protected void changeReportPaneCell(String tmpText) {
if (tmpText != null && (tmpText.length() > 0 && tmpText.charAt(0) == '=')) {
Formula textFormula = new Formula(tmpText);
BaseFormula textFormula = BaseFormula.createFormulaBuilder().build(tmpText);
textFormula.setReserveInResult(reserveInResult);
textFormula.setReserveOnWriteOrAnaly(reserveOnWriteOrAnaly);
floatElement.setValue(textFormula);

42
designer_base/src/com/fr/design/DesignerEnvManager.java

@ -14,7 +14,6 @@ import com.fr.env.RemoteEnv;
import com.fr.env.SignIn;
import com.fr.file.FILEFactory;
import com.fr.general.ComparatorUtils;
import com.fr.general.FRLevel;
import com.fr.general.FRLogFormatter;
import com.fr.general.FRLogger;
import com.fr.general.GeneralContext;
@ -34,9 +33,10 @@ import com.fr.stable.xml.XMLTools;
import com.fr.stable.xml.XMLWriter;
import com.fr.stable.xml.XMLableReader;
import javax.swing.*;
import javax.swing.SwingWorker;
import javax.swing.SwingWorker.StateValue;
import java.awt.*;
import java.awt.Color;
import java.awt.Rectangle;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
@ -53,7 +53,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.FileHandler;
import java.util.logging.Handler;
import java.util.logging.Level;
/**
* The manager of Designer GUI.
@ -97,7 +96,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
private Color paginationLineColor = Color.black; // line color of paper
private boolean supportCellEditorDef = false;
private boolean isDragPermited = false;
private Level level = Level.INFO;
private int language;
//2014-8-26默认显示全部, 因为以前的版本, 虽然是false, 实际上是显示所有表, 因此这边要兼容
private boolean useOracleSystemSpace = true;
@ -240,10 +238,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
*/
public static void loadLogSetting() {
DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager();
Level logLevel = designerEnvManager.getLogLevel();
if (logLevel != null) {
FRContext.getLogger().setLogLevel(logLevel, true);
}
if (StringUtils.isNotEmpty(designerEnvManager.getJdkHome())) {
System.setProperty("java.home", designerEnvManager.getJdkHome());
}
@ -1156,20 +1150,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
this.logLocation = logsLocation;
}
/**
* 返回日志的等级
*/
public Level getLogLevel() {
return this.level;
}
/**
* 设置log的等级
*/
public void setLogLevel(Level level) {
this.level = level;
}
/**
* 设置撤销的限制次数
*/
@ -1320,8 +1300,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
readActiveKey(reader);
} else if ("LogLocation".equals(name)) {
readLogLocation(reader);
} else if ("LogLevel".equals(name)) {
this.readLogLevel(reader);
} else if ("Language".equals(name)) {
readLanguage(reader);
} else if ("JettyServerPort".equals(name)) {
@ -1516,15 +1494,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
checkRecentOpenedFileNum();
}
private void readLogLevel(XMLableReader reader) {
String level;
if ((level = reader.getElementValue()) != null) {
this.setLogLevel(FRLevel.getByName(level).getLevel());
}
}
/**
* Write XML.<br>
* The method will be invoked when save data to XML file.<br>
@ -1700,11 +1669,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
writer.end();
}
if (this.level != null) {
writer.startTAG("LogLevel");
writer.textNode(FRLevel.getByLevel(this.level).getName());
writer.end();
}
if (StringUtils.isNotBlank(jdkHome)) {
writer.startTAG("jdkHome");
writer.textNode(jdkHome);

25
designer_base/src/com/fr/design/actions/core/ActionFactory.java

@ -127,23 +127,32 @@ public class ActionFactory {
}
private static QuickEditor createEditor(Class clazz, Map<Class, Class<? extends QuickEditor>> editorMap) {
Class<? extends QuickEditor> c = editorMap.get(clazz);
Class<? extends QuickEditor> c = findQuickEditorClass(clazz, editorMap);
if (c == null) {
return null;
}
try {
Constructor<? extends QuickEditor> constructor = c.getDeclaredConstructor();
constructor.setAccessible(true);
return constructor.newInstance();
} catch (NoSuchMethodException e) {
FRContext.getLogger().error(e.getMessage(), e);
} catch (IllegalAccessException e) {
FRContext.getLogger().error(e.getMessage(), e);
} catch (InstantiationException e) {
FRContext.getLogger().error(e.getMessage(), e);
} catch (InvocationTargetException e) {
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage(), e);
}
return null;
}
private static Class<? extends QuickEditor> findQuickEditorClass(Class clazz, Map<Class, Class<? extends QuickEditor>> editorMap) {
Class<? extends QuickEditor> c = editorMap.get(clazz);
if (c == null) {
Class superClazz = clazz.getSuperclass();
if (superClazz == null) {
return null;
}
return findQuickEditorClass(superClazz, editorMap);
}
return c;
}
public static QuickEditor getCellEditor(Class clazz) {
return createEditor(clazz, cellEditor);
}

37
designer_base/src/com/fr/design/actions/file/PreferencePane.java

@ -1,6 +1,8 @@
package com.fr.design.actions.file;
import com.fr.base.BaseUtils;
import com.fr.base.ConfigManager;
import com.fr.base.FRContext;
import com.fr.design.DesignerEnvManager;
import com.fr.design.RestartHelper;
import com.fr.design.dialog.BasicDialog;
@ -25,9 +27,24 @@ import com.fr.general.FRFont;
import com.fr.general.FRLevel;
import com.fr.general.Inter;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.File;
import java.util.ArrayList;
import java.util.Locale;
@ -354,7 +371,7 @@ public class PreferencePane extends BasicPane {
logLevelPane.add(logLevelComboBox);
logLevelComboBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
DesignerEnvManager.getEnvManager().setLogLevel(((FRLevel) logLevelComboBox.getSelectedItem()).getLevel());
ConfigManager.getProviderInstance().setServerLogLevel(((FRLevel) logLevelComboBox.getSelectedItem()).getLevel());
}
});
}
@ -534,7 +551,7 @@ public class PreferencePane extends BasicPane {
this.logExportDirectoryField.setText(designerEnvManager.getLogLocation());
this.logLevelComboBox.setSelectedItem(FRLevel.getByLevel(designerEnvManager.getLogLevel()));
this.logLevelComboBox.setSelectedItem(FRLevel.getByLevel(ConfigManager.getProviderInstance().getServerLogLevel()));
this.languageComboBox.setSelectedItem(LANGUAGE.get(designerEnvManager.getLanguage()));
designerEnvLanguageIndex = designerEnvManager.getLanguage();
@ -578,8 +595,6 @@ public class PreferencePane extends BasicPane {
designerEnvManager.setLogLocation(this.logExportDirectoryField.getText());
designerEnvManager.setLogLevel(((FRLevel) logLevelComboBox.getSelectedItem()).getLevel());
designerEnvManager.setSupportUndo(supportUndoCheckBox.isSelected());
designerEnvManager.setSupportDefaultParentCalculate(supportDefaultParentCalculateCheckBox.isSelected());
@ -615,6 +630,14 @@ public class PreferencePane extends BasicPane {
if (maxUndoLimit.getSelectedIndex() == SELECTED_INDEX_5) {
designerEnvManager.setUndoLimit(MAX_UNDO_LIMIT_50);
}
ConfigManager.getProviderInstance().setServerLogLevel(((FRLevel) logLevelComboBox.getSelectedItem()).getLevel());
try {
FRContext.getCurrentEnv().writeResource(ConfigManager.getProviderInstance());
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage());
}
}
/*

10
designer_base/src/com/fr/design/condition/LiteConditionPane.java

@ -1,7 +1,7 @@
package com.fr.design.condition;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.Formula;
import com.fr.data.DataConstants;
import com.fr.data.condition.*;
import com.fr.design.beans.BasicBeanPane;
@ -75,13 +75,13 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
@Override
public void actionPerformed(ActionEvent evt) {
Formula formula;
BaseFormula formula;
String text = formulaTextArea.getText();
if (text == null || text.length() <= 0) {
formula = new Formula(StringUtils.EMPTY);
formula = BaseFormula.createFormulaBuilder().build();
} else {
formula = new Formula(text);
formula = BaseFormula.createFormulaBuilder().build(text);
}
final UIFormula formulaPane = FormulaFactory.createFormulaPane();
@ -90,7 +90,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
@Override
public void doOk() {
Formula formula = formulaPane.update();
BaseFormula formula = formulaPane.update();
if (formula.getContent().length() <= 1) {// 如果没有填任何字符,则是空白文本
formulaTextArea.setText(StringUtils.EMPTY);
} else {

239
designer_base/src/com/fr/design/data/datapane/ChoosePaneSupportFormula.java

File diff suppressed because one or more lines are too long

10
designer_base/src/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java

@ -1,10 +1,11 @@
package com.fr.design.data.tabledata.tabledatapane;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.StoreProcedureParameter;
import com.fr.design.gui.itableeditorpane.ParameterTableModel;
import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory;
import com.fr.design.editor.editor.CursorEditor;
import com.fr.design.gui.itableeditorpane.ParameterTableModel;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
@ -16,7 +17,8 @@ import javax.swing.event.PopupMenuListener;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellEditor;
import java.awt.*;
import java.util.*;
import java.util.Date;
import java.util.TimerTask;
/**
@ -129,7 +131,7 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
type = Inter.getLocText("Date");
else if(value instanceof Boolean)
type = Inter.getLocText("Parameter-Boolean");
else if(value instanceof Formula)
else if(value instanceof BaseFormula)
type = Inter.getLocText("Formula");
else
type = Inter.getLocText("Parameter-String");

4
designer_base/src/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java

@ -386,10 +386,10 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
return new ActionListener() {
public void actionPerformed(ActionEvent e) {
final UIFormula formulaPane = FormulaFactory.createFormulaPane();
formulaPane.populate(new Formula(formulaContentTextField.getText()));
formulaPane.populate(BaseFormula.createFormulaBuilder().build(formulaContentTextField.getText()));
formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(MultiTDTableDataPane.this), new DialogActionAdapter() {
public void doOk() {
Formula formula = formulaPane.update();
BaseFormula formula = formulaPane.update();
if (formula == null) {
formulaContentTextField.setText("");
} else {

28
designer_base/src/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java

@ -1,27 +1,25 @@
package com.fr.design.data.tabledata.tabledatapane;
import java.awt.BorderLayout;
import java.awt.Component;
import java.util.Date;
import java.util.HashMap;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.JPanel;
import com.fr.base.Formula;
import com.fr.general.NameObject;
import com.fr.base.BaseFormula;
import com.fr.base.StoreProcedureParameter;
import com.fr.data.impl.storeproc.StoreProcedureConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory;
import com.fr.design.editor.editor.CursorEditor;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.dialog.BasicPane;
import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory;
import com.fr.design.editor.editor.CursorEditor;
import com.fr.general.Inter;
import com.fr.general.NameObject;
import javax.swing.*;
import java.awt.*;
import java.util.Date;
import java.util.HashMap;
public class StoreProcedureParameterPane extends BasicPane {
@ -140,7 +138,7 @@ public class StoreProcedureParameterPane extends BasicPane {
type = Inter.getLocText("Date");
else if(value instanceof Boolean)
type = Inter.getLocText("Parameter-Boolean");
else if(value instanceof Formula)
else if(value instanceof BaseFormula)
type = Inter.getLocText("Formula");
else
type = Inter.getLocText("Parameter-String");

30
designer_base/src/com/fr/design/dialog/AttrScrollPane.java

@ -0,0 +1,30 @@
package com.fr.design.dialog;
import javax.swing.JPanel;
/**
* Created by kerry on 2017/10/25.
*/
public abstract class AttrScrollPane extends BasicScrollPane {
private static final int OVER_WIDTH = 10;
@Override
public void populateBean(Object ob) {
}
@Override
protected String title4PopupWindow() {
return null;
}
@Override
protected int getOverWidth() {
return OVER_WIDTH;
}
@Override
protected boolean hideBarWidth() {
return true;
}
}

15
designer_base/src/com/fr/design/dialog/BasicScrollPane.java

@ -171,14 +171,23 @@ public abstract class BasicScrollPane<T> extends BasicBeanPane<T>{
protected void setLeftContentPaneBounds(Container parent, UIScrollBar scrollBar, int beginY, int maxheight) {
int width = parent.getWidth();
int height = parent.getHeight();
if (leftcontentPane.getPreferredSize().height > maxheight) {
leftcontentPane.setBounds(0, -beginY, width - scrollBar.getWidth() - DET_WIDTH_OVER_HEIGHT, height + beginY);
if (leftcontentPane.getPreferredSize().height > maxheight && scrollBar.isVisible()) {
leftcontentPane.setBounds(0, -beginY, width - scrollBar.getWidth() + getOverWidth() - DET_WIDTH_OVER_HEIGHT, height + beginY);
scrollBar.setBounds(width - scrollBar.getWidth() - 1, 0, scrollBar.getWidth(), height);
} else {
leftcontentPane.setBounds(0, 0, width - DET_WIDTH, height);
int hideBarWidth = hideBarWidth() ? scrollBar.getWidth() : 0;
leftcontentPane.setBounds(0, 0, width - DET_WIDTH + hideBarWidth, height);
}
}
protected int getOverWidth(){
return 0;
}
protected boolean hideBarWidth(){
return false;
}
protected boolean isShowScrollBar() {
return true;
}

17
designer_base/src/com/fr/design/editor/DoubleDeckValueEditorPane.java

@ -1,9 +1,14 @@
package com.fr.design.editor;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.BasicPane;
import com.fr.design.editor.editor.*;
import com.fr.design.editor.editor.ColumnIndexEditor;
import com.fr.design.editor.editor.ColumnNameEditor;
import com.fr.design.editor.editor.Editor;
import com.fr.design.editor.editor.FormulaEditor;
import com.fr.design.editor.editor.TextEditor;
import com.fr.design.editor.editor.XMLANameEditor;
import com.fr.design.event.GlobalNameListener;
import com.fr.design.event.GlobalNameObserver;
import com.fr.design.event.UIObserver;
@ -234,7 +239,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
Object columnName = StringUtils.EMPTY;
if (ComparatorUtils.equals(name, Inter.getLocText("FR-Designer_Formula"))) {
columnIndex = new Formula(columnIndex == null ? "" : columnIndex.toString());
columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString());
}
if (currentEditor instanceof ColumnNameEditor) {
@ -250,7 +255,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
Object columnName = StringUtils.EMPTY;
if (ComparatorUtils.equals(name, Inter.getLocText("FR-Designer_Formula"))) {
columnIndex = new Formula(columnIndex == null ? "" : columnIndex.toString());
columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString());
}
if (isXMLA) {
@ -302,12 +307,12 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
if (returnValue == JOptionPane.OK_OPTION) {
setCurrentEditor(j);
Formula formula = new Formula(string);
BaseFormula formula = BaseFormula.createFormulaBuilder().build(string);
currentEditor.setValue(formula);
}
} else {
setCurrentEditor(j);
Formula formula = new Formula(string);
BaseFormula formula = BaseFormula.createFormulaBuilder().build(string);
currentEditor.setValue(formula);
}
}

17
designer_base/src/com/fr/design/editor/ValueEditorPane.java

@ -1,9 +1,13 @@
package com.fr.design.editor;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.BasicPane;
import com.fr.design.editor.editor.*;
import com.fr.design.editor.editor.ColumnNameEditor;
import com.fr.design.editor.editor.Editor;
import com.fr.design.editor.editor.FormulaEditor;
import com.fr.design.editor.editor.TextEditor;
import com.fr.design.editor.editor.XMLANameEditor;
import com.fr.design.event.GlobalNameListener;
import com.fr.design.event.GlobalNameObserver;
import com.fr.design.event.UIObserver;
@ -216,7 +220,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
Object columnName = StringUtils.EMPTY;
if (ComparatorUtils.equals(name, Inter.getLocText("FR-Designer_Formula"))) {
columnIndex = new Formula(columnIndex == null ? "" : columnIndex.toString());
columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString());
}
if (currentEditor instanceof ColumnNameEditor) {
@ -232,7 +236,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
Object columnName = StringUtils.EMPTY;
if (ComparatorUtils.equals(name, Inter.getLocText("FR-Designer_Formula"))) {
columnIndex = new Formula(columnIndex == null ? "" : columnIndex.toString());
columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString());
}
if (isXMLA) {
@ -284,17 +288,16 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
if (returnValue == JOptionPane.OK_OPTION) {
setCurrentEditor(j);
Formula formula = new Formula(string);
BaseFormula formula = BaseFormula.createFormulaBuilder().build(string);
currentEditor.setValue(formula);
}
} else {
setCurrentEditor(j);
Formula formula = new Formula(string);
BaseFormula formula = BaseFormula.createFormulaBuilder().build(string);
currentEditor.setValue(formula);
}
}
}
}
private boolean isFormula(String string) {

6
designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java

@ -1,6 +1,6 @@
package com.fr.design.editor;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.editor.editor.BooleanEditor;
import com.fr.design.editor.editor.ColumnRowEditor;
import com.fr.design.editor.editor.ColumnRowGroupEditor;
@ -471,9 +471,9 @@ public class ValueEditorPaneFactory {
if (hyperLinkEditorMap == null) {
return lists;
}
Iterator<Map.Entry<String, Formula>> entries = hyperLinkEditorMap.entrySet().iterator();
Iterator<Map.Entry<String, BaseFormula>> entries = hyperLinkEditorMap.entrySet().iterator();
while (entries.hasNext()) {
Map.Entry<String, Formula> entry = entries.next();
Map.Entry<String, BaseFormula> entry = entries.next();
ConstantsEditor editor = new ConstantsEditor(entry.getKey(), entry.getValue());
editor.setEnabled(false);
lists.add(editor);

8
designer_base/src/com/fr/design/editor/editor/ConstantsEditor.java

@ -1,11 +1,11 @@
package com.fr.design.editor.editor;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
public class ConstantsEditor extends FormulaEditor {
public ConstantsEditor(String name, Formula formula) {
public ConstantsEditor(String name, BaseFormula formula) {
super(name, formula);
}
@ -13,11 +13,11 @@ public class ConstantsEditor extends FormulaEditor {
// do nothing 防止修改...
}
public void setValue(Formula value) {
public void setValue(BaseFormula value) {
// do nothing 防止修改...
}
public boolean accept(Object object) {
return object instanceof Formula && object.equals(this.getValue());
return object instanceof BaseFormula && object.equals(this.getValue());
}
}

31
designer_base/src/com/fr/design/editor/editor/FormulaEditor.java

@ -3,13 +3,12 @@
*/
package com.fr.design.editor.editor;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.formula.FormulaFactory;
import com.fr.design.formula.UIFormula;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.stable.StringUtils;
import javax.swing.*;
import javax.swing.event.DocumentListener;
@ -23,10 +22,10 @@ import java.awt.event.MouseEvent;
* @editor zhou
* @since 2012-3-29下午6:27:27
*/
public class FormulaEditor extends Editor<Formula> {
private Formula formula = new Formula(StringUtils.EMPTY);
public class FormulaEditor extends Editor<BaseFormula> {
private BaseFormula formula = BaseFormula.createFormulaBuilder().build();
private UITextField currentTextField;
private ShowPaneListener listerner = new ShowPaneListener();
private ShowPaneListener listener = new ShowPaneListener();
/**
* Constructor.
@ -39,7 +38,7 @@ public class FormulaEditor extends Editor<Formula> {
this(name, null);
}
public FormulaEditor(String name, Formula formula) {
public FormulaEditor(String name, BaseFormula formula) {
if (formula != null) {
this.formula = formula;
}
@ -51,7 +50,7 @@ public class FormulaEditor extends Editor<Formula> {
editPane.add(currentTextField, BorderLayout.CENTER);
currentTextField.setEditable(false);
currentTextField.addMouseListener(listerner);
currentTextField.addMouseListener(listener);
this.add(editPane, BorderLayout.CENTER);
this.setName(name);
}
@ -96,7 +95,7 @@ public class FormulaEditor extends Editor<Formula> {
}).setVisible(true);
}
public Formula getFormula(){
public BaseFormula getFormula(){
return formula;
}
@ -104,7 +103,7 @@ public class FormulaEditor extends Editor<Formula> {
* Return the value of the CellEditor.
*/
@Override
public Formula getValue() {
public BaseFormula getValue() {
if (formula != null && "=".equals(formula.getContent())) {
return null;
}
@ -115,9 +114,9 @@ public class FormulaEditor extends Editor<Formula> {
* Set the value to the CellEditor.
*/
@Override
public void setValue(Formula value) {
public void setValue(BaseFormula value) {
if (value == null) {
value = new Formula(StringUtils.EMPTY);
value = BaseFormula.createFormulaBuilder().build();
}
this.formula = value;
currentTextField.setText(value.toString());
@ -143,7 +142,7 @@ public class FormulaEditor extends Editor<Formula> {
* @return 是公式类型则返回true
*/
public boolean accept(Object object) {
return object instanceof Formula;
return object instanceof BaseFormula;
}
/**
@ -151,7 +150,7 @@ public class FormulaEditor extends Editor<Formula> {
*/
public void reset() {
currentTextField.setText("=");
formula = new Formula(StringUtils.EMPTY);
formula = BaseFormula.createFormulaBuilder().build();
}
/**
@ -170,13 +169,13 @@ public class FormulaEditor extends Editor<Formula> {
this.setEnabled(flag);
this.currentTextField.setEnabled(flag);
if (flag == false) {
this.currentTextField.removeMouseListener(listerner);
this.currentTextField.removeMouseListener(listener);
} else {
int listenerSize = this.currentTextField.getMouseListeners().length;
for (int i = 0; i < listenerSize; i++) {
this.currentTextField.removeMouseListener(listerner);
this.currentTextField.removeMouseListener(listener);
}
this.currentTextField.addMouseListener(listerner);
this.currentTextField.addMouseListener(listener);
}
}
}

41
designer_base/src/com/fr/design/formula/FormulaPane.java

@ -1,8 +1,8 @@
package com.fr.design.formula;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.FRContext;
import com.fr.base.Formula;
import com.fr.design.actions.UpdateAction;
import com.fr.design.border.UIRoundedBorder;
import com.fr.design.constants.UIConstants;
@ -32,13 +32,27 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.*;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.MutableTreeNode;
import javax.swing.tree.TreePath;
import java.awt.*;
import java.awt.event.*;
import java.io.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
import java.util.Locale;
import java.util.Set;
/**
* 公式编辑面板
@ -468,11 +482,11 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
/**
* Populate
*/
public void populate(Formula formula) {
public void populate(BaseFormula formula) {
this.populate(formula, VariableResolver.DEFAULT);
}
public void populate(Formula formula, VariableResolver variableResolver) {
public void populate(BaseFormula formula, VariableResolver variableResolver) {
this.variableTreeAndDescriptionArea.populate(variableResolver);
// set text
@ -508,19 +522,18 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
/**
* update
*/
public Formula update() {
Formula formula;
public BaseFormula update() {
BaseFormula formula;
if (ifHasBeenWriten == 0) {
String content = StringUtils.EMPTY;
formula = new Formula(content);
formula = BaseFormula.createFormulaBuilder().build();
return formula;
} else {
String content = this.formulaTextArea.getText();
if (StringUtils.isEmpty(content) || content.trim().charAt(0) == '=') {
formula = new Formula(content);
formula = BaseFormula.createFormulaBuilder().build(content);
} else {
formula = new Formula("=" + content);
formula = BaseFormula.createFormulaBuilder().build("=" + content);
}
return formula;
}

8
designer_base/src/com/fr/design/formula/FormulaPaneWhenReserveFormula.java

@ -1,6 +1,6 @@
package com.fr.design.formula;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.general.Inter;
@ -46,15 +46,15 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane {
}
@Override
public void populate(Formula formula, VariableResolver variableResolver) {
public void populate(BaseFormula formula, VariableResolver variableResolver) {
super.populate(formula, variableResolver);
reserveCheckBox4Result.setSelected(formula.isReserveInResult());
reserveCheckBox4Write.setSelected(formula.isReserveOnWriteOrAnaly());
}
@Override
public Formula update() {
Formula formula = super.update();
public BaseFormula update() {
BaseFormula formula = super.update();
if (formula != null) {
formula.setReserveInResult(this.reserveCheckBox4Result.isSelected());
formula.setReserveOnWriteOrAnaly(this.reserveCheckBox4Write.isSelected());

7
designer_base/src/com/fr/design/formula/SortFormulaPane.java

@ -1,7 +1,7 @@
package com.fr.design.formula;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.data.util.SortOrder;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.gui.ibutton.UIButton;
@ -57,12 +57,11 @@ public abstract class SortFormulaPane extends JPanel {
public void showFormulaDialog(String[] displayNames) {
String text = sortFormulaTextField.getText();
final UIFormula formulaPane = FormulaFactory.createFormulaPaneWhenReserveFormula();
formulaPane.populate(new Formula(text), new CustomVariableResolver(displayNames, true));
formulaPane.populate(BaseFormula.createFormulaBuilder().build(text), new CustomVariableResolver(displayNames, true));
formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(SortFormulaPane.this),
new DialogActionAdapter() {
public void doOk() {
Formula fm = formulaPane.update();
BaseFormula fm = formulaPane.update();
if (fm.getContent().length() <= 1) {
sortFormulaTextField.setText("");
} else {

11
designer_base/src/com/fr/design/formula/TinyFormulaPane.java

@ -1,18 +1,15 @@
package com.fr.design.formula;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.Formula;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.Inter;
import javax.swing.*;
@ -51,11 +48,11 @@ public class TinyFormulaPane extends BasicBeanPane<String> implements UIObserver
String text = formulaTextField.getText();
final UIFormula formulaPane = FormulaFactory.createFormulaPane();
formulaPane.populate(new Formula(text));
formulaPane.populate(BaseFormula.createFormulaBuilder().build(text));
formulaPane.showLargeWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
@Override
public void doOk() {
Formula fm = formulaPane.update();
BaseFormula fm = formulaPane.update();
populateTextField(fm);
okEvent();
}
@ -65,7 +62,7 @@ public class TinyFormulaPane extends BasicBeanPane<String> implements UIObserver
initLayout();
}
protected void populateTextField(Formula fm) {
protected void populateTextField(BaseFormula fm) {
if (fm.getContent().length() <= 1) {
formulaTextField.setText("$$$");
} else {

8
designer_base/src/com/fr/design/formula/UIFormula.java

@ -1,6 +1,6 @@
package com.fr.design.formula;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionListener;
@ -17,20 +17,20 @@ public interface UIFormula {
* 从已有的公式还原公式面板
* @param formula 公式
*/
void populate(Formula formula);
void populate(BaseFormula formula);
/**
* 根据指定的变量处理和公式还原公式面板
* @param formula 公式
* @param variableResolver 变量处理器
*/
void populate(Formula formula, VariableResolver variableResolver);
void populate(BaseFormula formula, VariableResolver variableResolver);
/**
* 获取公式面板的参数
* @return 公式
*/
Formula update();
BaseFormula update();
/**
* 显示窗口

28
designer_base/src/com/fr/design/gui/frpane/JTreeAutoBuildPane.java

@ -1,27 +1,31 @@
package com.fr.design.gui.frpane;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.data.impl.NameTableData;
import com.fr.data.impl.RecursionTableData;
import com.fr.data.impl.TableDataDictionary;
import com.fr.design.DesignModelAdapter;
import com.fr.design.data.BasicTableDataTreePane;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.data.datapane.EditOrNewLabel;
import com.fr.design.data.datapane.TableDataTreePane;
import com.fr.design.data.datapane.TreeTableDataComboBox;
import com.fr.design.data.datapane.preview.PreviewLabel;
import com.fr.data.impl.NameTableData;
import com.fr.data.impl.RecursionTableData;
import com.fr.data.impl.TableDataDictionary;
import com.fr.design.data.tabledata.wrapper.AbstractTableDataWrapper;
import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
import com.fr.design.DesignModelAdapter;
import com.fr.design.dialog.BasicPane;
import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory;
import com.fr.design.editor.editor.ColumnIndexEditor;
import com.fr.design.editor.editor.ColumnNameEditor;
import com.fr.design.editor.editor.Editor;
import com.fr.design.editor.editor.FormulaEditor;
import com.fr.design.editor.editor.OldColumnIndexEditor;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.dialog.BasicPane;
import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory;
import com.fr.design.editor.editor.*;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
@ -163,8 +167,8 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
Object object_text = this.textPane.update(StringUtils.EMPTY);
if (object_text instanceof Object[]) {
Object[] temp = (Object[]) object_text;
if (temp[0] instanceof Formula) {
tableDataDict.setFormula((Formula) temp[0]);
if (temp[0] instanceof BaseFormula) {
tableDataDict.setFormula((BaseFormula) temp[0]);
} else {
tableDataDict.setValueColumnIndex(((Integer) temp[0]).intValue() - 1);
tableDataDict.setValueColumnName((String) temp[1]);
@ -174,7 +178,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
} else if (object_text instanceof String) {
tableDataDict.setValueColumnName((String) object_text);
} else {
tableDataDict.setFormula(((Formula) object));
tableDataDict.setFormula(((BaseFormula) object));
}
TableDataWrapper tableDataWrappe = this.treeTableDataComboBox.getSelectedItem();

5
designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java

@ -1,12 +1,9 @@
package com.fr.design.gui.ibutton;
import com.fr.base.BaseUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.event.GlobalNameListener;
import com.fr.design.event.GlobalNameObserver;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.stable.ArrayUtils;
import com.fr.stable.Constants;
import com.fr.stable.StringUtils;
import sun.swing.SwingUtilities2;
@ -200,7 +197,7 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver {
if (isPressed(b)) {
g.setColor(Color.white);
} else {
g.setColor(Color.black);
g.setColor(b.isEnabled() ? Color.black : UIConstants.LINE_COLOR);
}
SwingUtilities2.drawStringUnderlineCharAt(b, g, text, mnemonicIndex, textRec.x + getTextShiftOffset(), textRec.y + fm.getAscent() + getTextShiftOffset());

2
designer_base/src/com/fr/design/gui/ispinner/UISpinner.java

@ -262,7 +262,9 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
textField.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
textField.getDocument().removeDocumentListener(docListener);
textField.setValue(value);
textField.getDocument().addDocumentListener(docListener);
}
});
}

38
designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java

@ -1,20 +1,44 @@
package com.fr.design.mainframe.loghandler;
import com.fr.base.BaseUtils;
import com.fr.base.ConfigManager;
import com.fr.base.FRContext;
import com.fr.design.DesignerEnvManager;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.*;
import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogLevel;
import com.fr.general.FRLogger;
import com.fr.general.GeneralContext;
import com.fr.general.Inter;
import com.fr.log.LogHandler;
import com.fr.stable.EnvChangedListener;
import com.fr.stable.xml.LogRecordTimeProvider;
import javax.swing.*;
import javax.swing.text.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.AbstractAction;
import javax.swing.ActionMap;
import javax.swing.InputMap;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JTextPane;
import javax.swing.KeyStroke;
import javax.swing.text.BadLocationException;
import javax.swing.text.DefaultEditorKit;
import javax.swing.text.Document;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.logging.Level;
@ -105,7 +129,7 @@ public class DesignerLogHandler {
@Override
public void actionPerformed(ActionEvent e) {
JPopupMenu showsetPopup = new JPopupMenu();
int logLevelvalue = DesignerEnvManager.getEnvManager().getLogLevel().intValue();
int logLevelvalue = ConfigManager.getProviderInstance().getServerLogLevel().intValue();
if (logLevelvalue <= INFO_INT) {
showsetPopup.add(showInfo);
showsetPopup.add(showError);

30
designer_base/src/com/fr/design/mainframe/widget/accessibles/AccessibleDictionaryEditor.java

@ -1,14 +1,12 @@
package com.fr.design.mainframe.widget.accessibles;
import javax.swing.*;
import com.fr.data.Dictionary;
import com.fr.design.mainframe.widget.wrappers.DictionaryWrapper;
import com.fr.design.present.dict.DictionaryPane;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.mainframe.widget.wrappers.DictionaryWrapper;
import com.fr.design.present.dict.DictionaryPane;
import java.awt.*;
import javax.swing.SwingUtilities;
public class AccessibleDictionaryEditor extends UneditableAccessibleEditor {
@ -38,4 +36,26 @@ public class AccessibleDictionaryEditor extends UneditableAccessibleEditor {
dictPane.populateBean((Dictionary) getValue());
dlg.setVisible(true);
}
/**
* @param dictionary dictionary
* @deprecated 这个方法只用于兼容8.0下拉框类型控件的插件
* 推荐使用{@link UneditableAccessibleEditor#setValue(java.lang.Object)}
*/
@Deprecated
public void populateBean(Dictionary dictionary) {
this.setValue(dictionary);
}
/**
* @return Dictionary dictionary
* @deprecated 这个方法只用于兼容8.0下拉框类型控件的插件
* 推荐使用{@link UneditableAccessibleEditor#getValue()}
*/
@Deprecated
public Dictionary updateBean() {
return (Dictionary) this.getValue();
}
}

35
designer_base/src/com/fr/design/parameter/ParameterInputPane.java

@ -3,28 +3,10 @@
*/
package com.fr.design.parameter;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.swing.BorderFactory;
import javax.swing.JComponent;
import com.fr.base.Utils;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.SwingConstants;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.StoreProcedureParameter;
import com.fr.base.Utils;
import com.fr.data.impl.storeproc.StoreProcedureConstants;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.dialog.BasicPane;
import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory;
@ -35,10 +17,21 @@ import com.fr.design.editor.editor.Editor;
import com.fr.design.editor.editor.FloatEditor;
import com.fr.design.editor.editor.IntegerEditor;
import com.fr.design.editor.editor.TextEditor;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.Inter;
import com.fr.stable.ParameterProvider;
import com.fr.stable.StringUtils;
import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
/**
* The dialog used to input parameter.
* @editor zhou
@ -130,7 +123,7 @@ public class ParameterInputPane extends BasicPane {
editors[0] = new DateEditor(true, Inter.getLocText("Date"));
} else if (pv instanceof Boolean) {
editors[0] = new BooleanEditor();
} else if (pv instanceof Formula) {
} else if (pv instanceof BaseFormula) {
editors = ValueEditorPaneFactory.basicEditors();
} else {
editors[0] = new TextEditor();

4
designer_base/src/com/fr/design/present/dict/DatabaseDictPane.java

@ -1,6 +1,6 @@
package com.fr.design.present.dict;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.TableData;
import com.fr.data.core.db.DBUtils;
import com.fr.data.impl.DatabaseDictionary;
@ -205,7 +205,7 @@ public class DatabaseDictPane extends FurtherBasicBeanPane<DatabaseDictionary> i
dbDict.setValueColumnIndex(valueColumnIndex);
dbDict.setValueColumnName(valueColumnName);
} else {
dbDict.setFormula(((Formula) value));
dbDict.setFormula(((BaseFormula) value));
}
return dbDict;

10
designer_base/src/com/fr/design/present/dict/FormulaDictPane.java

@ -1,16 +1,14 @@
package com.fr.design.present.dict;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.Formula;
import com.fr.data.impl.FormulaDictionary;
import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.constants.UIConstants;
import com.fr.design.editor.editor.FormulaEditor;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
@ -54,7 +52,7 @@ public class FormulaDictPane extends FurtherBasicBeanPane<FormulaDictionary> {
JPanel t = new JPanel(new BorderLayout());
t.add(tag, BorderLayout.CENTER);
Formula vf = new Formula("$$$");
BaseFormula vf = BaseFormula.createFormulaBuilder().build("$$$");
valueFormulaEditor = new FormulaEditor(StringUtils.EMPTY, vf);
JPanel valueFormulaContainer = new JPanel(new FlowLayout(FlowLayout.RIGHT, LEFT_BORDER, 0));
@ -88,8 +86,8 @@ public class FormulaDictPane extends FurtherBasicBeanPane<FormulaDictionary> {
@Override
public void populateBean(FormulaDictionary dict) {
keyFormulaEditor.setValue(new Formula(dict.getProduceFormula() == null ? StringUtils.EMPTY : dict.getProduceFormula()));
valueFormulaEditor.setValue(new Formula(dict.getExcuteFormula() == null ? StringUtils.EMPTY : dict.getExcuteFormula()));
keyFormulaEditor.setValue(BaseFormula.createFormulaBuilder().build(dict.getProduceFormula() == null ? StringUtils.EMPTY : dict.getProduceFormula()));
valueFormulaEditor.setValue(BaseFormula.createFormulaBuilder().build(dict.getExcuteFormula() == null ? StringUtils.EMPTY : dict.getExcuteFormula()));
}
@Override

4
designer_base/src/com/fr/design/present/dict/TableDataDictPane.java

@ -1,6 +1,6 @@
package com.fr.design.present.dict;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.TableData;
import com.fr.data.TableDataSource;
import com.fr.data.impl.DBTableData;
@ -295,7 +295,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
tableDataDict.setValueColumnIndex(valuleColumnIndex);
tableDataDict.setValueColumnName(valueColumnName);
} else {
tableDataDict.setFormula(((Formula) object));
tableDataDict.setFormula(((BaseFormula) object));
}
TableDataWrapper tableDataWrappe = this.tableDataNameComboBox.getSelectedItem();
if (tableDataWrappe != null) {

11
designer_base/src/com/fr/design/widget/component/DateValuePane.java

@ -1,12 +1,15 @@
package com.fr.design.widget.component;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.editor.editor.*;
import com.fr.design.editor.editor.DateEditor;
import com.fr.design.editor.editor.Editor;
import com.fr.design.editor.editor.FormulaEditor;
import com.fr.design.editor.editor.NoneEditor;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@ -61,7 +64,7 @@ public class DateValuePane extends JPanel {
Editor e = editor[index];
Object value = e.getValue();
if(value == null && ComparatorUtils.equals(FORMULA_EDITOR_NAME, e.getName())){
value = new Formula(StringUtils.EMPTY);
value = BaseFormula.createFormulaBuilder().build();
}
return value;
}

5
designer_base/src/com/fr/design/widget/component/NumberEditorValidatePane.java

@ -254,11 +254,12 @@ public class NumberEditorValidatePane extends JPanel {
minValueSpinner.setEnabled(true);
minValueSpinner.setValue(new Double(e.getMinValue()));
}
errorMsgTextField.setText(e.getRegErrorMessage());
if(e.getMaxValue() == Double.MAX_VALUE || e.getMinValue() == -Double.MAX_VALUE){
if(setMinValueCheckBox.isSelected() || setMaxValueCheckBox.isSelected()){
errorMsgTextFieldPane.setVisible(true);
errorMsgTextField.setText(e.getRegErrorMessage());
}else{
errorMsgTextFieldPane.setVisible(false);
errorMsgTextField.setText(StringUtils.EMPTY);
}
}

64
designer_base/src/com/fr/design/write/submit/DBManipulationPane.java

@ -1,46 +1,7 @@
package com.fr.design.write.submit;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridLayout;
import java.awt.Image;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Date;
import java.util.EventObject;
import java.util.List;
import javax.swing.AbstractCellEditor;
import javax.swing.BorderFactory;
import javax.swing.DefaultCellEditor;
import javax.swing.DefaultComboBoxModel;
import javax.swing.Icon;
import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.JTree;
import javax.swing.ListSelectionModel;
import javax.swing.SwingUtilities;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableColumn;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.DefaultTreeModel;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.Formula;
import com.fr.base.Parameter;
import com.fr.data.DataConstants;
import com.fr.data.condition.JoinCondition;
@ -86,6 +47,27 @@ import com.fr.write.config.InsertConfig;
import com.fr.write.config.IntelliDMLConfig;
import com.fr.write.config.UpdateConfig;
import javax.swing.*;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableColumn;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.DefaultTreeModel;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Date;
import java.util.EventObject;
import java.util.List;
//august:这个东西应该分成两类,一类是有单元格的情况,一类是没有单元格的情况
public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
private static final Image ICODS_IMAGE = BaseUtils.readImage("/com/fr/web/core/css/images/icons.png");
@ -752,7 +734,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
String columnName = column.getColumnName();
if (!acceptPara && column.getColumnValue() instanceof Parameter) {
// 表单中,将以前的参数转换为公式
column.setColumnValue(new Formula(((Parameter)column.getColumnValue()).getName()));
column.setColumnValue(BaseFormula.createFormulaBuilder().build(((Parameter)column.getColumnValue()).getName()));
}
KeyColumnNameValue newColumnNameValue = new KeyColumnNameValue(column.isKey(), new ColumnName(columnName), new ColumnValue(column.getColumnValue()),

78
designer_base/src/com/fr/start/BaseDesigner.java

@ -63,14 +63,15 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
public BaseDesigner(String[] args) {
init(args);
}
private void init(String[] args) {
RestartHelper.deleteRecordFilesWhenStart();
ConfigManagerFactory.registerConfigManagerProxy(new ConfigManagerCreatorProxy());
//启动core
BuildContext.setBuildFilePath(buildPropertiesPath());
Register.load();
//标记一下是设计器启动
PluginConversionModule.getInstance().markDesignerStart();
SiteCenter.getInstance();
if (isDebug()) {
setDebugEnv();
@ -83,6 +84,11 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
return;
}
Register.load();
//标记一下是设计器启动
PluginConversionModule.getInstance().markDesignerStart();
SiteCenter.getInstance();
//下面这两句的位置不能随便调换,因为会影响语言切换的问题
initLanguage();
@ -99,6 +105,10 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
}
}
}
initLookAndFeel(args, splashWindow);
}
private void initLookAndFeel(String[] args, SplashWindow splashWindow) {
// 初始化look and feel.这个在预加载之前执行是因为lookAndFeel里的东西,预加载时也要用到
DesignUtils.initLookAndFeel();
@ -199,7 +209,8 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
//在VM options里加入-Ddebug=true激活
private boolean isDebug() {
return "true".equals(System.getProperty("debug"));
return ComparatorUtils.equals("true", System.getProperty("debug"));
}
private static final int DEBUG_PORT = 51463;
@ -250,32 +261,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
file = FILEFactory.createFILE(FILEFactory.ENV_PREFIX
+ DesignerEnvManager.getEnvManager().getLastOpenFile());
}
//启动时打开指定文件的接口
DesignerStartOpenFileProcessor processor = ExtraDesignClassManager.getInstance().getSingle(DesignerStartOpenFileProcessor.XML_TAG);
if (processor != null) {
FILE f = processor.fileToShow();
if (f != null) {
file = f;//避免null
} else {
isException = true;//此时有文件nullpointer异常,执行打开空文件
}
}
if (file.exists() && !isException) {
df.openTemplate(file);
} else {
df.addAndActivateJTemplate();
MutilTempalteTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
}
if (OperatingSystem.isMacOS()) {
enableFullScreenMode(df);
}
df.addWindowListener(new WindowAdapter() {
public void windowOpened(WindowEvent e) {
df.getSelectedJTemplate().requestGridFocus();
}
});
df.setVisible(true);
isException = openFile(df, isException, file);
} catch (Exception e) {
FRLogger.getLogger().error(e.getMessage(), e);
if (!isException) {
@ -286,6 +272,36 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
}
}
private boolean openFile(final DesignerFrame df, boolean isException, FILE file) {
//启动时打开指定文件的接口
DesignerStartOpenFileProcessor processor = ExtraDesignClassManager.getInstance().getSingle(DesignerStartOpenFileProcessor.XML_TAG);
if (processor != null) {
FILE f = processor.fileToShow();
if (f != null) {
file = f;//避免null
} else {
isException = true;//此时有文件nullpointer异常,执行打开空文件
}
}
if (file.exists() && !isException) {
df.openTemplate(file);
} else {
df.addAndActivateJTemplate();
MutilTempalteTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
}
if (OperatingSystem.isMacOS()) {
enableFullScreenMode(df);
}
df.addWindowListener(new WindowAdapter() {
public void windowOpened(WindowEvent e) {
df.getSelectedJTemplate().requestGridFocus();
}
});
df.setVisible(true);
return isException;
}
/**
* @param window

6
designer_chart/src/com/fr/design/chart/ChartSwingUtils.java

@ -1,6 +1,6 @@
package com.fr.design.chart;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Utils;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.formula.FormulaFactory;
@ -58,10 +58,10 @@ public class ChartSwingUtils {
private static void showFormulaPane(final UITextField jTextField, final OKListener l) {
final UIFormula formulaPane = FormulaFactory.createFormulaPane();
formulaPane.populate(new Formula(jTextField.getText()));
formulaPane.populate(BaseFormula.createFormulaBuilder().build(jTextField.getText()));
formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane()), new DialogActionAdapter(){
public void doOk() {
Formula formula = formulaPane.update();
BaseFormula formula = formulaPane.update();
jTextField.setText(Utils.objectToString(formula));
if (l != null) {
l.action();

8
designer_chart/src/com/fr/design/chart/axis/ChartAlertValuePane.java

@ -1,6 +1,6 @@
package com.fr.design.chart.axis;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Utils;
import com.fr.chart.chartattr.ChartAlertValue;
import com.fr.design.beans.BasicBeanPane;
@ -162,10 +162,10 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
private void showFormulaPane() {
final UIFormula formulaPane = FormulaFactory.createFormulaPane();
formulaPane.populate(new Formula(textField.getText()));
formulaPane.populate(BaseFormula.createFormulaBuilder().build(textField.getText()));
formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(ChartAlertValuePane.this), new DialogActionAdapter(){
public void doOk() {
Formula formula = formulaPane.update();
BaseFormula formula = formulaPane.update();
textField.setText(Utils.objectToString(formula));
}
}).setVisible(true);
@ -206,7 +206,7 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
public void updateBean(ChartAlertValue chartAlertValue) {
chartAlertValue.setAlertValueFormula(new Formula(textField.getText()));
chartAlertValue.setAlertValueFormula(BaseFormula.createFormulaBuilder().build(textField.getText()));
chartAlertValue.getLineColor().setSeriesColor(colorBox.getSelectObject());
chartAlertValue.getLineStyle().setLineStyle(lineCombo.getSelectedLineStyle());
chartAlertValue.setAlertLineAlpha(alphaPane.update());

14
designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java

@ -1,6 +1,6 @@
package com.fr.design.chart.axis;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.chart.base.ChartBaseUtils;
import com.fr.chart.chartattr.Axis;
import com.fr.design.chart.ChartSwingUtils;
@ -147,13 +147,13 @@ public class MinMaxValuePane extends JPanel {
// 最大最小值
if (minCheckBox.isSelected()) {
axis.setCustomMinValue(StringUtils.isNotEmpty(minValueField.getText()));
axis.setMinValue(new Formula(minValueField.getText()));
axis.setMinValue(BaseFormula.createFormulaBuilder().build(minValueField.getText()));
} else {
axis.setCustomMinValue(false);
}
if (maxCheckBox.isSelected()) {
axis.setCustomMaxValue(StringUtils.isNotEmpty(maxValueField.getText()));
axis.setMaxValue(new Formula(maxValueField.getText()));
axis.setMaxValue(BaseFormula.createFormulaBuilder().build(maxValueField.getText()));
} else {
axis.setCustomMaxValue(false);
}
@ -170,10 +170,10 @@ public class MinMaxValuePane extends JPanel {
axis.setMainUnit(null);
} else {
axis.setCustomMainUnit(true);
Formula formula = new Formula(increment);
BaseFormula formula = BaseFormula.createFormulaBuilder().build(increment);
Number number = ChartBaseUtils.formula2Number(formula);
if(number != null && number.doubleValue() < 0) {
axis.setMainUnit(new Formula("10"));
axis.setMainUnit(BaseFormula.createFormulaBuilder().build("10"));
} else {
axis.setMainUnit(formula);
}
@ -189,10 +189,10 @@ public class MinMaxValuePane extends JPanel {
axis.setSecUnit(null);
} else {
axis.setCustomSecUnit(true);
Formula formula = new Formula(increment);
BaseFormula formula = BaseFormula.createFormulaBuilder().build(increment);
Number number = ChartBaseUtils.formula2Number(formula);
if(number != null && number.doubleValue() < 0) {
axis.setSecUnit(new Formula("10"));
axis.setSecUnit(BaseFormula.createFormulaBuilder().build("10"));
} else {
axis.setSecUnit(formula);
}

30
designer_chart/src/com/fr/design/chart/report/GisMapReportDataContentPane.java

@ -1,26 +1,13 @@
package com.fr.design.chart.report;
import java.awt.*;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Utils;
import com.fr.chart.chartdata.BaseSeriesDefinition;
import com.fr.chart.chartdata.GisMapReportDefinition;
import com.fr.chart.chartdata.SeriesDefinition;
import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.constants.UIConstants;
import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import com.fr.design.formula.TinyFormulaPane;
@ -35,6 +22,15 @@ import com.fr.general.Inter;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.util.ArrayList;
import java.util.List;
/**
* 属性表gis地图单元格数据源设置界面
*
@ -179,7 +175,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane<GisMapRepo
return null;
}
if (StableUtils.canBeFormula(address)) {
reportDefinition.setCategoryName(new Formula(address));
reportDefinition.setCategoryName(BaseFormula.createFormulaBuilder().build(address));
} else {
reportDefinition.setCategoryName(address);
}
@ -200,7 +196,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane<GisMapRepo
Object value = objects[1];
if (StableUtils.canBeFormula(value)) {
value = new Formula(Utils.objectToString(value));
value = BaseFormula.createFormulaBuilder().build(value);
}
SeriesDefinition definition = new SeriesDefinition(name, value);
reportDefinition.addTitleValue(definition);

26
designer_chart/src/com/fr/design/chart/report/MapMoreReportIndexPane.java

@ -1,25 +1,12 @@
package com.fr.design.chart.report;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.JTable;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Utils;
import com.fr.chart.chartdata.BaseSeriesDefinition;
import com.fr.chart.chartdata.MapSingleLayerReportDefinition;
import com.fr.chart.chartdata.SeriesDefinition;
import com.fr.design.constants.UIConstants;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.constants.UIConstants;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import com.fr.design.formula.TinyFormulaPane;
@ -31,6 +18,13 @@ import com.fr.general.Inter;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import javax.swing.*;
import java.awt.*;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.util.ArrayList;
import java.util.List;
/**
* 多层地图, 单元格, 多层切换 单界面.
* @author kunsnat E-mail:kunsnat@gmail.com
@ -98,7 +92,7 @@ public class MapMoreReportIndexPane extends BasicBeanPane<MapSingleLayerReportDe
String areaName = areaNamePane.updateBean();
if(StableUtils.canBeFormula(areaName)) {
definition.setCategoryName(new Formula(areaName));
definition.setCategoryName(BaseFormula.createFormulaBuilder().build(areaName));
} else {
definition.setCategoryName(areaName);
}

33
designer_chart/src/com/fr/design/chart/report/MapReportDataSinglePane.java

@ -1,28 +1,12 @@
package com.fr.design.chart.report;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Utils;
import com.fr.chart.chartdata.BaseSeriesDefinition;
import com.fr.chart.chartdata.MapSingleLayerReportDefinition;
import com.fr.chart.chartdata.SeriesDefinition;
import com.fr.design.constants.UIConstants;
import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.constants.UIConstants;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import com.fr.design.formula.TinyFormulaPane;
@ -33,6 +17,15 @@ import com.fr.design.gui.itextfield.UITextField;
import com.fr.general.Inter;
import com.fr.stable.StableUtils;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.util.ArrayList;
import java.util.List;
/**
* 地图 单元格数据 单层地图 界面
*
@ -118,7 +111,7 @@ public class MapReportDataSinglePane extends FurtherBasicBeanPane<MapSingleLayer
String areaName = areaNamePane.updateBean();
if(StableUtils.canBeFormula(areaName)) {
reportDefinition.setCategoryName(new Formula(areaName));
reportDefinition.setCategoryName(BaseFormula.createFormulaBuilder().build(areaName));
} else {
reportDefinition.setCategoryName(areaName);
}
@ -131,7 +124,7 @@ public class MapReportDataSinglePane extends FurtherBasicBeanPane<MapSingleLayer
Object value = objects[1];
if (StableUtils.canBeFormula(value)) {
value = new Formula(Utils.objectToString(value));
value = BaseFormula.createFormulaBuilder().build(value);
}
SeriesDefinition definition = new SeriesDefinition(name, value);
reportDefinition.addTitleValue(definition);

6
designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java

@ -1,6 +1,6 @@
package com.fr.design.mainframe.chart.gui.data.report;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Utils;
import com.fr.chart.chartattr.ChartCollection;
import com.fr.chart.chartdata.NormalReportDataDefinition;
@ -140,7 +140,7 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane<ChartC
return null;
}
return StableUtils.canBeFormula(object) ? new Formula(object.toString()) : object.toString();
return StableUtils.canBeFormula(object) ? BaseFormula.createFormulaBuilder().build(object) : object.toString();
}
protected class InnerTableEditor extends UITableEditor {
@ -179,7 +179,7 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane<ChartC
}
@Override
protected void populateTextField(Formula fm) {
protected void populateTextField(BaseFormula fm) {
formulaTextField.setText(fm.getContent());
}
};

4
designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java

@ -1,6 +1,6 @@
package com.fr.design.mainframe.chart.gui.data.report;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.chart.chartdata.TopDefinitionProvider;
import com.fr.chart.chartattr.Bar2DPlot;
import com.fr.chart.chartattr.ChartCollection;
@ -60,7 +60,7 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
}
@Override
protected void populateTextField(Formula fm) {
protected void populateTextField(BaseFormula fm) {
formulaTextField.setText(fm.getContent());
}

4
designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java

@ -4,7 +4,7 @@
package com.fr.design.mainframe.chart.gui.other;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartdata.TopDefinition;
import com.fr.design.mainframe.chart.gui.ChartOtherPane;
@ -31,7 +31,7 @@ public class ChartDesignerInteractivePane extends ChartInteractivePane {
protected List<ChartUIMenuNameableCreator> refreshList(HashMap map) {
List<ChartUIMenuNameableCreator> list = new ArrayList<ChartUIMenuNameableCreator>();
java.util.HashMap<String, Formula> hyperLinkEditorMap = plot.getHyperLinkEditorMap();
java.util.HashMap<String, BaseFormula> hyperLinkEditorMap = plot.getHyperLinkEditorMap();
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Hyperlink-Web_link"),
new WebHyperlink(), getUseMap(map, WebHyperlink.class)));

4
designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java

@ -1,7 +1,7 @@
package com.fr.design.mainframe.chart.gui.other;
import com.fr.base.BaseFormula;
import com.fr.base.CoreDecimalFormat;
import com.fr.base.Formula;
import com.fr.base.Style;
import com.fr.base.chart.chartdata.TopDefinitionProvider;
import com.fr.chart.base.AttrContents;
@ -854,7 +854,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
protected List<ChartUIMenuNameableCreator> refreshList(HashMap map) {
List<ChartUIMenuNameableCreator> list = new ArrayList<ChartUIMenuNameableCreator>();
java.util.HashMap<String, Formula> hyperLinkEditorMap = plot.getHyperLinkEditorMap();
java.util.HashMap<String, BaseFormula> hyperLinkEditorMap = plot.getHyperLinkEditorMap();
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Reportlet"),
new ReportletHyperlink(), getUseMap(map, ReportletHyperlink.class)));

25
designer_chart/src/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java

@ -1,7 +1,7 @@
package com.fr.design.mainframe.chart.gui.other;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.Formula;
import com.fr.base.Utils;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.base.TimeSwitchAttr;
@ -22,7 +22,12 @@ import com.fr.general.Inter;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@ -85,10 +90,10 @@ public class TimeSwitchPane extends JPanel implements UIObserver {
private void initTablePane(){
tablePane = new JPanel(new TableLayout());
tablePane.add(new TimeTickBox(new Formula("1"),ChartConstants.MONTH_TYPE));
tablePane.add(new TimeTickBox(new Formula("3"),ChartConstants.MONTH_TYPE));
tablePane.add(new TimeTickBox(new Formula("6"),ChartConstants.MONTH_TYPE));
tablePane.add(new TimeTickBox(new Formula("1"), ChartConstants.YEAR_TYPE));
tablePane.add(new TimeTickBox(BaseFormula.createFormulaBuilder().build("1"),ChartConstants.MONTH_TYPE));
tablePane.add(new TimeTickBox(BaseFormula.createFormulaBuilder().build("3"),ChartConstants.MONTH_TYPE));
tablePane.add(new TimeTickBox(BaseFormula.createFormulaBuilder().build("6"),ChartConstants.MONTH_TYPE));
tablePane.add(new TimeTickBox(BaseFormula.createFormulaBuilder().build("1"), ChartConstants.YEAR_TYPE));
tablePane.revalidate();
}
@ -111,7 +116,7 @@ public class TimeSwitchPane extends JPanel implements UIObserver {
return new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
tablePane.add(new TimeTickBox(new Formula(),ChartConstants.YEAR_TYPE));
tablePane.add(new TimeTickBox(BaseFormula.createFormulaBuilder().build(),ChartConstants.YEAR_TYPE));
tablePane.revalidate();
fireChange();
}
@ -150,7 +155,7 @@ public class TimeSwitchPane extends JPanel implements UIObserver {
continue;
}
TimeTickBox box =(TimeTickBox) component;
timeMap.add(new TimeSwitchAttr(new Formula(box.mainUnitField.getText()),VALUES.get(box.mainType.getSelectedItem())));
timeMap.add(new TimeSwitchAttr(BaseFormula.createFormulaBuilder().build(box.mainUnitField.getText()),VALUES.get(box.mainType.getSelectedItem())));
}
}
@ -267,7 +272,7 @@ public class TimeSwitchPane extends JPanel implements UIObserver {
private UIComboBox mainType;
private UIButton delButton;
public TimeTickBox(Formula time,int unit){
public TimeTickBox(BaseFormula time,int unit){
this.setLayout(new FlowLayout(FlowLayout.CENTER, 4, 0));
mainUnitField = new UITextField(time.toString());
mainUnitField.setEditable(false);
@ -310,7 +315,7 @@ public class TimeSwitchPane extends JPanel implements UIObserver {
private void showFormulaPane(final UITextField jTextField) {
final UIFormula formulaPane = FormulaFactory.createFormulaPane();
final String original = jTextField.getText();
formulaPane.populate(new Formula(original));
formulaPane.populate(BaseFormula.createFormulaBuilder().build(original));
BasicDialog dlg = formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(TimeSwitchPane.this), new DialogActionAdapter() {
public void doOk() {
String newText = Utils.objectToString(formulaPane.update());

38
designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java

@ -1,23 +1,13 @@
package com.fr.design.mainframe.chart.gui.style;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import javax.swing.JPanel;
import javax.swing.SpinnerNumberModel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Style;
import com.fr.base.Utils;
import com.fr.chart.base.ChartBaseUtils;
import com.fr.chart.base.TextAttr;
import com.fr.chart.chartattr.Axis;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import com.fr.design.gui.icheckbox.UICheckBox;
@ -28,9 +18,17 @@ import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.gui.style.NumberDragBar;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.dialog.BasicPane;
import com.fr.general.Inter;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
public class ChartAxisLabelPane extends BasicPane implements UIObserver{
private static final int LABEL_INTERVAL = 0;
private static final int LABEL_WRAP =1;
@ -330,7 +328,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
}
}
private int getLabelSampleNumber(Formula formula) {
private int getLabelSampleNumber(BaseFormula formula) {
Number number = ChartBaseUtils.formula2Number(formula);
if (number != null) {
int num = number.intValue();
@ -339,7 +337,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
return 0;
}
private boolean isWrapShow(Formula formula){
private boolean isWrapShow(BaseFormula formula){
Number number = ChartBaseUtils.formula2Number(formula);
return number == null;
}
@ -423,20 +421,20 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
private void update4Normal(Axis axis){
if (labelSampleChoose.getSelectedIndex() == 0) {
axis.setLabelIntervalNumber(new Formula("0"));
axis.setLabelIntervalNumber(BaseFormula.createFormulaBuilder().build("0"));
} else {
axis.setLabelIntervalNumber(new Formula(customLabelSamleTime.getText()));
axis.setLabelIntervalNumber(BaseFormula.createFormulaBuilder().build(customLabelSamleTime.getText()));
}
}
private void update4Wrap(Axis axis){
if (showWay.getSelectedIndex() == LABEL_WRAP) {
axis.setLabelIntervalNumber(new Formula());
axis.setLabelIntervalNumber(BaseFormula.createFormulaBuilder().build());
} else if (showWay.getSelectedIndex() == LABEL_INTERVAL) {
if (auto.isSelected()) {
axis.setLabelIntervalNumber(new Formula("0"));
axis.setLabelIntervalNumber(BaseFormula.createFormulaBuilder().build("0"));
} else if (custom.isSelected()) {
axis.setLabelIntervalNumber(new Formula(customLabelSamleTime.getText()));
axis.setLabelIntervalNumber(BaseFormula.createFormulaBuilder().build(customLabelSamleTime.getText()));
}
}
}

6
designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartAxisTitlePane.java

@ -1,19 +1,19 @@
package com.fr.design.mainframe.chart.gui.style;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.Formula;
import com.fr.base.Style;
import com.fr.base.Utils;
import com.fr.chart.chartattr.Axis;
import com.fr.chart.chartattr.Title;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.formula.TinyFormulaPane;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.dialog.BasicPane;
import com.fr.general.FRFont;
import com.fr.general.Inter;
import com.fr.stable.Constants;
@ -109,7 +109,7 @@ public class ChartAxisTitlePane extends BasicPane{
title.getTextAttr().setAlignText(Style.VERTICALTEXT);
}
if(StableUtils.canBeFormula(axisTitleContentPane.updateBean())) {
title.setTextObject(new Formula(axisTitleContentPane.updateBean()));
title.setTextObject(BaseFormula.createFormulaBuilder().build(axisTitleContentPane.updateBean()));
} else {
title.setTextObject(axisTitleContentPane.updateBean());
}

23
designer_chart/src/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java

@ -1,6 +1,6 @@
package com.fr.design.mainframe.chart.gui.style;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Utils;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.CategoryAxis;
@ -28,7 +28,12 @@ import com.fr.stable.StringUtils;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.text.ParseException;
import java.util.Date;
import java.util.HashMap;
@ -194,7 +199,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
private void showFormulaPane(final UITextField jTextField) {
final UIFormula formulaPane = FormulaFactory.createFormulaPane();
formulaPane.populate(new Formula(jTextField.getText()));
formulaPane.populate(BaseFormula.createFormulaBuilder().build(jTextField.getText()));
BasicDialog dlg = formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(DateAxisValuePane.this), new DialogActionAdapter() {
public void doOk() {
jTextField.setText(Utils.objectToString(formulaPane.update()));
@ -214,7 +219,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
private void updateMain(CategoryAxis axis) {
if (mainTickBox.isSelected() && StringUtils.isNotEmpty(mainUnitField.getText())) {
axis.setCustomMainUnit(true);
axis.setMainUnit(new Formula(mainUnitField.getText()));
axis.setMainUnit(BaseFormula.createFormulaBuilder().build(mainUnitField.getText()));
axis.setMainType(VALUES.get(mainType.getSelectedItem()));
} else {
axis.setCustomMainUnit(false);
@ -305,7 +310,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
//最小值
if (minCheckBox.isSelected()) {
if(minValueField.getCurrentEditor() instanceof FormulaEditor){
Formula min = (Formula)minValueField.update();
BaseFormula min = (BaseFormula) minValueField.update();
axis.setMinValue(min);
axis.setCustomMinValue(!StringUtils.isEmpty(min.getPureContent()));
}else{
@ -313,7 +318,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
DateEditor dateEditor = (DateEditor)minValueField.getCurrentEditor();
String dateString = dateEditor.getUIDatePickerFormat().format(datetmp);
axis.setCustomMinValue(!StringUtils.isEmpty(dateString));
axis.setMinValue(new Formula(dateString));
axis.setMinValue(BaseFormula.createFormulaBuilder().build(dateString));
}
} else {
axis.setCustomMinValue(false);
@ -322,7 +327,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
//最大值
if (maxCheckBox.isSelected()) {
if(maxValueField.getCurrentEditor() instanceof FormulaEditor){
Formula max = (Formula)maxValueField.update();
BaseFormula max = (BaseFormula) maxValueField.update();
axis.setMaxValue(max);
axis.setCustomMaxValue(!StringUtils.isEmpty(max.getPureContent()));
}else{
@ -330,7 +335,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
DateEditor dateEditor = (DateEditor)maxValueField.getCurrentEditor();
String dateString = dateEditor.getUIDatePickerFormat().format(datetmp);
axis.setCustomMaxValue(!StringUtils.isEmpty(dateString));
axis.setMaxValue(new Formula(dateString));
axis.setMaxValue(BaseFormula.createFormulaBuilder().build(dateString));
}
} else {
axis.setCustomMaxValue(false);
@ -345,7 +350,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
}
//将从formula读出来的内容转化为指定格式的日期
private static final Date getDateFromFormula(Formula dateFormula){
private static final Date getDateFromFormula(BaseFormula dateFormula){
String dateStr = dateFormula.getPureContent();
dateStr = Pattern.compile("\"").matcher(dateStr).replaceAll(StringUtils.EMPTY);
Date toDate = DateUtils.string2Date(dateStr, true);

6
designer_chart/src/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java

@ -1,6 +1,6 @@
package com.fr.design.mainframe.chart.gui.style.axis;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Utils;
import com.fr.chart.base.ChartBaseUtils;
import com.fr.chart.base.ChartConstants;
@ -280,11 +280,11 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
numberAxis.setLogBase(null);
} else {
numberAxis.setLog(true);
Formula formula = new Formula(increment);
BaseFormula formula = BaseFormula.createFormulaBuilder().build(increment);
Number number = ChartBaseUtils.formula2Number(formula);
// 界面处理防止 遇到 对数增量为小于1的值.
if (number != null && number.doubleValue() <= 1.0) {
numberAxis.setLogBase(new Formula("2"));
numberAxis.setLogBase(BaseFormula.createFormulaBuilder().build("2"));
} else {
numberAxis.setLogBase(formula);
}

24
designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java

@ -1,6 +1,6 @@
package com.fr.design.mainframe.chart.gui.style.series;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.chart.base.AreaColor;
import com.fr.chart.base.ChartBaseUtils;
import com.fr.chart.chartglyph.MapHotAreaColor;
@ -465,7 +465,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
private class TextFieldGroupPane extends JPanel {
private static final long serialVersionUID = -8390474551829486013L;
public void refreshTextGroupPane(Formula[] values) {
public void refreshTextGroupPane(BaseFormula[] values) {
if (values.length == textFieldList.size()) {
for (int i = 0; i < textFieldList.size(); i++) {
@ -519,13 +519,13 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
if(i == size - 1) {
backValue = -Double.MAX_VALUE;
} else {
Number backNumber = ChartBaseUtils.formula2Number(new Formula(getValue4Index(i+1)));
Number backNumber = ChartBaseUtils.formula2Number(BaseFormula.createFormulaBuilder().build(getValue4Index(i+1)));
if(backNumber != null){
backValue = backNumber.doubleValue();
}
}
Number number = ChartBaseUtils.formula2Number(new Formula(getValue4Index(i)));
Number number = ChartBaseUtils.formula2Number(BaseFormula.createFormulaBuilder().build(getValue4Index(i)));
if(number != null) {
double value = number.doubleValue();
@ -633,7 +633,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
* @param colorArray 颜色值
* @param valueArray 值区间
*/
public void refreshGroupPane(Color[] colorArray, Formula[] valueArray) {
public void refreshGroupPane(Color[] colorArray, BaseFormula[] valueArray) {
colorGroup.refreshColorGroupPane(colorArray);
textGroup.refreshTextGroupPane(valueArray);
@ -657,7 +657,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
UIColorPickerPane.this.add(textGroup);
UIColorPickerPane.this.add(colorGroup);
Color[] colors = hotAreaColor.initColor();
Formula[] values = hotAreaColor.initValues();
BaseFormula[] values = hotAreaColor.initValues();
refreshGroupPane(colors, values);
this.initContainerLister();
regionNumPane.populateBean(value);
@ -686,7 +686,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
}
hotAreaColor.clearColor();
Color[] colors = getColors4Custom(fillStyleCombox.getSelectObject(), regionNumPane.updateBean().intValue());
Formula[] value = getValueArray(regionNumPane.updateBean().intValue());
BaseFormula[] value = getValueArray(regionNumPane.updateBean().intValue());
for (int i = 0; i < colors.length; i++) {
hotAreaColor.addAreaColor(new AreaColor(value[i], value[i + 1], colors[i]));
@ -705,7 +705,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
if(StringUtils.isEmpty(getValue4Index(i))){
return false;
}
Number number = ChartBaseUtils.formula2Number(new Formula(getValue4Index(i)));
Number number = ChartBaseUtils.formula2Number(BaseFormula.createFormulaBuilder().build(getValue4Index(i)));
if(number != null) {
double value = number.doubleValue();
if(value > maxValue) {
@ -739,13 +739,13 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
return ChartBaseUtils.createColorsWithHSB(color, sum);
}
private Formula[] getValueArray(int count) {
Formula[] valueArray = new Formula[count + 1];
private BaseFormula[] getValueArray(int count) {
BaseFormula[] valueArray = new BaseFormula[count + 1];
for (int i = 0; i < valueArray.length; i++) {
if (i >= textFieldList.size()) {
valueArray[i] = new Formula(new Double((count + 1 - i) * VALUE).toString());
valueArray[i] = BaseFormula.createFormulaBuilder().build((count + 1 - i) * VALUE);
} else {
valueArray[i] = new Formula(getValue4Index(i));
valueArray[i] = BaseFormula.createFormulaBuilder().build(getValue4Index(i));
}
}
return valueArray;

24
designer_chart/src/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java

@ -1,22 +1,14 @@
package com.fr.design.mainframe.chart.gui.style.title;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.Icon;
import javax.swing.JPanel;
import javax.swing.JSeparator;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.Formula;
import com.fr.base.Utils;
import com.fr.chart.base.TextAttr;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.Title;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.dialog.BasicScrollPane;
import com.fr.design.formula.TinyFormulaPane;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.icheckbox.UICheckBox;
@ -27,12 +19,16 @@ import com.fr.design.mainframe.chart.PaneTitleConstants;
import com.fr.design.mainframe.chart.gui.style.ChartBackgroundNoImagePane;
import com.fr.design.mainframe.chart.gui.style.ChartBorderPane;
import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
import com.fr.design.dialog.BasicScrollPane;
import com.fr.general.Inter;
import com.fr.stable.Constants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class ChartTitlePane extends BasicScrollPane<Chart> {
private static final long serialVersionUID = 5748881235830708722L;
private UICheckBox isTitleVisable;
@ -148,8 +144,8 @@ public class ChartTitlePane extends BasicScrollPane<Chart> {
return;
}
isTitleVisable.setSelected(title.isTitleVisible());
if (title.getTextObject() instanceof Formula) {
titleContent.populateBean(((Formula) title.getTextObject()).getContent());
if (title.getTextObject() instanceof BaseFormula) {
titleContent.populateBean(((BaseFormula) title.getTextObject()).getContent());
} else {
titleContent.populateBean(Utils.objectToString(title.getTextObject()));
}
@ -178,7 +174,7 @@ public class ChartTitlePane extends BasicScrollPane<Chart> {
String titleString = titleContent.updateBean();
Object titleObj;
if (StableUtils.maybeFormula(titleString)) {
titleObj = new Formula(titleString);
titleObj = BaseFormula.createFormulaBuilder().build(titleString);
} else {
titleObj = titleString;
}

14
designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java

@ -1,6 +1,6 @@
package com.fr.plugin.chart.designer.other;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Utils;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.Plot;
@ -296,13 +296,13 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
zoomWidget.setSelectedIndex(zoom.isZoomVisible() ? 0 : 1);
zoomGesture.setSelectedIndex(zoom.isZoomGesture() ? 0 : 1);
zoomResize.setSelectedIndex(zoom.isZoomResize() ? 0 : 1);
if (zoom.getFrom() instanceof Formula) {
from.populateBean(((Formula) zoom.getFrom()).getContent());
if (zoom.getFrom() instanceof BaseFormula) {
from.populateBean(((BaseFormula) zoom.getFrom()).getContent());
} else {
from.populateBean(Utils.objectToString(zoom.getFrom()));
}
if (zoom.getTo() instanceof Formula) {
to.populateBean(((Formula) zoom.getTo()).getContent());
if (zoom.getTo() instanceof BaseFormula) {
to.populateBean(((BaseFormula) zoom.getTo()).getContent());
} else {
to.populateBean(Utils.objectToString(zoom.getTo()));
}
@ -381,7 +381,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
String fromString = from.updateBean();
Object fromObject;
if (StableUtils.maybeFormula(fromString)) {
fromObject = new Formula(fromString);
fromObject = BaseFormula.createFormulaBuilder().build(fromString);
} else {
fromObject = fromString;
}
@ -389,7 +389,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
String toString = to.updateBean();
Object toObject;
if (StableUtils.maybeFormula(toString)) {
toObject = new Formula(toString);
toObject = BaseFormula.createFormulaBuilder().build(toString);
} else {
toObject = toString;
}

8
designer_chart/src/com/fr/plugin/chart/designer/style/VanChartTitlePane.java

@ -1,7 +1,7 @@
package com.fr.plugin.chart.designer.style;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.Formula;
import com.fr.base.Style;
import com.fr.base.Utils;
import com.fr.chart.base.TextAttr;
@ -272,8 +272,8 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
return;
}
isTitleVisible.setSelected(title.isTitleVisible());
if (title.getTextObject() instanceof Formula) {
titleContent.populateBean(((Formula) title.getTextObject()).getContent());
if (title.getTextObject() instanceof BaseFormula) {
titleContent.populateBean(((BaseFormula) title.getTextObject()).getContent());
} else {
titleContent.populateBean(Utils.objectToString(title.getTextObject()));
}
@ -313,7 +313,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
String titleString = titleContent.updateBean();
Object titleObj;
if (StableUtils.maybeFormula(titleString)) {
titleObj = new Formula(titleString);
titleObj = BaseFormula.createFormulaBuilder().build(titleString);
} else {
titleObj = titleString;
}

12
designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java

@ -1,7 +1,7 @@
package com.fr.plugin.chart.designer.style.axis;
import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.Formula;
import com.fr.base.Utils;
import com.fr.chart.base.TextAttr;
import com.fr.chart.chartattr.Title;
@ -428,8 +428,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
private void populateTitle(VanChartAxis axis){
Title axisTitle = axis.getTitle();
if(axisTitle != null){
if (axisTitle.getTextObject() instanceof Formula && titleContent != null) {
titleContent.populateBean(((Formula) axisTitle.getTextObject()).getContent());
if (axisTitle.getTextObject() instanceof BaseFormula && titleContent != null) {
titleContent.populateBean(((BaseFormula) axisTitle.getTextObject()).getContent());
} else if(titleContent != null){
titleContent.populateBean(Utils.objectToString(axisTitle.getTextObject()));
}
@ -547,7 +547,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
String titleString = titleContent.updateBean();
Object titleObj;
if (StableUtils.maybeFormula(titleString)) {
titleObj = new Formula(titleString);
titleObj = BaseFormula.createFormulaBuilder().build(titleString);
} else {
titleObj = titleString;
}
@ -586,9 +586,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
}
if(labelGapValue != null){
if(axis.isAutoLabelGap()){
axis.setLabelIntervalNumber(new Formula("1"));
axis.setLabelIntervalNumber(BaseFormula.createFormulaBuilder().build("1"));
} else {
axis.setLabelIntervalNumber(new Formula(labelGapValue.getText()));
axis.setLabelIntervalNumber(BaseFormula.createFormulaBuilder().build(labelGapValue.getText()));
}
}
}

16
designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartTimeAxisPane.java

@ -1,6 +1,6 @@
package com.fr.plugin.chart.designer.style.axis;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Utils;
import com.fr.design.chart.ChartSwingUtils;
import com.fr.design.editor.ValueEditorPane;
@ -267,7 +267,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
public void update(VanChartTimeAxis timeAxis){
if (minCheckBox.isSelected()) {//最小值
if(minValueField.getCurrentEditor() instanceof FormulaEditor){
Formula min = (Formula)minValueField.update();
BaseFormula min = (BaseFormula) minValueField.update();
timeAxis.setMinValue(min);
timeAxis.setCustomMinValue(StringUtils.isNotEmpty(min.getPureContent()));
}else{
@ -275,14 +275,14 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
DateEditor dateEditor = (DateEditor)minValueField.getCurrentEditor();
String dateString = dateEditor.getUIDatePickerFormat().format(datetmp);
timeAxis.setCustomMinValue(StringUtils.isNotEmpty(dateString));
timeAxis.setMinValue(new Formula(dateString));
timeAxis.setMinValue(BaseFormula.createFormulaBuilder().build(dateString));
}
} else {
timeAxis.setCustomMinValue(false);
}
if (maxCheckBox.isSelected()) {//最大值
if(maxValueField.getCurrentEditor() instanceof FormulaEditor){
Formula max = (Formula)maxValueField.update();
BaseFormula max = (BaseFormula) maxValueField.update();
timeAxis.setMaxValue(max);
timeAxis.setCustomMaxValue(StringUtils.isNotEmpty(max.getPureContent()));
}else{
@ -290,14 +290,14 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
DateEditor dateEditor = (DateEditor)maxValueField.getCurrentEditor();
String dateString = dateEditor.getUIDatePickerFormat().format(datetmp);
timeAxis.setCustomMaxValue(StringUtils.isNotEmpty(dateString));
timeAxis.setMaxValue(new Formula(dateString));
timeAxis.setMaxValue(BaseFormula.createFormulaBuilder().build(dateString));
}
} else {
timeAxis.setCustomMaxValue(false);
}
if (mainTickBox.isSelected() && StringUtils.isNotEmpty(mainUnitField.getText())) {//主要刻度单位
timeAxis.setCustomMainUnit(true);
timeAxis.setMainUnit(new Formula(mainUnitField.getText()));
timeAxis.setMainUnit(BaseFormula.createFormulaBuilder().build(mainUnitField.getText()));
String item = mainType.getSelectedItem().toString();
timeAxis.setMainType(TimeType.parseString(item));
} else {
@ -305,7 +305,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
}
if (secondTickBox.isSelected() && StringUtils.isNotEmpty(secondUnitField.getText())) { //次要刻度单位
timeAxis.setCustomSecUnit(true);
timeAxis.setSecUnit(new Formula(secondUnitField.getText()));
timeAxis.setSecUnit(BaseFormula.createFormulaBuilder().build(secondUnitField.getText()));
String item = secondType.getSelectedItem().toString();
timeAxis.setSecondType(TimeType.parseString(item));
} else {
@ -367,7 +367,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
}
//将从formula读出来的内容转化为指定格式的日期
private Date getDateFromFormula(Formula dateFormula){
private Date getDateFromFormula(BaseFormula dateFormula){
String dateStr = dateFormula.getPureContent();
dateStr = Pattern.compile("\"").matcher(dateStr).replaceAll(StringUtils.EMPTY);
Date toDate = DateUtils.string2Date(dateStr, true);

6
designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartValueAxisPane.java

@ -1,6 +1,6 @@
package com.fr.plugin.chart.designer.style.axis;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.chart.base.ChartBaseUtils;
import com.fr.design.chart.ChartSwingUtils;
import com.fr.design.gui.icheckbox.UICheckBox;
@ -162,11 +162,11 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane {
valueAxis.setLogBase(null);
} else {
valueAxis.setLog(true);
Formula formula = new Formula(increment);
BaseFormula formula = BaseFormula.createFormulaBuilder().build(increment);
Number number = ChartBaseUtils.formula2Number(formula);
// 界面处理防止 遇到 对数增量为小于1的值.
if (number != null && number.doubleValue() <= 1.0) {
valueAxis.setLogBase(new Formula("2"));
valueAxis.setLogBase(BaseFormula.createFormulaBuilder().build("2"));
} else {
valueAxis.setLogBase(formula);
}

6
designer_chart/src/com/fr/plugin/chart/designer/style/axis/component/MinMaxValuePaneWithOutTick.java

@ -1,6 +1,6 @@
package com.fr.plugin.chart.designer.style.axis.component;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.plugin.chart.range.MinAndMaxValue;
import javax.swing.*;
@ -35,8 +35,8 @@ public class MinMaxValuePaneWithOutTick extends VanChartMinMaxValuePane {
if(minAndMaxValue == null) {
return;
}
minAndMaxValue.setMinValue(new Formula(minValueField.getText()));
minAndMaxValue.setMaxValue(new Formula(maxValueField.getText()));
minAndMaxValue.setMinValue(BaseFormula.createFormulaBuilder().build(minValueField.getText()));
minAndMaxValue.setMaxValue(BaseFormula.createFormulaBuilder().build(maxValueField.getText()));
minAndMaxValue.setCustomMin(minCheckBox.isSelected());
minAndMaxValue.setCustomMax(maxCheckBox.isSelected());
}

13
designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartAlertValuePane.java

@ -1,6 +1,6 @@
package com.fr.plugin.chart.designer.style.background;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Utils;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.formula.TinyFormulaPane;
@ -15,6 +15,7 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.style.color.ColorSelectBox;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.FRFont;
import com.fr.general.GeneralUtils;
import com.fr.general.Inter;
import com.fr.plugin.chart.VanChartAttrHelper;
import com.fr.plugin.chart.attr.axis.VanChartAlertValue;
@ -158,10 +159,10 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
alertTextPosition.setSelectedIndex(chartAlertValue.getAlertPosition() == Constants.LEFT ? 0 : 1);
}
if (chartAlertValue.getAlertContentFormula() instanceof Formula) {
alertText.populateBean(((Formula) chartAlertValue.getAlertContentFormula()).getContent());
if (chartAlertValue.getAlertContentFormula() instanceof BaseFormula) {
alertText.populateBean(((BaseFormula) chartAlertValue.getAlertContentFormula()).getContent());
} else {
alertText.populateBean(Utils.objectToString(chartAlertValue.getAlertContentFormula()));
alertText.populateBean(GeneralUtils.objectToString(chartAlertValue.getAlertContentFormula()));
}
fontName.setSelectedItem(chartAlertValue.getAlertFont().getName());
fontSize.setSelectedItem(chartAlertValue.getAlertFont().getSize());
@ -171,14 +172,14 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
public VanChartAlertValue updateBean(){
chartAlertValue.setAxisName(alertAxis.getSelectedItem().toString());
chartAlertValue.setAlertValueFormula(new Formula(alertValue.updateBean()));
chartAlertValue.setAlertValueFormula(BaseFormula.createFormulaBuilder().build(alertValue.updateBean()));
chartAlertValue.getLineColor().setSeriesColor(alertLineColor.getSelectObject());
chartAlertValue.getLineStyle().setLineStyle(alertLineStyle.getSelectedLineStyle());
String contentString = alertText.updateBean();
Object contentObj;
if (StableUtils.maybeFormula(contentString)) {
contentObj = new Formula(contentString);
contentObj = BaseFormula.createFormulaBuilder().build(contentString);
} else {
contentObj = contentString;
}

6
designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java

@ -1,6 +1,6 @@
package com.fr.plugin.chart.designer.style.background;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.base.Utils;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.formula.TinyFormulaPane;
@ -105,8 +105,8 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane<VanChart
customIntervalBackground.setAxisName(backgroundAxis.getSelectedItem().toString());
customIntervalBackground.setFromFormula(new Formula(bottomValue.updateBean()));
customIntervalBackground.setToFormula(new Formula(topValue.updateBean()));
customIntervalBackground.setFromFormula(BaseFormula.createFormulaBuilder().build(bottomValue.updateBean()));
customIntervalBackground.setToFormula(BaseFormula.createFormulaBuilder().build(topValue.updateBean()));
customIntervalBackground.setBackgroundColor(color.getSelectObject());
customIntervalBackground.setAlpha(transparent.updateBean() / VanChartAttrHelper.PERCENT);
return customIntervalBackground;

5
designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java

@ -564,8 +564,9 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
mapDataTree.changeRootNode(this.getRootNode());
if(samePlotChange) {
mapPlot.setGeoUrl(GEOJSONHelper.getDefaultJSONURL());
mapDataTree.selectDefaultTreeNode();
String nodePath = GEOJSONHelper.getDefaultJSONURL();
mapPlot.setGeoUrl(nodePath);
mapDataTree.setSelectNodePath(nodePath);
selectTreePath = mapDataTree.getSelectionPath();
sourceComboBox.setSelectedItem(selectTreePath);
}

12
designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java

@ -1,11 +1,6 @@
package com.fr.design.designer.creator;
import java.awt.Dimension;
import java.awt.Insets;
import javax.swing.JComponent;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.border.UIRoundedBorder;
import com.fr.form.ui.AbstractBorderStyleWidget;
import com.fr.form.ui.Label;
@ -19,6 +14,9 @@ import com.fr.general.ComparatorUtils;
import com.fr.stable.Constants;
import com.fr.stable.StringUtils;
import javax.swing.*;
import java.awt.*;
/**
* Created with IntelliJ IDEA.
* User: zx
@ -119,7 +117,7 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
private WidgetValue getTitleValue(WidgetTitle wTitle){
String content = String.valueOf(wTitle.getTextObject());
Object vlaue = content.startsWith("=") ? new Formula(content) : content;
Object vlaue = content.startsWith("=") ? BaseFormula.createFormulaBuilder().build(content) : content;
return new WidgetValue(vlaue);
}

1
designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java

@ -405,6 +405,7 @@ public class XWCardLayout extends XLayoutContainer {
XWCardMainBorderLayout borderLayout = (XWCardMainBorderLayout) this.getBackupParent();
WCardMainBorderLayout border = borderLayout.toData();
WCardTitleLayout titleLayout = border.getTitlePart();
titleLayout.setCardName(cardLayoutName);
WCardTagLayout tagLayout = titleLayout.getTagPart();
for (int i = 0, len = tagLayout.getWidgetCount(); i < len; i++) {
CardSwitchButton button = tagLayout.getSwitchButton(i);

4
designer_form/src/com/fr/design/gui/xpane/JTreeAutoBuildPane.java

@ -1,6 +1,6 @@
package com.fr.design.gui.xpane;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.data.impl.NameTableData;
import com.fr.data.impl.RecursionTableData;
import com.fr.data.impl.TableDataDictionary;
@ -144,7 +144,7 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab
if (object instanceof Integer) {
tableDataDict.setValueColumnIndex((Integer) object - 1);
} else {
tableDataDict.setFormula(((Formula) object));
tableDataDict.setFormula(((BaseFormula) object));
}
TableDataWrapper tableDataWrappe = this.treeTableDataComboBox.getSelectedItem();
if (tableDataWrappe != null) {

36
designer_form/src/com/fr/design/gui/xtable/TableUtils.java

@ -3,16 +3,7 @@
*/
package com.fr.design.gui.xtable;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Point;
import java.util.HashMap;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.mainframe.widget.editors.BooleanEditor;
import com.fr.design.mainframe.widget.editors.ColorEditor;
import com.fr.design.mainframe.widget.editors.DimensionEditor;
@ -31,6 +22,11 @@ import com.fr.design.mainframe.widget.renderer.PointCellRenderer;
import com.fr.design.mainframe.widget.renderer.RectangleCellRenderer;
import com.fr.third.com.lowagie.text.Rectangle;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer;
import java.awt.*;
import java.util.HashMap;
/**
* @author richer
* @since 6.5.3
@ -56,7 +52,7 @@ public class TableUtils {
propertyEditorClasses.put(double.class, DoubleEditor.class);
propertyEditorClasses.put(Double.class, IntegerPropertyEditor.class);
propertyEditorClasses.put(Formula.class, FormulaEditor.class);
propertyEditorClasses.put(BaseFormula.class, FormulaEditor.class);
// TODO ALEX_SEP
// propertyEditorClasses.put(DSColumn.class, DSColumnEditor.class);
@ -78,10 +74,24 @@ public class TableUtils {
}
public static Class<? extends ExtendedPropertyEditor> getPropertyEditorClass(Class propType) {
return propertyEditorClasses.get(propType);
Class<? extends ExtendedPropertyEditor> clazz = propertyEditorClasses.get(propType);
if (clazz == null) {
Class superClazz = propType.getSuperclass();
if (superClazz != null) {
return getPropertyEditorClass(superClazz);
}
}
return clazz;
}
public static Class<? extends TableCellRenderer> getTableCellRendererClass(Class propType) {
return cellRendererClasses.get(propType);
Class<? extends TableCellRenderer> clazz = cellRendererClasses.get(propType);
if (clazz == null) {
Class superClazz = propType.getSuperclass();
if (superClazz != null) {
return getTableCellRendererClass(superClazz);
}
}
return clazz;
}
}

4
designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleFormulaEditor.java

@ -3,7 +3,7 @@
*/
package com.fr.design.mainframe.widget.accessibles;
import com.fr.base.Formula;
import com.fr.base.BaseFormula;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.formula.FormulaFactory;
@ -37,7 +37,7 @@ public class AccessibleFormulaEditor extends BaseAccessibleEditor {
fireStateChanged();
}
});
formulaPane.populate((Formula) getValue());
formulaPane.populate((BaseFormula) getValue());
dlg.setVisible(true);
}
}

15
designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@ -3,6 +3,7 @@ package com.fr.design.mainframe.widget.ui;
import com.fr.design.data.DataCreatorUI;
import com.fr.design.designer.beans.events.DesignerEvent;
import com.fr.design.designer.creator.*;
import com.fr.design.dialog.AttrScrollPane;
import com.fr.design.dialog.BasicScrollPane;
import com.fr.design.foldablepane.UIExpandablePane;
import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
@ -112,26 +113,16 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
XCreator innerCreator = getXCreatorDedicated();
final JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
BasicScrollPane basicScrollPane = new BasicScrollPane() {
BasicScrollPane basicScrollPane = new AttrScrollPane() {
@Override
protected JPanel createContentPane() {
return jPanel;
}
@Override
public void populateBean(Object ob) {
}
@Override
protected String title4PopupWindow() {
return null;
}
};
this.add(basicScrollPane, BorderLayout.CENTER);
attriCardPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
jPanel.add(attriCardPane, BorderLayout.CENTER);
jPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
jPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
final boolean isExtraWidget = FormWidgetDefinePaneFactoryBase.isExtraXWidget(innerCreator.toData());
this.listener = new AttributeChangeListener() {

8
designer_form/src/com/fr/design/mainframe/widget/wrappers/FormulaWrapper.java

@ -3,12 +3,12 @@
*/
package com.fr.design.mainframe.widget.wrappers;
import com.fr.base.Formula;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
import com.fr.base.BaseFormula;
import com.fr.design.Exception.ValidationException;
import com.fr.design.designer.properties.Decoder;
import com.fr.design.designer.properties.Encoder;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
/**
* @author richer
@ -29,7 +29,7 @@ public class FormulaWrapper implements Encoder, Decoder{
@Override
public Object decode(String txt) {
return new Formula(txt);
return BaseFormula.createFormulaBuilder().build(txt);
}
@Override

2
designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java

@ -47,7 +47,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
public void initComponent() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
designerWidth = new UISpinner(1, 1000, 1);
designerWidth = new UISpinner(1, Integer.MAX_VALUE, 1);
JPanel advancePane = createAdvancePane();
UIExpandablePane advanceExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, advancePane);
this.add(advanceExpandablePane, BorderLayout.NORTH);

18
designer_form/src/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java

@ -4,21 +4,23 @@ import com.fr.design.designer.IntervalConstants;
import com.fr.design.designer.creator.XCreator;
import com.fr.design.foldablepane.UIExpandablePane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.widget.ui.designer.component.FontSizeComboPane;
import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
import com.fr.form.ui.CheckBox;
import com.fr.general.Inter;
import javax.swing.*;
import java.awt.*;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import java.awt.Component;
public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
private UITextField text;
private UISpinner fontSizePane;
private FontSizeComboPane fontSizePane;
private FormWidgetValuePane formWidgetValuePane;
protected UITextField labelNameTextField;
@ -30,15 +32,17 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
private void iniComoponents() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
text = new UITextField();
fontSizePane = new UISpinner(0, 20, 1, 0);
fontSizePane = new FontSizeComboPane();
labelNameTextField = new UITextField();
UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"));
widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Text")), text },
new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")), formWidgetValuePane },
new Component[]{widgetValueLabel, formWidgetValuePane },
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size")), fontSizePane},
};
double[] rowSize = {p, p, p, p, p, p};
@ -70,7 +74,7 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
public CheckBox updateBean() {
CheckBox box = (CheckBox)creator.toData();
box.setText(text.getText());
box.setFontSize((int)fontSizePane.getValue());
box.setFontSize(fontSizePane.getValue());
formWidgetValuePane.update(box);
box.setLabelName(labelNameTextField.getText());
return box;

73
designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java

@ -1,7 +1,6 @@
package com.fr.design.widget.ui.designer;
import com.fr.base.FRContext;
import com.fr.base.Formula;
import com.fr.data.core.FormatField;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.designer.creator.XCreator;
@ -15,15 +14,10 @@ import com.fr.design.widget.component.DateValuePane;
import com.fr.design.widget.component.UIComboBoxNoArrow;
import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
import com.fr.form.ui.DateEditor;
import com.fr.general.DateUtils;
import com.fr.general.Inter;
import com.fr.script.Calculator;
import com.fr.stable.ArrayUtils;
import com.fr.stable.UtilEvalError;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
@ -56,6 +50,14 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
@Override
protected JPanel setFirstContentPane() {
waterMarkDictPane = new WaterMarkDictPane();
UILabel formatLabel = new UILabel(Inter.getLocText("FR-Engine_Format"));
formatLabel.setVerticalAlignment(SwingConstants.TOP);
UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"));
widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
UILabel startDateLabel = new UILabel(Inter.getLocText("FS_Start_Date"));
startDateLabel.setVerticalAlignment(SwingConstants.TOP);
UILabel endDateLabel = new UILabel(Inter.getLocText("FS_End_Date"));
endDateLabel.setVerticalAlignment(SwingConstants.TOP);
formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
returnTypeComboBox = new UIButtonGroup<>(new String[] {Inter.getLocText("Date") , Inter.getLocText("String")});
JPanel formatHead = createFormatHead();
@ -65,10 +67,10 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")), formWidgetValuePane},
new Component[]{new UILabel(Inter.getLocText("FR-Engine_Format")), formatHead},
new Component[]{new UILabel(Inter.getLocText("FS_Start_Date")), startDv},
new Component[]{new UILabel(Inter.getLocText("FS_End_Date")), endDv},
new Component[]{widgetValueLabel, formWidgetValuePane},
new Component[]{formatLabel, formatHead},
new Component[]{startDateLabel, startDv},
new Component[]{endDateLabel, endDv},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark")), waterMarkDictPane},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size")), fontSizePane},
new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type")), returnTypeComboBox}
@ -209,55 +211,6 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
return ob;
}
/**
* 更新日期控件的起止日期
*
* @param dateWidgetEditor 日期控件
*/
public void updateStartEnd(DateEditor dateWidgetEditor) {
Object startObject = startDv.update();
Object endObject = endDv.update();
// wei : 对公式的处理
Calculator cal = null;
if (startObject instanceof Formula) {
cal = Calculator.createCalculator();
Formula startFormula = (Formula) startObject;
try {
startFormula.setResult(cal.evalValue(startFormula.getContent()));
} catch (UtilEvalError e) {
FRContext.getLogger().error(e.getMessage(), e);
}
startObject = startFormula.getResult();
dateWidgetEditor.setStartDateFM(startFormula);
dateWidgetEditor.setStartText(null);
} else {
try {
dateWidgetEditor.setStartText(startObject == null ? "" : DateUtils.getDate2Str("MM/dd/yyyy", (Date) startObject));
} catch (ClassCastException e) {
//wei : TODO 说明应用的公式不能转化成日期格式,应该做些处理。
}
}
if (endObject instanceof Formula) {
cal = Calculator.createCalculator();
Formula endFormula = (Formula) endObject;
try {
endFormula.setResult(cal.evalValue(endFormula.getContent()));
} catch (UtilEvalError e) {
FRContext.getLogger().error(e.getMessage(), e);
}
endObject = endFormula.getResult();
dateWidgetEditor.setEndDateFM(endFormula);
dateWidgetEditor.setEndText(null);
} else {
try {
dateWidgetEditor.setEndText(endObject == null ? "" : DateUtils.getDate2Str("MM/dd/yyyy", (Date) endObject));
} catch (ClassCastException e) {
}
}
}
private SimpleDateFormat getSimpleDateFormat() {
String text = (String) currentFormatComboBox.getSelectedItem();
SimpleDateFormat simpleDateFormat;

4
designer_form/src/com/fr/design/widget/ui/designer/DirectWriteEditorDefinePane.java

@ -28,6 +28,8 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
@Override
protected JPanel setFirstContentPane() {
JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"));
widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
Component[] removeRepeatPane = new Component[]{createRepeatCheckBox(), null};
Component[] dicPane = createDictPane();
@ -36,7 +38,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")), formWidgetValuePane },
new Component[]{widgetValueLabel, formWidgetValuePane },
dicPane,
removeRepeatPane,
waterMarkComponent,

9
designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java

@ -6,11 +6,10 @@ import com.fr.design.designer.creator.*;
import com.fr.design.foldablepane.UIExpandablePane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.widget.ui.designer.component.FontSizeComboPane;
import com.fr.form.ui.FieldEditor;
import com.fr.general.Inter;
@ -26,7 +25,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
// richer:错误信息,是所有控件共有的属性,所以放到这里来
protected UITextField errorMsgTextField;
protected JPanel validatePane;
protected UISpinner fontSizePane;
protected FontSizeComboPane fontSizePane;
protected UITextField labelNameTextField;
@ -40,7 +39,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
labelNameTextField = new UITextField();
allowBlankCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Allow_Null"));
allowBlankCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
fontSizePane = new UISpinner(0, 20, 1, 0);
fontSizePane = new FontSizeComboPane();
errorMsgTextField = new UITextField();
JPanel contentPane = this.setFirstContentPane();
JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
@ -70,7 +69,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
e.setAllowBlank(this.allowBlankCheckBox.isSelected());
e.setErrorMessage(this.errorMsgTextField.getText());
e.setFontSize((int)fontSizePane.getValue());
e.setFontSize(fontSizePane.getValue());
e.setLabelName(labelNameTextField.getText());
return e;
}

4
designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java

@ -62,10 +62,12 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
double[] rowSize = {p, p, p, p, p, p, p};
double[] columnSize = {p, f};
int[][] rowCount = {{1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"));
widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
UILabel fontLabel = new UILabel(Inter.getLocText("FR-Designer_Font-Size"));
fontLabel.setVerticalAlignment(SwingConstants.TOP);
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")), formWidgetValuePane},
new Component[]{widgetValueLabel, formWidgetValuePane},
new Component[]{isStyleAlignmentWrapText, null},
new Component[]{isPageSetupVertically, null},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Display_Position")), hAlignmentPane},

7
designer_form/src/com/fr/design/widget/ui/designer/MultiFileEditorPane.java

@ -10,6 +10,7 @@ import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.widget.ui.designer.component.FontSizeComboPane;
import com.fr.form.ui.MultiFileEditor;
import com.fr.general.Inter;
@ -20,7 +21,7 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
private DictionaryComboBox acceptType;
private UICheckBox singleFileCheckBox;
private UISpinner fileSizeField;
private UISpinner fontSizeField;
private FontSizeComboPane fontSizeField;
public MultiFileEditorPane(XCreator xCreator) {
super(xCreator);
@ -39,7 +40,7 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
singleFileCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
fileSizeField = new UISpinner(0, Integer.MAX_VALUE, 1, -1);
fileSizeField.setPreferredSize(new Dimension(140, 20));
fontSizeField = new UISpinner(0, 20, 1, 0);
fontSizeField = new FontSizeComboPane();
JPanel singleFilePane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
singleFilePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@ -82,7 +83,7 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
ob.setAccept((String) acceptType.getSelectedItem());
ob.setSingleFile(singleFileCheckBox.isSelected());
ob.setMaxSize(fileSizeField.getValue());
ob.setFontSize((int)fontSizeField.getValue());
ob.setFontSize(fontSizeField.getValue());
return ob;
}

4
designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java

@ -38,12 +38,14 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
protected JPanel setFirstContentPane() {
// richer:数字的允许直接编辑没有意义
waterMarkDictPane = new WaterMarkDictPane();
UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"));
widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")), formWidgetValuePane},
new Component[]{widgetValueLabel, formWidgetValuePane},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark")), waterMarkDictPane},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size")), fontSizePane}
};

4
designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java

@ -61,9 +61,11 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"), SwingConstants.LEFT);
widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"), SwingConstants.LEFT), formWidgetValuePane},
new Component[]{widgetValueLabel, formWidgetValuePane},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark"), SwingConstants.LEFT), waterMarkDictPane},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size"), SwingConstants.LEFT), fontSizePane}
};

4
designer_form/src/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java

@ -35,12 +35,14 @@ public abstract class ButtonGroupDefinePane<T extends ButtonGroup> extends Field
JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
dictionaryEditor = new AccessibleDictionaryEditor();
buttonGroupDictPane = new ButtonGroupDictPane();
UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"));
widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")), formWidgetValuePane},
new Component[]{widgetValueLabel, formWidgetValuePane},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_DS-Dictionary")), dictionaryEditor},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_FRFont")), fontSizePane},
new Component[]{buttonGroupDictPane, null}

38
designer_form/src/com/fr/design/widget/ui/designer/component/FontSizeComboPane.java

@ -0,0 +1,38 @@
package com.fr.design.widget.ui.designer.component;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.layout.FRGUIPaneFactory;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.util.Vector;
/**
* Created by kerry on 2017/10/23.
*/
public class FontSizeComboPane extends JPanel{
private static final int MAX_FONT_SIZE = 100;
private UIComboBox comboBox;
public FontSizeComboPane(){
initComponent();
}
public void initComponent(){
this.setLayout(FRGUIPaneFactory.createBorderLayout());
Vector<Integer> integerList = new Vector<Integer>();
for (int i = 1; i < MAX_FONT_SIZE; i++) {
integerList.add(i);
}
comboBox = new UIComboBox(integerList);
comboBox.setEditable(true);
this.add(comboBox, BorderLayout.CENTER);
}
public int getValue() {
return Integer.valueOf(comboBox.getSelectedItem().toString());
}
public void setValue(int fontSize) {
comboBox.setSelectedItem(fontSize);
}
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save