From a8772dc550c1c44a6226257e347d6e09b76843d3 Mon Sep 17 00:00:00 2001
From: "Roger.Chen" <Roger.Chen@fanruan.com>
Date: Tue, 20 Oct 2020 14:05:27 +0800
Subject: [PATCH] =?UTF-8?q?DEC-15367=20fix:=20=E9=A2=84=E8=A7=88=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=88=87=E6=8D=A2=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                                    |  6 ++--
 .../fr/plugin/showtype/NewPreviewType.java    | 26 +++++++++-----
 .../showtype/NewPreviewTypeProvider.java      | 34 -------------------
 3 files changed, 21 insertions(+), 45 deletions(-)
 delete mode 100644 src/main/java/com/fr/plugin/showtype/NewPreviewTypeProvider.java

diff --git a/plugin.xml b/plugin.xml
index 24a82e7..40a8e21 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,18 +5,18 @@
     <active>yes</active>
     <version>1.0</version>
     <env-version>10.0</env-version>
-    <jartime>2020-08-27</jartime>
+    <jartime>2020-08-24</jartime>
     <vendor>finereport.mata</vendor>
     <description><![CDATA[新预览显示类型]]></description>
     <change-notes><![CDATA[
-        <p>[2020-08-27]新预览显示类型</p>
+        <p>[2020-08-24]新预览显示类型</p>
     ]]>
     </change-notes>
     <extra-core>
         <LocaleFinder class="com.fr.plugin.showtype.NewPreviewTypeLocaleFinder"/>
     </extra-core>
     <extra-decision>
-        <ShowTypeProvider class="com.fr.plugin.showtype.NewPreviewTypeProvider"/>
+        <ShowTypeProvider class="com.fr.plugin.showtype.NewPreviewType"/>
     </extra-decision>
     <function-recorder class="com.fr.plugin.showtype.NewPreviewType"/>
     <lifecycle-monitor class="com.fr.plugin.showtype.NewPreviewInitializeMonitor"/>
diff --git a/src/main/java/com/fr/plugin/showtype/NewPreviewType.java b/src/main/java/com/fr/plugin/showtype/NewPreviewType.java
index a673aee..440ca2d 100644
--- a/src/main/java/com/fr/plugin/showtype/NewPreviewType.java
+++ b/src/main/java/com/fr/plugin/showtype/NewPreviewType.java
@@ -1,28 +1,38 @@
 package com.fr.plugin.showtype;
 
-import com.fr.decision.authority.base.constant.type.show.ShowType;
+import com.fr.decision.fun.impl.AbstractShowTypeProvider;
+import com.fr.decision.web.DirectoryComponent;
 import com.fr.intelli.record.Focus;
 import com.fr.intelli.record.Original;
 import com.fr.record.analyzer.EnableMetrics;
+import com.fr.web.struct.Atom;
 
 /**
  * @Author Roger
- * @Date 2020/8/18 18:18
+ * @Date 2020/8/18 17:42
  * @Version 10.0
  */
 @EnableMetrics
-public class NewPreviewType extends ShowType {
+public class NewPreviewType extends AbstractShowTypeProvider {
 
-    public static final NewPreviewType KEY = new NewPreviewType();
+    @Override
+    public Atom attach() {
+        return DirectoryComponent.KEY;
+    }
 
     @Override
-    @Focus(id = "com.fr.plugin.showtype.v10", text = "Fine-Plugin_New_Preview_Type", source = Original.PLUGIN)
-    protected int getTypeValue() {
-        return 5;
+    public Atom client() {
+        return NewPreviewComponent.KEY;
     }
 
     @Override
-    public String getTypeName() {
+    public String typeName() {
         return "newPreview";
     }
+
+    @Override
+    @Focus(id = "com.fr.plugin.showtype.v10", text = "Fine-Plugin_New_Preview_Type", source = Original.PLUGIN)
+    public int typeValue() {
+        return 5;
+    }
 }
diff --git a/src/main/java/com/fr/plugin/showtype/NewPreviewTypeProvider.java b/src/main/java/com/fr/plugin/showtype/NewPreviewTypeProvider.java
deleted file mode 100644
index e7f3e15..0000000
--- a/src/main/java/com/fr/plugin/showtype/NewPreviewTypeProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.fr.plugin.showtype;
-
-import com.fr.decision.authority.base.constant.type.show.ShowType;
-import com.fr.decision.fun.impl.AbstractShowTypeProvider;
-import com.fr.decision.web.DirectoryComponent;
-import com.fr.web.struct.Atom;
-
-/**
- * @Author Roger
- * @Date 2020/8/18 17:42
- * @Version 10.0
- */
-public class NewPreviewTypeProvider extends AbstractShowTypeProvider {
-
-    @Override
-    public String nameForShowType() {
-        return "newPreview";
-    }
-
-    @Override
-    public ShowType registerShowType() {
-        return NewPreviewType.KEY;
-    }
-
-    @Override
-    public Atom attach() {
-        return DirectoryComponent.KEY;
-    }
-
-    @Override
-    public Atom client() {
-        return NewPreviewComponent.KEY;
-    }
-}