|
|
|
@ -852,7 +852,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
|
|
|
|
|
if (jt == null || jt.getEditingFILE() == null) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if (currentTemplateDeactivateFail()) { |
|
|
|
|
if (currentTemplateDeactivateFail(jt)) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
jt.addJTemplateActionListener(this); |
|
|
|
@ -877,7 +877,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
|
|
|
|
|
if (jt == null || jt.getEditingFILE() == null) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if (currentTemplateDeactivateFail()) { |
|
|
|
|
if (currentTemplateDeactivateFail(jt)) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
getCenterTemplateCardPane().showJTemplate(jt); |
|
|
|
@ -939,9 +939,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
|
|
|
|
|
* |
|
|
|
|
* @return 是否停用失败 |
|
|
|
|
*/ |
|
|
|
|
private boolean currentTemplateDeactivateFail() { |
|
|
|
|
private boolean currentTemplateDeactivateFail(JTemplate jt) { |
|
|
|
|
JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); |
|
|
|
|
return currentEditingTemplate != null && !currentEditingTemplate.deactivateTemplate(); |
|
|
|
|
return currentEditingTemplate != null && !currentEditingTemplate.deactivateTemplate(jt); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|