Merge pull request #1523 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '2f42c6c52ae82ed619f0ea861041047db79b7898':
  REPORT-28368 死锁问题 常量不需要每次读取
  CHART-13168 && REPORT-27122

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java

@@ -54,7 +54,7 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
 		if(ArrayUtils.isNotEmpty(colNames)){
 			return toColumnNameList(colNames);
 		} else if (ArrayUtils.isNotEmpty(colNamesInCache)) {
-			return toColumnNameList(colNames);
+			return toColumnNameList(colNamesInCache);
 		}
 		
 		EmbeddedTableData embeddedTableData = null;

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@@ -1141,8 +1141,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
             Thread.currentThread().interrupt();
         }
 
-        DesignerEnvManager.getEnvManager().setLastOpenFile(
-                HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());
+        JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (jt != null)  {
+            DesignerEnvManager.getEnvManager().setLastOpenFile(jt.getEditingFILE().getPath());
+        }
 
         DesignerEnvManager.getEnvManager().setLastWestRegionToolPaneY(
                 WestRegionContainerPane.getInstance().getToolPaneY());

designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java

@@ -53,6 +53,12 @@ public class DesignerLogHandler {
 
     private static final int SERVER_GAP_Y = -20;
 
+    private static final String ERROR_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + ":";
+
+    private static final String WARN_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + ":";
+
+    private static final String NORMAL_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Normal") + ":";
+
     public static DesignerLogHandler getInstance() {
 
         return HOLDER.singleton;
@@ -310,11 +316,11 @@ public class DesignerLogHandler {
         private String appendLocaleMark(String str, int style) {
 
             if (style == DesignerLogger.ERROR_INT) {
-                str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + ":" + str + "\n";
+                str = ERROR_MARK + str + "\n";
             } else if (style == DesignerLogger.WARN_INT) {
-                str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + ":" + str + "\n";
+                str = WARN_MARK + str + "\n";
             } else {
-                str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Normal") + ":" + str + "\n";
+                str = NORMAL_MARK + str + "\n";
             }
             return str;
         }