From 7364fd157bb742d1ccc7e9bb47d15d4d15b327ae Mon Sep 17 00:00:00 2001 From: hades Date: Tue, 24 Mar 2020 14:14:30 +0800 Subject: [PATCH] CHART-13168 && REPORT-27122 --- .../data/tabledata/wrapper/AbstractTableDataWrapper.java | 2 +- .../main/java/com/fr/design/mainframe/DesignerFrame.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java index a5d20cfcfb..82022bea60 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java +++ b/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; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java index e66515fe9a..6d9dc3b619 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java +++ b/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());