diff --git a/build.xml b/build.xml index 2a2feb9..091cdda 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + @@ -88,8 +88,8 @@ - - + + diff --git a/pom.xml b/pom.xml index 58e6931..58cb404 100644 --- a/pom.xml +++ b/pom.xml @@ -14,5 +14,15 @@ ${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.present.star-1.0/classes + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + \ No newline at end of file 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 2f6d695..a7ef3f9 100644 --- a/src/main/java/com/fr/plugin/present/fun/StarPainter.java +++ b/src/main/java/com/fr/plugin/present/fun/StarPainter.java @@ -1,19 +1,18 @@ package com.fr.plugin.present.fun; -import com.fr.base.AbstractPainter; +import com.fanruan.api.base.AbstractPainter; import com.fr.base.Style; -import com.fr.general.IOUtils; -import com.fr.report.cell.cellattr.core.CellUtils; +import com.fanruan.api.util.IOKit; +import com.fanruan.api.util.CellKit; import com.fr.stable.html.Tag; import com.fr.stable.web.Repository; -import com.fr.web.BaseHTMLWriterUtils; +import com.fanruan.api.util.BaseHTMLWriterKit; import java.awt.*; import java.awt.image.BufferedImage; public class StarPainter extends AbstractPainter { - - private static final BufferedImage image = IOUtils.readImage("/com/fr/plugin/present/images/star.png"); + private static final BufferedImage image = IOKit.readImage("/com/fr/plugin/present/images/star.png"); private int count; private int hGap = 4; @@ -36,8 +35,8 @@ public class StarPainter extends AbstractPainter { @Override public void paintTag(Repository repo, int width, int height, Style style, Tag tag) { tag.cls("imageCellElement"); - tag.sub(BaseHTMLWriterUtils.createImageTag4RepoWithCheckVml( - CellUtils.value2Image(this, repo.getResolution(), style, width, height), new Dimension(width, height), repo + tag.sub(BaseHTMLWriterKit.createImageTag4RepoWithCheckVml( + CellKit.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 e673d1d..b3678bd 100644 --- a/src/main/java/com/fr/plugin/present/fun/StarPresent.java +++ b/src/main/java/com/fr/plugin/present/fun/StarPresent.java @@ -1,18 +1,17 @@ package com.fr.plugin.present.fun; -import com.fr.base.BaseFormula; +import com.fanruan.api.base.BaseFormula; import com.fr.base.present.AbstractPresent; -import com.fr.general.GeneralUtils; +import com.fanruan.api.util.GeneralKit; import com.fr.intelli.record.Focus; import com.fr.intelli.record.Original; -import com.fr.log.FineLoggerFactory; +import com.fanruan.api.log.LogKit; import com.fr.record.analyzer.EnableMetrics; import com.fr.script.Calculator; -import com.fr.stable.AssistUtils; +import com.fanruan.api.util.AssistKit; import com.fr.stable.ColumnRow; -import com.fr.stable.StableUtils; -import com.fr.stable.StringUtils; -import com.fr.stable.UtilEvalError; +import com.fanruan.api.util.StableKit; +import com.fanruan.api.util.StringKit; import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; @@ -38,16 +37,16 @@ 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 (StableUtils.canBeFormula(condition)) { + if (StableKit.canBeFormula(condition)) { try { result = calculator.evalValue(BaseFormula.createFormulaBuilder().build(condition)); - } catch (UtilEvalError e) { - FineLoggerFactory.getLogger().error(e.getMessage(), e); + } catch (Exception e) { + LogKit.debug(e.getMessage(), e); } } else { result = condition; } - Number num = GeneralUtils.objectToNumber(result, true); + Number num = GeneralKit.objectToNumber(result, true); if (num == null) { return value; } @@ -66,7 +65,7 @@ public class StarPresent extends AbstractPresent { @Override public void writeXML(XMLPrintWriter writer) { - if (StringUtils.isNotEmpty(condition)) { + if (StringKit.isNotEmpty(condition)) { writer.startTAG("Condition").textNode(condition).end(); } } @@ -80,11 +79,11 @@ public class StarPresent extends AbstractPresent { public boolean equals(Object o) { return o instanceof StarPresent && super.equals(o) - && AssistUtils.equals(((StarPresent) o).condition, condition); + && AssistKit.equals(((StarPresent) o).condition, condition); } @Override public int hashCode() { - return AssistUtils.hashCode(condition); + return AssistKit.hashCode(condition); } } \ No newline at end of file diff --git a/src/main/java/com/fr/plugin/present/ui/StarPresentPane.java b/src/main/java/com/fr/plugin/present/ui/StarPresentPane.java index fc63405..3600632 100644 --- a/src/main/java/com/fr/plugin/present/ui/StarPresentPane.java +++ b/src/main/java/com/fr/plugin/present/ui/StarPresentPane.java @@ -1,16 +1,10 @@ package com.fr.plugin.present.ui; import com.fr.design.beans.FurtherBasicBeanPane; -import com.fr.design.editor.ValueEditorPane; -import com.fr.design.editor.ValueEditorPaneFactory; -import com.fr.design.editor.editor.Editor; -import com.fr.design.editor.editor.FormulaEditor; -import com.fr.design.editor.editor.IntegerEditor; -import com.fr.design.formula.TinyFormulaPane; -import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.itextfield.UITextField; -import com.fr.design.i18n.Toolkit; -import com.fr.design.utils.gui.GUICoreUtils; +import com.fanruan.api.design.work.formula.TinyFormulaPane; +import com.fanruan.api.design.ui.component.UILabel; +import com.fanruan.api.design.DesignKit; +import com.fanruan.api.design.util.GUICoreKit; import com.fr.plugin.present.fun.StarPresent; import java.awt.*; @@ -31,8 +25,8 @@ public class StarPresentPane extends FurtherBasicBeanPane { private void initComponents() { setLayout(new BorderLayout()); formulaPane = new TinyFormulaPane(); - add(GUICoreUtils.createBorderLayoutPane( - new UILabel(Toolkit.i18nText("Plugin-Present_Value") + ":"), + add(GUICoreKit.createBorderLayoutPane( + new UILabel(DesignKit.i18nText("Plugin-Present_Value") + ":"), BorderLayout.WEST, formulaPane, BorderLayout.CENTER @@ -48,7 +42,7 @@ public class StarPresentPane extends FurtherBasicBeanPane { @Override public String title4PopupWindow() { - return Toolkit.i18nText("Plugin-Present_Star"); + return DesignKit.i18nText("Plugin-Present_Star"); } @Override