diff --git a/designer/src/com/fr/design/mainframe/JWorkBook.java b/designer/src/com/fr/design/mainframe/JWorkBook.java index 889c2163f7..2b23dabb7f 100644 --- a/designer/src/com/fr/design/mainframe/JWorkBook.java +++ b/designer/src/com/fr/design/mainframe/JWorkBook.java @@ -849,28 +849,6 @@ public class JWorkBook extends JTemplate { return true; } - @Override - public void activeJTemplate(int index, JTemplate jt) { - DesignerContext.getDesignerFrame().activateJTemplate(this); - } - - @Override - public void activeOldJTemplate() { - DesignerContext.getDesignerFrame().activateJTemplate(this); - } - - @Override - public void activeNewJTemplate() { - DesignerContext.getDesignerFrame().addAndActivateJTemplate(this); - } - - @Override - public void closeOverLineTemplate(int index) { - JTemplate overTemplate = HistoryTemplateListPane.getInstance().getHistoryList().get(index); - HistoryTemplateListPane.getInstance().closeVirtualSelectedReport(overTemplate); - HistoryTemplateListPane.getInstance().getHistoryList().set(index, new JVirtualTemplate(overTemplate.getEditingFILE())); - } - @Override public HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { return ReportHyperlinkGroupPane.getInstance(hyperlinkGroupPaneActionProvider); diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java index 81fffad7c3..c7ba2348cf 100644 --- a/designer_base/src/com/fr/design/mainframe/JTemplate.java +++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java @@ -890,25 +890,35 @@ public abstract class JTemplate> ex * 激活指定的template * */ - public abstract void activeJTemplate(int index, JTemplate jt); + public void activeJTemplate(int index, JTemplate jt) { + DesignerContext.getDesignerFrame().activateJTemplate(this); + }; /** * 激活已存在的模板 * */ - public abstract void activeOldJTemplate(); + public void activeOldJTemplate() { + DesignerContext.getDesignerFrame().activateJTemplate(this); + }; /** * 激活新的模板 * */ - public abstract void activeNewJTemplate(); + public void activeNewJTemplate() { + DesignerContext.getDesignerFrame().addAndActivateJTemplate(this); + }; /** * 后台关闭template * */ - public abstract void closeOverLineTemplate(int index); + public void closeOverLineTemplate(int index) { + JTemplate overTemplate = HistoryTemplateListPane.getInstance().getHistoryList().get(index); + HistoryTemplateListPane.getInstance().closeVirtualSelectedReport(overTemplate); + HistoryTemplateListPane.getInstance().getHistoryList().set(index, new JVirtualTemplate(overTemplate.getEditingFILE())); + }; /** diff --git a/designer_base/src/com/fr/design/mainframe/JVirtualTemplate.java b/designer_base/src/com/fr/design/mainframe/JVirtualTemplate.java index 0637a1a570..897991a916 100644 --- a/designer_base/src/com/fr/design/mainframe/JVirtualTemplate.java +++ b/designer_base/src/com/fr/design/mainframe/JVirtualTemplate.java @@ -71,7 +71,6 @@ public class JVirtualTemplate extends JTemplate { return null; } - @Override public JComponent getCurrentReportComponentPane() { return null; } @@ -247,7 +246,6 @@ public class JVirtualTemplate extends JTemplate { return null; } - @Override public HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { return null; } diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java index 9672936dc1..47fbd03339 100644 --- a/designer_form/src/com/fr/design/mainframe/JForm.java +++ b/designer_form/src/com/fr/design/mainframe/JForm.java @@ -143,28 +143,6 @@ public class JForm extends JTemplate implements BaseJForm { return false; } - @Override - public void activeJTemplate(int index, JTemplate jt) { - DesignerContext.getDesignerFrame().activateJTemplate(this); - } - - @Override - public void activeOldJTemplate() { - DesignerContext.getDesignerFrame().activateJTemplate(this); - } - - @Override - public void activeNewJTemplate() { - DesignerContext.getDesignerFrame().addAndActivateJTemplate(this); - } - - @Override - public void closeOverLineTemplate(int index) { - JTemplate overTemplate = HistoryTemplateListPane.getInstance().getHistoryList().get(index); - HistoryTemplateListPane.getInstance().closeVirtualSelectedReport(overTemplate); - HistoryTemplateListPane.getInstance().getHistoryList().set(index, new JVirtualTemplate(overTemplate.getEditingFILE())); - } - /** * 返回当前支持的超链界面pane *