Browse Source

Merge remote-tracking branch 'origin/release/10.0' into release/10.0

feature/big-screen
pengda 4 years ago
parent
commit
4fd85e2106
  1. 1
      designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
  2. 12
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  3. 3
      designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/solid/SolidCollector.java

1
designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java

@ -422,5 +422,4 @@ public class HistoryTemplateListCache implements CallbackEvent {
jt.refreshResource(); jt.refreshResource();
} }
} }
} }

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

@ -1105,7 +1105,17 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
int index = HistoryTemplateListCache.getInstance().contains(tplFile); int index = HistoryTemplateListCache.getInstance().contains(tplFile);
if (index != -1) { if (index != -1) {
JTemplate jt = HistoryTemplateListCache.getInstance().getHistoryList().get(index); JTemplate jt = HistoryTemplateListCache.getInstance().getHistoryList().get(index);
if (!(jt instanceof JVirtualTemplate)) { if (jt instanceof JVirtualTemplate) {
// 如果是JVirtualTemplate 创建真实JTemplate
JTemplate realJTemplate = JTemplateFactory.createJTemplate(tplFile);
if (realJTemplate == null) {
return;
}
// 由JVirtualTemplate激活真实JTemplate 本质在historyList中进行替换
// 同时 realJTemplate被管理起来 不需要主动释放 关闭时会自动释放
jt.activeJTemplate(index, realJTemplate);
return;
} else {
jt.activeOldJTemplate(); jt.activeOldJTemplate();
return; return;
} }

3
designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/solid/SolidCollector.java

@ -58,8 +58,9 @@ public class SolidCollector {
HttpToolbox.post(url, params); HttpToolbox.post(url, params);
deleteSolidFile(); deleteSolidFile();
FineLoggerFactory.getLogger().info("send solid content to cloud center success.");
} }
FineLoggerFactory.getLogger().info("send solid content to cloud center success.");
} catch (Exception e) { } catch (Exception e) {
FineLoggerFactory.getLogger().info(e.getMessage(), e); FineLoggerFactory.getLogger().info(e.getMessage(), e);
} finally { } finally {

Loading…
Cancel
Save