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..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,6 +1,6 @@
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.fr.design.fun.impl.AbstractHighlightProvider;
import com.fr.plugin.cell.highlight.fun.AlignHighlightAction;
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..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
@@ -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.fanruan.api.report.cell.AbstractStyleHighlightAction;
+import com.fanruan.api.macro.Constants;
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.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLableReader;
import com.fanruan.api.util.AssistKit;
+import com.fanruan.api.runtime.PluginKit;
/**
* @author richie
* @date 2015-03-26
@@ -45,8 +44,7 @@ public class AlignHighlightAction extends AbstractStyleHighlightAction {
@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..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,13 +1,13 @@
package com.fr.plugin.cell.highlight.ui;
-import com.fr.design.condition.ConditionAttrSingleConditionPane;
import com.fr.design.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.condition.ConditionAttrSingleConditionPane;
+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.*;
@@ -25,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