diff --git a/src/main/java/com/fr/plugin/present/fun/StarPainter.java b/src/main/java/com/fr/plugin/present/fun/StarPainter.java index 4b4da6b..fa67a8f 100644 --- a/src/main/java/com/fr/plugin/present/fun/StarPainter.java +++ b/src/main/java/com/fr/plugin/present/fun/StarPainter.java @@ -3,7 +3,7 @@ package com.fr.plugin.present.fun; import com.fr.base.AbstractPainter; import com.fr.base.Style; import com.fanruan.api.util.IOKit; -import com.fanruan.api.util.CellKit; +import com.fanruan.api.report.PaintKit; import com.fr.stable.html.Tag; import com.fr.stable.web.Repository; import com.fanruan.api.report.BaseHTMLWriterKit; @@ -36,7 +36,7 @@ public class StarPainter extends AbstractPainter { public void paintTag(Repository repo, int width, int height, Style style, Tag tag) { tag.cls("imageCellElement"); tag.sub(BaseHTMLWriterKit.createImageTag4RepoWithCheckVml( - CellKit.value2Image(this, repo.getResolution(), style, width, height), new Dimension(width, height), repo + PaintKit.value2Image(this, repo.getResolution(), style, width, height), new Dimension(width, height), repo )); } } diff --git a/src/main/java/com/fr/plugin/present/fun/StarPresent.java b/src/main/java/com/fr/plugin/present/fun/StarPresent.java index fbb3116..4a64ba8 100644 --- a/src/main/java/com/fr/plugin/present/fun/StarPresent.java +++ b/src/main/java/com/fr/plugin/present/fun/StarPresent.java @@ -10,10 +10,10 @@ import com.fr.record.analyzer.EnableMetrics; import com.fr.script.Calculator; import com.fanruan.api.util.AssistKit; import com.fr.stable.ColumnRow; -import com.fanruan.api.util.StableKit; import com.fanruan.api.util.StringKit; import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; +import com.fanruan.api.cal.FormulaKit; /** * @author richie @@ -37,7 +37,7 @@ public class StarPresent extends AbstractPresent { @Focus(id = "com.fr.plugin.present.star", text = "", source = Original.PLUGIN) public Object present(Object value, Calculator calculator, ColumnRow cr) { Object result = null; - if (StableKit.canBeFormula(condition)) { + if (FormulaKit.canBeFormula(condition)) { try { result = calculator.evalValue(BaseFormula.createFormulaBuilder().build(condition)); } catch (Exception e) {