From cd5764193458b4fcef3766ad773a6428260c8377 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Fri, 8 Jan 2021 17:01:25 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-46585=20=E5=9C=A8=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=BC=96=E8=BE=91=E7=9A=84=E6=9C=AA=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=A8=A1=E6=9D=BF=E5=88=87=E6=8D=A2=E5=9B=9E=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E4=B8=8D=E8=83=BD=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/JTemplate.java    |  2 +-
 .../fr/design/mainframe/JTemplateFactory.java | 30 ++++++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index f540cdbc64..4007be8a31 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@@ -341,7 +341,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     public void refreshResource(FILE file) {
 
         try {
-            this.template = JTemplateFactory.asIOFile(file);
+            this.template = JTemplateFactory.asIOFile(file, this.suffix());
             setTarget(this.template);
 
             // 先移除旧的。
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java
index 678b9bf841..5e75cc64be 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java
@@ -3,11 +3,12 @@ package com.fr.design.mainframe;
 import com.fr.base.io.BaseBook;
 import com.fr.file.FILE;
 import com.fr.stable.CoreConstants;
-import com.fr.third.javax.annotation.Nonnull;
-import com.fr.third.javax.annotation.Nullable;
+import com.fr.stable.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public final class JTemplateFactory {
     private static final List<App<?>> ALL_APP = new ArrayList<App<?>>();
@@ -21,8 +22,7 @@ public final class JTemplateFactory {
      * @param file 包含了模板名称，类型以及内容的文件
      * @return 设计器编辑的模板对象
      */
-    @Nullable
-    public static JTemplate<?, ?> createJTemplate(@Nonnull FILE file) {
+    public static JTemplate<?, ?> createJTemplate(@NotNull FILE file) {
 
         String fileName = file.getName();
         int indexOfLastDot = fileName.lastIndexOf(CoreConstants.DOT);
@@ -43,15 +43,19 @@ public final class JTemplateFactory {
         }
         return null;
     }
-    
-    public static <T extends BaseBook> T asIOFile(@Nonnull FILE file) {
-    
-        String fileName = file.getName();
-        int indexOfLastDot = fileName.lastIndexOf(CoreConstants.DOT);
+
+    @Nullable
+    public static <T extends BaseBook> T asIOFile(@NotNull FILE file, String fileNameOrSuffix) {
+
+        if (StringUtils.isEmpty(fileNameOrSuffix)) {
+            return null;
+        }
+
+        int indexOfLastDot = fileNameOrSuffix.lastIndexOf(CoreConstants.DOT);
         if (indexOfLastDot < 0) {
             return null;
         }
-        String fileExtension = fileName.substring(indexOfLastDot + 1);
+        String fileExtension = fileNameOrSuffix.substring(indexOfLastDot + 1);
         for (App<?> app : ALL_APP) {
             String[] defaultAppExtensions = app.defaultExtensions();
             for (String defaultAppExtension : defaultAppExtensions) {
@@ -66,6 +70,12 @@ public final class JTemplateFactory {
         return null;
     }
 
+    @Nullable
+    public static <T extends BaseBook> T asIOFile(@NotNull FILE file) {
+        return asIOFile(file, file.getName());
+    }
+
+
 
     /**
      * 注册app.