Browse Source

Merge pull request #1483 in BA/design from ~MOMEAK/design9.0:feature/9.0 to feature/9.0

* commit 'b77d5e65a77353c96647751a6c9f5b3dd8ee4ace':
  REPORT-5794 DesignerFrame和HistoryTemplateListPane的改动, release里有, feature里没有, 合代码冲突了, 需要手动patch
  REPORT-5794 DesignerFrame和HistoryTemplateListPane的改动, release里有, feature里没有, 合代码冲突了, 需要手动patch
master
superman 7 years ago
parent
commit
b877d4fa27
  1. 15
      designer_base/src/com/fr/design/file/HistoryTemplateListPane.java
  2. 314
      designer_base/src/com/fr/design/mainframe/DesignerFrame.java

15
designer_base/src/com/fr/design/file/HistoryTemplateListPane.java

@ -9,6 +9,7 @@ import java.util.logging.Level;
import javax.swing.*;
import com.fr.base.chart.chartdata.CallbackEvent;
import com.fr.design.constants.UIConstants;
import com.fr.design.DesignerEnvManager;
import com.fr.design.data.DesignTableDataManager;
@ -25,7 +26,6 @@ import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilist.UIList;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JTemplate;
import com.fr.design.mainframe.JVirtualTemplate;
import com.fr.design.module.DesignModuleFactory;
import com.fr.file.filetree.FileNode;
import com.fr.general.ComparatorUtils;
@ -36,7 +36,7 @@ import com.fr.stable.Constants;
import com.fr.stable.project.ProjectConstants;
import com.fr.design.utils.gui.GUIPaintUtils;
public class HistoryTemplateListPane extends JPanel implements FileOperations {
public class HistoryTemplateListPane extends JPanel implements FileOperations, CallbackEvent {
//最大保存内存中面板数,为0时关闭优化内存
private static final int DEAD_LINE = 5;
private static final int LIST_BORDER = 4;
@ -104,7 +104,8 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations {
}
/**
*关闭选择的文件
* 关闭选择的文件
*
* @param selected 选择的
*/
public void closeSelectedReport(JTemplate<?, ?> selected) {
@ -129,6 +130,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations {
/**
* 临时关闭选择的文件
*
* @param selected 选择的
*/
public void closeVirtualSelectedReport(JTemplate<?, ?> selected) {
@ -235,6 +237,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations {
/**
* 判断是否打开过该模板
*
* @param filename 文件名
* @return 文件位置
*/
@ -250,6 +253,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations {
/**
* 是否是当前编辑的文件
*
* @param filename 文件名
* @return 是则返回TRUE
*/
@ -258,6 +262,10 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations {
return ComparatorUtils.equals(filename, editingFileName);
}
@Override
public void callback() {
getCurrentEditingTemplate().repaint();
}
private class HistoryListCellRender extends DefaultListCellRenderer {
@ -388,6 +396,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations {
/**
* 路径
*
* @return 路径
*/
public String getSelectedTemplatePath() {

314
designer_base/src/com/fr/design/mainframe/DesignerFrame.java

@ -22,7 +22,6 @@ import com.fr.design.gui.imenu.UIMenuHighLight;
import com.fr.design.gui.iscrollbar.UIScrollBar;
import com.fr.design.gui.itoolbar.UIToolbar;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.hold.DefaultTitlePlace;
import com.fr.design.mainframe.loghandler.LogMessageBar;
import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
@ -37,6 +36,7 @@ import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger;
import com.fr.general.GeneralContext;
import com.fr.general.Inter;
import com.fr.general.env.EnvContext;
import com.fr.plugin.context.PluginContext;
import com.fr.plugin.injectable.PluginModule;
import com.fr.plugin.manage.PluginFilter;
@ -65,15 +65,13 @@ import java.util.List;
import java.util.logging.Level;
public class DesignerFrame extends JFrame implements JTemplateActionListener, TargetModifiedListener {
public static final String DESIGNER_FRAME_NAME = "designer_frame";
public static final Dimension MIN_SIZE = new Dimension(100, 100);
private static final long serialVersionUID = -8732559571067484460L;
private static final int LEFT_ALIGN_GAP = -5;
private static final int MENU_HEIGHT = 26;
private static final Integer SECOND_LAYER = new Integer(100);
private static final Integer TOP_LAYER = new Integer((200));
public static final String DESIGNER_FRAME_NAME = "designer_frame";
public static final Dimension MIN_SIZE = new Dimension(100, 100);
private static java.util.List<App<?>> appList = new java.util.ArrayList<App<?>>();
private ToolBarMenuDock ad;
@ -140,81 +138,45 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
}
};
/**
* 注册app.
*
* @param app
* 注册app.
*/
public static void registApp(App<?> app) {
if (app != null) {
appList.add(app);
}
}
public static void removeApp(App<?> app) {
if (app != null) {
appList.remove(app);
}
}
protected DesktopCardPane getCenterTemplateCardPane() {
return centerTemplateCardPane;
private MouseListener closeMouseListener = new MouseAdapter() {
public void mousePressed(MouseEvent e) {
closeMode = UIConstants.CLOSE_PRESS_AUTHORITY;
closeButton.setBackground(UIConstants.NORMAL_BACKGROUND);
closeButton.repaint();
}
/**
* 初始menuPane的方法 方便OEM时修改该组件
*/
protected void initMenuPane(){
menuPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
menuPane.add(new UIMenuHighLight(), BorderLayout.SOUTH);
menuPane.add(initNorthEastPane(ad), BorderLayout.EAST);
basePane.add(menuPane, BorderLayout.NORTH);
this.resetToolkitByPlus(null);
public void mouseExited(MouseEvent e) {
closeMode = UIConstants.CLOSE_OF_AUTHORITY;
closeButton.setBackground(UIConstants.NORMAL_BACKGROUND);
closeButton.repaint();
}
/**
* @param ad
* @return
*/
protected JPanel initNorthEastPane(final ToolBarMenuDock ad) {
//hugh: private修改为protected方便oem的时候修改右上的组件构成
//顶部日志+登陆按钮
final JPanel northEastPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
//优先级为-1,保证最后全面刷新一次
GeneralContext.listenPluginRunningChanged(new PluginEventListener(-1) {
@Override
public void on(PluginEvent event) {
refreshNorthEastPane(northEastPane, ad);
DesignUtils.refreshDesignerFrame(FRContext.getCurrentEnv());
public void mouseMoved(MouseEvent e) {
closeMode = UIConstants.CLOSE_OVER_AUTHORITY;
closeButton.setBackground(UIConstants.NORMAL_BACKGROUND);
closeButton.repaint();
}
}, new PluginFilter() {
@Override
public boolean accept(PluginContext context) {
return context.contain(PluginModule.ExtraDesign);
public void mouseReleased(MouseEvent e) {
if (BaseUtils.isAuthorityEditing()) {
BaseUtils.setAuthorityEditing(false);
WestRegionContainerPane.getInstance().replaceDownPane(
TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()));
HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshEastPropertiesPane();
DesignerContext.getDesignerFrame().resetToolkitByPlus(
HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getToolBarMenuDockPlus());
needToAddAuhtorityPaint();
refreshDottedLine();
fireAuthorityStateToNomal();
}
});
refreshNorthEastPane(northEastPane, ad);
return northEastPane;
}
private void refreshNorthEastPane(JPanel northEastPane, ToolBarMenuDock ad) {
northEastPane.removeAll();
TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING);
if (processor == null) {
processor = new DefaultTitlePlace();
}
processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane());
if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
northEastPane.add(ad.createAlphafinePane(), BorderLayout.CENTER);
}
public void mouseEntered(MouseEvent e) {
closeMode = UIConstants.CLOSE_OVER_AUTHORITY;
closeButton.setBackground(UIConstants.NORMAL_BACKGROUND);
closeButton.repaint();
}
};
public DesignerFrame(ToolBarMenuDock ad) {
@ -240,7 +202,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
eastCenterPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
eastCenterPane.add(combineUp = combineUpTooBar(null), BorderLayout.NORTH);
JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
panel.add(newWorkBookPane =ad.getNewTemplatePane(), BorderLayout.WEST);
panel.add(newWorkBookPane = ad.getNewTemplatePane(), BorderLayout.WEST);
panel.add(MutilTempalteTabPane.getInstance(), BorderLayout.CENTER);
eastCenterPane.add(panel, BorderLayout.CENTER);
@ -255,11 +217,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
basePane.add(centerPane, BorderLayout.CENTER);
laoyoutWestPane();
// JPanel eastRegionPane = new JPanel(new BorderLayout());
// eastRegionPane.add(EastRegionContainerPane.getInstance(), BorderLayout.CENTER);
// eastRegionPane.add(JSliderPane.getInstance(), BorderLayout.SOUTH);
// basePane.add(eastRegionPane, BorderLayout.EAST);
basePane.add(EastRegionContainerPane.getInstance(), BorderLayout.EAST);
basePane.setBounds(0, 0, contentWidth, contentHeight);
@ -269,7 +226,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
modWindowBounds();
// p:检查所有按钮的可见性和是否可以编辑性.
checkToolbarMenuEnable();
@ -292,6 +248,83 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
initMenuPane();
}
/**
* 注册app.
*
* @param app 注册app.
*/
public static void registApp(App<?> app) {
if (app != null) {
appList.add(app);
}
}
public static void removeApp(App<?> app) {
if (app != null) {
appList.remove(app);
}
}
protected DesktopCardPane getCenterTemplateCardPane() {
return centerTemplateCardPane;
}
/**
* 初始menuPane的方法 方便OEM时修改该组件
*/
protected void initMenuPane() {
menuPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
menuPane.add(new UIMenuHighLight(), BorderLayout.SOUTH);
menuPane.add(initNorthEastPane(ad), BorderLayout.EAST);
basePane.add(menuPane, BorderLayout.NORTH);
this.resetToolkitByPlus(null);
}
/**
* @param ad
* @return
*/
protected JPanel initNorthEastPane(final ToolBarMenuDock ad) {
//hugh: private修改为protected方便oem的时候修改右上的组件构成
//顶部日志+登陆按钮
final JPanel northEastPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
//优先级为-1,保证最后全面刷新一次
GeneralContext.listenPluginRunningChanged(new PluginEventListener(-1) {
@Override
public void on(PluginEvent event) {
refreshNorthEastPane(northEastPane, ad);
DesignUtils.refreshDesignerFrame(FRContext.getCurrentEnv());
}
}, new PluginFilter() {
@Override
public boolean accept(PluginContext context) {
return context.contain(PluginModule.ExtraDesign);
}
});
refreshNorthEastPane(northEastPane, ad);
return northEastPane;
}
private void refreshNorthEastPane(JPanel northEastPane, ToolBarMenuDock ad) {
northEastPane.removeAll();
northEastPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0));
northEastPane.add(LogMessageBar.getInstance());
TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING);
if (processor != null) {
processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane());
}
northEastPane.add(ad.createAlphaFinePane());
if (!DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
ad.createAlphaFinePane().setVisible(false);
}
northEastPane.add(ad.createBBSLoginPane());
}
public void initTitleIcon() {
try {
@SuppressWarnings("unchecked")
@ -304,20 +337,20 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
}
}
private void addWindowListeners(ArrayList<WindowListener> listeners){
for(WindowListener listener : listeners){
private void addWindowListeners(ArrayList<WindowListener> listeners) {
for (WindowListener listener : listeners) {
this.addWindowListener(listener);
}
}
protected ArrayList<WindowListener> getFrameListeners(){
protected ArrayList<WindowListener> getFrameListeners() {
ArrayList<WindowListener> arrayList = new ArrayList<WindowListener>();
arrayList.add(windowAdapter);
return arrayList;
}
protected void laoyoutWestPane(){
protected void laoyoutWestPane() {
basePane.add(WestRegionContainerPane.getInstance(), BorderLayout.WEST);
}
@ -402,46 +435,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
addDottedLine();
}
private MouseListener closeMouseListener = new MouseAdapter() {
public void mousePressed(MouseEvent e) {
closeMode = UIConstants.CLOSE_PRESS_AUTHORITY;
closeButton.setBackground(UIConstants.NORMAL_BACKGROUND);
closeButton.repaint();
}
public void mouseExited(MouseEvent e) {
closeMode = UIConstants.CLOSE_OF_AUTHORITY;
closeButton.setBackground(UIConstants.NORMAL_BACKGROUND);
closeButton.repaint();
}
public void mouseMoved(MouseEvent e) {
closeMode = UIConstants.CLOSE_OVER_AUTHORITY;
closeButton.setBackground(UIConstants.NORMAL_BACKGROUND);
closeButton.repaint();
}
public void mouseReleased(MouseEvent e) {
if (BaseUtils.isAuthorityEditing()) {
BaseUtils.setAuthorityEditing(false);
WestRegionContainerPane.getInstance().replaceDownPane(
TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()));
HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshEastPropertiesPane();
DesignerContext.getDesignerFrame().resetToolkitByPlus(
HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getToolBarMenuDockPlus());
needToAddAuhtorityPaint();
refreshDottedLine();
fireAuthorityStateToNomal();
}
}
public void mouseEntered(MouseEvent e) {
closeMode = UIConstants.CLOSE_OVER_AUTHORITY;
closeButton.setBackground(UIConstants.NORMAL_BACKGROUND);
closeButton.repaint();
}
};
/**
* 刷新CloseButton
*/
@ -499,9 +492,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
return combineUp;
}
private void addExtraButtons(){
private void addExtraButtons() {
JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
if(jt == null){
if (jt == null) {
return;
}
@ -515,9 +508,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
}
}
private void addShareButton(){
private void addShareButton() {
JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
if(jt == null){
if (jt == null) {
return;
}
@ -531,10 +524,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
/**
* 检查
*
* @param flag
* 组件是否可见
* @param al
* 组件名称
* @param flag 组件是否可见
* @param al 组件名称
*/
public void checkCombineUp(boolean flag, ArrayList<String> al) {
combineUp.checkComponentsByNames(flag, al);
@ -551,8 +542,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
/**
* 重置相关的工具条.
*
* @param plus
* 工具条中相关信息
* @param plus 工具条中相关信息
*/
public void resetToolkitByPlus(ToolBarMenuDockPlus plus) {
if (plus == null) {
@ -715,16 +705,16 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
editingTemplate.saveTemplate();
FRLogger.getLogger().log(
Level.INFO,
Inter.getLocText(new String[] { "Template", "already-saved" }, new String[] {
editingTemplate.getEditingFILE().getName(), "." }));
Inter.getLocText(new String[]{"Template", "already-saved"}, new String[]{
editingTemplate.getEditingFILE().getName(), "."}));
}
} else {
if (editingTemplate.saveTemplate()) {
editingTemplate.saveTemplate();
FRLogger.getLogger().log(
Level.INFO,
Inter.getLocText(new String[] { "Template", "already-saved" }, new String[] {
editingTemplate.getEditingFILE().getName(), "." }));
Inter.getLocText(new String[]{"Template", "already-saved"}, new String[]{
editingTemplate.getEditingFILE().getName(), "."}));
}
}
}
@ -741,8 +731,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
/**
* 添加 模板, 并激活.
*
* @param jt
* 添加的模板.
* @param jt 添加的模板.
*/
public void addAndActivateJTemplate(JTemplate<?, ?> jt) {
if (jt == null || jt.getEditingFILE() == null) {
@ -758,8 +747,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
/**
* 激活已经存在的模板
*
* @param jt
* 模板
* @param jt 模板
*/
public void activateJTemplate(JTemplate<?, ?> jt) {
if (jt == null || jt.getEditingFILE() == null) {
@ -773,8 +761,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
/**
* 对象侦听
*
* @param e
* 事件
* @param e 事件
*/
public void targetModified(TargetModifiedEvent e) {
this.checkToolbarMenuEnable();
@ -783,8 +770,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
/**
* 模板关闭时 处理.
*
* @param jt
* 模板
* @param jt 模板
*/
public void templateClosed(JTemplate<?, ?> jt) {
}
@ -792,8 +778,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
/**
* 模板打开时 处理.
*
* @param jt
* 模板
* @param jt 模板
*/
public void templateOpened(JTemplate<?, ?> jt) {
}
@ -801,8 +786,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
/**
* 模板保存时 处理.
*
* @param jt
* 模板
* @param jt 模板
*/
public void templateSaved(JTemplate<?, ?> jt) {
this.checkToolbarMenuEnable();
@ -811,8 +795,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
/**
* 打开模板文件,如果是已经打开的就激活此模板所对应的JInternalFrame
*
* @param tplFile
* 文件
* @param tplFile 文件
*/
public void openTemplate(FILE tplFile) {
// 测试连接,如果连接失败,则提示
@ -821,8 +804,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
&& !FRContext.getCurrentEnv().testServerConnectionWithOutShowMessagePane()) {
JOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(),
Inter.getLocText(new String[] { "FR-Chart-Server_disconnected", "FR-Server-Design_template_unopened" }, new String[] {
",", "!" }), Inter.getLocText("FR-Server-All_Error"), JOptionPane.ERROR_MESSAGE);
Inter.getLocText(new String[]{"FR-Chart-Server_disconnected", "FR-Server-Design_template_unopened"}, new String[]{
",", "!"}), Inter.getLocText("FR-Server-All_Error"), JOptionPane.ERROR_MESSAGE);
return;
}
} catch (Exception e) {
@ -849,12 +832,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
/**
* 是否不合版本的设计器
*
* @param jt
* 当前模板
*
* @param jt 当前模板
* @return 是否不合版本
*
*
* @date 2014-10-14-下午6:30:37
*/
private boolean inValidDesigner(JTemplate jt) {
@ -864,10 +843,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
/**
* 打开指定的文件
*
* @param tplFile
* 指定的文件
*
*
* @param tplFile 指定的文件
* @date 2014-10-14-下午6:31:05
*/
private void openFile(FILE tplFile) {
@ -913,17 +889,13 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
/**
* 激活指定的模板
*
* @param tplFile
* 模板文件
* @param jt
* 当前报表
*
*
* @param tplFile 模板文件
* @param jt 当前报表
* @date 2014-10-14-下午6:31:23
*/
private void activeTemplate(FILE tplFile, JTemplate jt) {
// 如果该模板已经打开,则进行激活就可以了
String fullName = StableUtils.pathJoin(new String[] { ProjectConstants.REPORTLETS_NAME, tplFile.getName() });
String fullName = StableUtils.pathJoin(new String[]{ProjectConstants.REPORTLETS_NAME, tplFile.getName()});
if (tplFile instanceof FileNodeFILE) {
fullName = ((FileNodeFILE) tplFile).getEnvPath() + "/" + tplFile.getPath();
}
@ -931,7 +903,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
if (tplFile instanceof FileFILE) {
fullName = tplFile.getPath();
}
fullName = fullName.replaceAll("/", "\\\\");
fullName = OperatingSystem.isWindows() ? fullName.replaceAll("/", "\\\\") : fullName.replaceAll("\\\\", "/");
int index = HistoryTemplateListPane.getInstance().contains(fullName);
List<JTemplate<?, ?>> historyList = HistoryTemplateListPane.getInstance().getHistoryList();
if (index != -1) {
@ -939,7 +911,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
} else {
this.addAndActivateJTemplate(jt);
}
//REPORT-5084:激活后刷新一下右側面板
jt.refreshEastPropertiesPane();
}
/**
@ -976,8 +949,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
Env currentEnv = FRContext.getCurrentEnv();
try {
EnvContext.fireBeforeSignOut();
currentEnv.signOut();
GeneralContext.fireEnvSignOutListener();
EnvContext.fireAfterSignOut();
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage(), e);
}

Loading…
Cancel
Save