From 057088ce25982532e89a6541f13e6105f806f519 Mon Sep 17 00:00:00 2001 From: "Mars.Ma" Date: Fri, 30 Aug 2019 16:07:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?KERNEL-1118=20=E5=B0=86=E8=83=BD=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E4=B8=BAFineKit=E4=B8=AD=E7=9A=84=E4=BA=8B=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E5=85=A8=E9=83=A8=E6=9B=BF=E6=8D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 ++++++++ .../highlight/AlignCellHighlightBridge.java | 4 +++- .../highlight/fun/AlignHighlightAction.java | 24 +++++++++---------- .../cell/highlight/ui/AlignHighlightPane.java | 5 +++- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index a8ffac5..e70e71c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,5 +14,15 @@ ${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.cell.highlight.align.v10-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/cell/highlight/AlignCellHighlightBridge.java b/src/main/java/com/fr/plugin/cell/highlight/AlignCellHighlightBridge.java index cc861ca..85e0549 100644 --- a/src/main/java/com/fr/plugin/cell/highlight/AlignCellHighlightBridge.java +++ b/src/main/java/com/fr/plugin/cell/highlight/AlignCellHighlightBridge.java @@ -1,7 +1,9 @@ package com.fr.plugin.cell.highlight; -import com.fr.design.condition.ConditionAttrSingleConditionPane; +//import com.fr.design.condition.ConditionAttrSingleConditionPane; +import com.fanruan.api.design.ui.condition.ConditionAttrSingleConditionPane; import com.fr.design.condition.ConditionAttributesPane; +//import com.fanruan.api.design.ui.condition.ConditionAttributesPane; import com.fr.design.fun.impl.AbstractHighlightProvider; import com.fr.plugin.cell.highlight.fun.AlignHighlightAction; import com.fr.plugin.cell.highlight.fun.AlignHighlightConstants; diff --git a/src/main/java/com/fr/plugin/cell/highlight/fun/AlignHighlightAction.java b/src/main/java/com/fr/plugin/cell/highlight/fun/AlignHighlightAction.java index d87f8c9..bc886e8 100644 --- a/src/main/java/com/fr/plugin/cell/highlight/fun/AlignHighlightAction.java +++ b/src/main/java/com/fr/plugin/cell/highlight/fun/AlignHighlightAction.java @@ -1,19 +1,18 @@ package com.fr.plugin.cell.highlight.fun; + import com.fr.base.Style; import com.fr.intelli.record.Focus; import com.fr.intelli.record.Original; -import com.fr.plugin.PluginLicense; -import com.fr.plugin.PluginLicenseManager; import com.fr.record.analyzer.EnableMetrics; -import com.fr.report.cell.CellElement; -import com.fr.report.cell.cellattr.highlight.AbstractStyleHighlightAction; -import com.fr.script.Calculator; -import com.fr.stable.AssistUtils; -import com.fr.stable.Constants; +import com.fanruan.api.report.cell.AbstractStyleHighlightAction; +import com.fanruan.api.macro.Constants; import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; import com.fanruan.api.util.AssistKit; +import com.fanruan.api.runtime.PluginKit; +//import com.fanruan.api.design.ui.layout.Style; +//import com.fanruan.api.design.ui.layout.AbstractStyleHighlightAction; /** * @author richie * @date 2015-03-26 @@ -37,16 +36,15 @@ public class AlignHighlightAction extends AbstractStyleHighlightAction { return align; } - @Override - public void action(CellElement cellElement, Calculator calculator) { - super.action(cellElement, calculator); - } +// @Override +// public void action(CellElement cellElement, Calculator calculator) { +// super.action(cellElement, calculator); +// } @Override @Focus(id = AlignHighlightConstants.PLUGIN_ID, text = "Plugin-Highlight_Align", source = Original.PLUGIN) protected Style modStyle(Style style) { - PluginLicense pluginLicense = PluginLicenseManager.getInstance().getPluginLicenseByID(AlignHighlightConstants.PLUGIN_ID); - if (pluginLicense != null && pluginLicense.isAvailable()) { + if (PluginKit.isCurrentPluginAvailable()) { return style.deriveHorizontalAlignment(align); } return style; diff --git a/src/main/java/com/fr/plugin/cell/highlight/ui/AlignHighlightPane.java b/src/main/java/com/fr/plugin/cell/highlight/ui/AlignHighlightPane.java index 0e81a5a..308a93f 100644 --- a/src/main/java/com/fr/plugin/cell/highlight/ui/AlignHighlightPane.java +++ b/src/main/java/com/fr/plugin/cell/highlight/ui/AlignHighlightPane.java @@ -1,7 +1,10 @@ package com.fr.plugin.cell.highlight.ui; -import com.fr.design.condition.ConditionAttrSingleConditionPane; + +//import com.fr.design.condition.ConditionAttrSingleConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fanruan.api.design.ui.condition.ConditionAttrSingleConditionPane; +//import com.fanruan.api.design.ui.condition.ConditionAttributesPane; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIDictionaryComboBox; import com.fr.general.Inter; From 4fb85df93e3d00550e619c61e3c26f517670dbb5 Mon Sep 17 00:00:00 2001 From: "Mars.Ma" Date: Sun, 1 Sep 2019 23:19:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?KERNEL-1118=20=E6=9B=B4=E6=94=B9=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E5=85=A8=E6=9B=B4=E6=94=B9=E7=9A=84=E5=9C=B0=E6=96=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../highlight/AlignCellHighlightBridge.java | 2 -- .../highlight/fun/AlignHighlightAction.java | 12 ++++----- .../cell/highlight/ui/AlignHighlightPane.java | 25 ++++++++----------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/fr/plugin/cell/highlight/AlignCellHighlightBridge.java b/src/main/java/com/fr/plugin/cell/highlight/AlignCellHighlightBridge.java index 85e0549..70083d0 100644 --- a/src/main/java/com/fr/plugin/cell/highlight/AlignCellHighlightBridge.java +++ b/src/main/java/com/fr/plugin/cell/highlight/AlignCellHighlightBridge.java @@ -1,9 +1,7 @@ package com.fr.plugin.cell.highlight; -//import com.fr.design.condition.ConditionAttrSingleConditionPane; import com.fanruan.api.design.ui.condition.ConditionAttrSingleConditionPane; import com.fr.design.condition.ConditionAttributesPane; -//import com.fanruan.api.design.ui.condition.ConditionAttributesPane; import com.fr.design.fun.impl.AbstractHighlightProvider; import com.fr.plugin.cell.highlight.fun.AlignHighlightAction; import com.fr.plugin.cell.highlight.fun.AlignHighlightConstants; diff --git a/src/main/java/com/fr/plugin/cell/highlight/fun/AlignHighlightAction.java b/src/main/java/com/fr/plugin/cell/highlight/fun/AlignHighlightAction.java index bc886e8..3c3228f 100644 --- a/src/main/java/com/fr/plugin/cell/highlight/fun/AlignHighlightAction.java +++ b/src/main/java/com/fr/plugin/cell/highlight/fun/AlignHighlightAction.java @@ -7,12 +7,12 @@ import com.fr.intelli.record.Original; import com.fr.record.analyzer.EnableMetrics; import com.fanruan.api.report.cell.AbstractStyleHighlightAction; import com.fanruan.api.macro.Constants; +import com.fr.report.cell.CellElement; +import com.fr.script.Calculator; import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; import com.fanruan.api.util.AssistKit; import com.fanruan.api.runtime.PluginKit; -//import com.fanruan.api.design.ui.layout.Style; -//import com.fanruan.api.design.ui.layout.AbstractStyleHighlightAction; /** * @author richie * @date 2015-03-26 @@ -36,10 +36,10 @@ public class AlignHighlightAction extends AbstractStyleHighlightAction { return align; } -// @Override -// public void action(CellElement cellElement, Calculator calculator) { -// super.action(cellElement, calculator); -// } + @Override + public void action(CellElement cellElement, Calculator calculator) { + super.action(cellElement, calculator); + } @Override @Focus(id = AlignHighlightConstants.PLUGIN_ID, text = "Plugin-Highlight_Align", source = Original.PLUGIN) diff --git a/src/main/java/com/fr/plugin/cell/highlight/ui/AlignHighlightPane.java b/src/main/java/com/fr/plugin/cell/highlight/ui/AlignHighlightPane.java index 308a93f..a8e0c4a 100644 --- a/src/main/java/com/fr/plugin/cell/highlight/ui/AlignHighlightPane.java +++ b/src/main/java/com/fr/plugin/cell/highlight/ui/AlignHighlightPane.java @@ -1,16 +1,13 @@ package com.fr.plugin.cell.highlight.ui; - -//import com.fr.design.condition.ConditionAttrSingleConditionPane; import com.fr.design.condition.ConditionAttributesPane; import com.fanruan.api.design.ui.condition.ConditionAttrSingleConditionPane; -//import com.fanruan.api.design.ui.condition.ConditionAttributesPane; -import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.icombobox.UIDictionaryComboBox; -import com.fr.general.Inter; +import com.fanruan.api.design.ui.component.UIComboBox; +import com.fanruan.api.design.ui.component.UIDictionaryComboBox; import com.fr.plugin.cell.highlight.fun.AlignHighlightAction; import com.fr.report.cell.cellattr.highlight.HighlightAction; -import com.fr.stable.Constants; +import com.fanruan.api.macro.Constants; +import com.fanruan.api.design.DesignKit; import javax.swing.*; @@ -28,22 +25,22 @@ public class AlignHighlightPane extends ConditionAttrSingleConditionPane( new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT}, new String[]{ - Inter.getLocText("Plugin-Highlight_Align_Left"), - Inter.getLocText("Plugin-Highlight_Align_Center"), - Inter.getLocText("Plugin-Highlight_Align_Right")} + DesignKit.i18nText("Plugin-Highlight_Align_Left"), + DesignKit.i18nText("Plugin-Highlight_Align_Center"), + DesignKit.i18nText("Plugin-Highlight_Align_Right")} ); add(alignComboBox); this.scopeComboBox = new UIComboBox(new String[]{ - Inter.getLocText("Plugin-Highlight_Align_Current_Cell"), - Inter.getLocText("Plugin-Highlight_Align_Current_Row"), - Inter.getLocText("Plugin-Highlight_Align_Current_Column")}); + DesignKit.i18nText("Plugin-Highlight_Align_Current_Cell"), + DesignKit.i18nText("Plugin-Highlight_Align_Current_Row"), + DesignKit.i18nText("Plugin-Highlight_Align_Current_Column")}); this.add(this.scopeComboBox); } @Override public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-Highlight_Align"); + return DesignKit.i18nText("Plugin-Highlight_Align"); } @Override