Browse Source

去掉全部Formula引用

master
richie 7 years ago
parent
commit
4e84525854
  1. 4
      designer/src/com/fr/design/actions/insert/cell/FormulaCellAction.java
  2. 8
      designer/src/com/fr/design/actions/insert/flot/FormulaFloatAction.java
  3. 24
      designer/src/com/fr/design/cell/editor/RichTextToolBar.java
  4. 11
      designer/src/com/fr/design/headerfooter/HFAttributesEditDialog.java
  5. 1
      designer/src/com/fr/design/report/RichTextEditingPane.java
  6. 6
      designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java
  7. 3
      designer_base/src/com/fr/design/editor/editor/ConstantsEditor.java
  8. 1
      designer_base/src/com/fr/design/formula/FormulaPaneWhenReserveFormula.java
  9. 4
      designer_base/src/com/fr/design/formula/TinyFormulaPane.java
  10. 1
      designer_base/src/com/fr/design/formula/UIFormula.java
  11. 4
      designer_base/src/com/fr/design/present/dict/DatabaseDictPane.java
  12. 4
      designer_base/src/com/fr/design/present/dict/TableDataDictPane.java
  13. 1
      designer_chart/src/com/fr/design/chart/ChartSwingUtils.java
  14. 1
      designer_chart/src/com/fr/design/chart/axis/ChartAlertValuePane.java
  15. 1
      designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java
  16. 1
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
  17. 1
      designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartValueAxisPane.java
  18. 4
      designer_form/src/com/fr/design/gui/xpane/JTreeAutoBuildPane.java
  19. 36
      designer_form/src/com/fr/design/gui/xtable/TableUtils.java
  20. 1
      designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleFormulaEditor.java
  21. 5
      designer_form/src/com/fr/design/mainframe/widget/wrappers/FormulaWrapper.java
  22. 8
      designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java

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;
}
}

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

@ -6,7 +6,6 @@ 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;
@ -16,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.

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

@ -6,7 +6,6 @@ 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;
@ -28,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;
/**

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

@ -4,8 +4,15 @@
package com.fr.design.headerfooter;
import com.fr.base.BaseFormula;
import com.fr.base.Formula;
import com.fr.base.headerfooter.*;
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;

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

@ -5,7 +5,6 @@ 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;

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);

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

@ -1,7 +1,6 @@
package com.fr.design.editor.editor;
import com.fr.base.BaseFormula;
import com.fr.base.Formula;
public class ConstantsEditor extends FormulaEditor {
@ -19,6 +18,6 @@ public class ConstantsEditor extends FormulaEditor {
}
public boolean accept(Object object) {
return object instanceof Formula && object.equals(this.getValue());
return object instanceof BaseFormula && object.equals(this.getValue());
}
}

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

@ -1,7 +1,6 @@
package com.fr.design.formula;
import com.fr.base.BaseFormula;
import com.fr.base.Formula;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.general.Inter;

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

@ -2,18 +2,14 @@ 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.*;

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

@ -1,7 +1,6 @@
package com.fr.design.formula;
import com.fr.base.BaseFormula;
import com.fr.base.Formula;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionListener;

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;

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) {

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

@ -1,7 +1,6 @@
package com.fr.design.chart;
import com.fr.base.BaseFormula;
import com.fr.base.Formula;
import com.fr.base.Utils;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.formula.FormulaFactory;

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

@ -1,7 +1,6 @@
package com.fr.design.chart.axis;
import com.fr.base.BaseFormula;
import com.fr.base.Formula;
import com.fr.base.Utils;
import com.fr.chart.chartattr.ChartAlertValue;
import com.fr.design.beans.BasicBeanPane;

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

@ -1,7 +1,6 @@
package com.fr.design.mainframe.chart.gui.data.report;
import com.fr.base.BaseFormula;
import com.fr.base.Formula;
import com.fr.base.chart.chartdata.TopDefinitionProvider;
import com.fr.chart.chartattr.Bar2DPlot;
import com.fr.chart.chartattr.ChartCollection;

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

@ -1,7 +1,6 @@
package com.fr.design.mainframe.chart.gui.style.axis;
import com.fr.base.BaseFormula;
import com.fr.base.Formula;
import com.fr.base.Utils;
import com.fr.chart.base.ChartBaseUtils;
import com.fr.chart.base.ChartConstants;

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

@ -1,7 +1,6 @@
package com.fr.plugin.chart.designer.style.axis;
import com.fr.base.BaseFormula;
import com.fr.base.Formula;
import com.fr.chart.base.ChartBaseUtils;
import com.fr.design.chart.ChartSwingUtils;
import com.fr.design.gui.icheckbox.UICheckBox;

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;
}
}

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

@ -4,7 +4,6 @@
package com.fr.design.mainframe.widget.accessibles;
import com.fr.base.BaseFormula;
import com.fr.base.Formula;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.formula.FormulaFactory;

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

@ -4,12 +4,11 @@
package com.fr.design.mainframe.widget.wrappers;
import com.fr.base.BaseFormula;
import com.fr.base.Formula;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
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

8
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.*;

Loading…
Cancel
Save