KERNEL-1118 更改未完全更改的地方。

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;

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
+    @Override
-//    public void action(CellElement cellElement, Calculator calculator) {
+    public void action(CellElement cellElement, Calculator calculator) {
-//        super.action(cellElement, calculator);
+        super.action(cellElement, calculator);
-//    }
+    }
 
     @Override
     @Focus(id = AlignHighlightConstants.PLUGIN_ID, text = "Plugin-Highlight_Align", source = Original.PLUGIN)

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.fanruan.api.design.ui.component.UIComboBox;
-import com.fr.design.gui.icombobox.UIComboBox;
+import com.fanruan.api.design.ui.component.UIDictionaryComboBox;
-import com.fr.design.gui.icombobox.UIDictionaryComboBox;
-import com.fr.general.Inter;
 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<Highlig
         this.alignComboBox = new UIDictionaryComboBox<Integer>(
                 new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT},
                 new String[]{
-                        Inter.getLocText("Plugin-Highlight_Align_Left"),
+                        DesignKit.i18nText("Plugin-Highlight_Align_Left"),
-                        Inter.getLocText("Plugin-Highlight_Align_Center"),
+                        DesignKit.i18nText("Plugin-Highlight_Align_Center"),
-                        Inter.getLocText("Plugin-Highlight_Align_Right")}
+                        DesignKit.i18nText("Plugin-Highlight_Align_Right")}
         );
         add(alignComboBox);
         this.scopeComboBox = new UIComboBox(new String[]{
-                Inter.getLocText("Plugin-Highlight_Align_Current_Cell"),
+                DesignKit.i18nText("Plugin-Highlight_Align_Current_Cell"),
-                Inter.getLocText("Plugin-Highlight_Align_Current_Row"),
+                DesignKit.i18nText("Plugin-Highlight_Align_Current_Row"),
-                Inter.getLocText("Plugin-Highlight_Align_Current_Column")});
+                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