Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Pull request #3336: 无jira任务，bugfix合feature，解决冲突 

Merge in DESIGN/design from ~LUCIAN.CHEN/design:feature/10.0 to feature/10.0

* commit '41ec46537ce98f80f38f5103cb63004532306eb6':
  无jira任务，单元测试误屏蔽
  REPORT-46971 设计面板-普通报表&决策报表-参数面板-插件类控件右侧第四个tab页悬浮时和设置页面上方均显示“组件设置”，应“控件设置”
  REPORT-46892 切换目录有插件版本不匹配目录配置页面显示问题
  REPORT-46584 【10.0.13冒烟】设计器卡死
  REPORT-46892 【冒烟】切换到本地目录有插件版本不匹配时，远程配置页面会消失的比较慢
  REPORT-46585 fix 单个插件监听逻辑保持与之前一致
  REPORT-46585 切换工作目录时 先移除后添加插件监听
  REPORT-46285 jdk11-背景图标，有一点异常的红色显示 【问题原因】这个问题是由jdk差异造成的，前景色和背景色图标都是由上面的图标+下面的取色矩形组成，下面的取色矩形的位置由整个图标的宽高决定，而在jdk11下，拿到的宽高与jdk8一样，但是最终绘制出来的取色矩形会往左边偏移一点，大概是1px，而背景色图标之前下面的取色矩形初始为红色，在偏移了之后，绘制底下取色矩形不能完全覆盖初始红色，所以漏了一点出来，表现为异常的红色。 【改动思路】与产品确认后，决定先把背景色图标取色矩形设置为透明色，这样就不会漏出一点红色，而取色矩形绘制有点偏移的问题需要去改一下UIColorButton的UI，这个在换完相关图标后再统一修改比较好
  REPORT-45689 加上判空
  CHART-17822 设计器界面内的图形不小心切换到其他图形且不保存，点击撤销键没法返回到切换前的图形
  REPORT-46574 & REPORT-46813 & REPORT-46550
  无jira任务，新增的方法代码合并重复
feature/10.0
ju|剧浩宇 4 years ago
parent
46287ac4d0 41ec46537c
commit
28a1903e12
14 changed files with 471 additions and 365 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
  2. 38
      designer-base/src/main/java/com/fr/design/PluginClassRefreshManager.java
  3. 39
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  4. 44
      designer-base/src/main/java/com/fr/env/PluginErrorRemindDialog.java
  5. 1
      designer-base/src/main/resources/com/fr/design/images/gui/color/background_normal.svg
  6. BIN
      designer-base/src/main/resources/com/fr/design/images/warnings/icon_WarningIcon_normal.png
  7. BIN
      designer-base/src/main/resources/com/fr/design/images/warnings/icon_WarningIcon_normal@2x.png
  8. 283
      designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java
  9. 310
      designer-base/src/test/java/com/fr/design/extra/PluginOperateUtilsTest.java
  10. 10
      designer-form/src/main/java/com/fr/design/mainframe/JForm.java
  11. 14
      designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
  12. 16
      designer-form/src/main/java/com/fr/design/mainframe/widget/ui/WidgetBasicPropertyPaneFactory.java
  13. 11
      designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
  14. 50
      designer-realize/src/test/java/com/fr/start/module/DesignerWorkspaceProviderTest.java

18
designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
Unescape View File

@ -146,7 +146,7 @@ public class EnvChangeEntrance {
template.refreshToolArea(); template.refreshToolArea();
} }
showServiceDialog(selectedEnv); showServiceDialog(selectedEnv);
pluginErrorRemind(selectedEnv); pluginErrorRemind();
} catch (WorkspaceAuthException | RegistEditionException e) { } catch (WorkspaceAuthException | RegistEditionException e) {
// String title = Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed"); // String title = Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed");
// String title = Toolkit.i18nText("Fine-Design_Basic_Lic_Does_Not_Support_Remote"); // String title = Toolkit.i18nText("Fine-Design_Basic_Lic_Does_Not_Support_Remote");
@ -302,17 +302,23 @@ public class EnvChangeEntrance {
/** /**
* 插件启动错误信息提示 * 插件启动错误信息提示
* @param selectedEnv 选择的工作环境
*/ */
public void pluginErrorRemind(DesignerWorkspaceInfo selectedEnv) { public void pluginErrorRemind() {
if (selectedEnv.getType() == DesignerWorkspaceType.Remote) { if (!WorkContext.getCurrent().isLocal()) {
return; return;
} }
String content = PluginErrorRemindHandler.pluginErrorContent(); String content = PluginErrorRemindHandler.pluginErrorContent();
if (StringUtils.isNotEmpty(content)) { if (StringUtils.isNotEmpty(content)) {
PluginErrorRemindDialog dialog = new PluginErrorRemindDialog(DesignerContext.getDesignerFrame(), content); // 该操作需要在当前awt操作之后执行，使用SwingUtilities.invokeLater将其置于awt操作对列末尾
dialog.setVisible(true); // 若使用UIUtil.invokeLaterIfNeeded，会立即执行，影响其他UI操作
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
PluginErrorRemindDialog dialog = new PluginErrorRemindDialog(DesignerContext.getDesignerFrame(), content);
dialog.setVisible(true);
}
});
} }
} }

38
designer-base/src/main/java/com/fr/design/PluginClassRefreshManager.java
Unescape View File

@ -39,6 +39,23 @@ public class PluginClassRefreshManager {
} }
}; };
private final PluginEventListener beforeAllPluginActive = new PluginEventListener() {
@Override
public void on(PluginEvent event) {
PluginListenerRegistration.getInstance().stopListen(pluginAfterRunEventListener);
}
};
private final PluginEventListener afterAllPluginsActive = new PluginEventListener() {
@Override
public void on(PluginEvent event) {
PluginListenerRegistration.getInstance().listen(PluginEventType.AfterRun, pluginAfterRunEventListener);
if (DesignerLaunchStatus.getStatus() != DesignerLaunchStatus.WORKSPACE_INIT_COMPLETE) {
HistoryTemplateListCache.getInstance().reloadAllEditingTemplate();
}
}
};
public static PluginClassRefreshManager getInstance() { public static PluginClassRefreshManager getInstance() {
return INSTANCE; return INSTANCE;
@ -50,29 +67,20 @@ public class PluginClassRefreshManager {
} }
private PluginClassRefreshManager() { private PluginClassRefreshManager() {
PluginListenerRegistration.getInstance().listen(PluginEventType.BeforeAllActive, new PluginEventListener() { PluginListenerRegistration.getInstance().listen(PluginEventType.BeforeAllActive, beforeAllPluginActive);
@Override PluginListenerRegistration.getInstance().listen(PluginEventType.AfterAllActive, afterAllPluginsActive);
public void on(PluginEvent event) {
removePluginListener();
}
});
PluginListenerRegistration.getInstance().listen(PluginEventType.AfterAllActive, new PluginEventListener() {
@Override
public void on(PluginEvent event) {
addPluginListener();
if (DesignerLaunchStatus.getStatus() != DesignerLaunchStatus.WORKSPACE_INIT_COMPLETE) {
HistoryTemplateListCache.getInstance().reloadAllEditingTemplate();
}
}
});
} }
public void removePluginListener() { public void removePluginListener() {
PluginListenerRegistration.getInstance().stopListen(this.pluginAfterRunEventListener); PluginListenerRegistration.getInstance().stopListen(this.pluginAfterRunEventListener);
PluginListenerRegistration.getInstance().stopListen(this.beforeAllPluginActive);
PluginListenerRegistration.getInstance().stopListen(this.afterAllPluginsActive);
} }
public void addPluginListener() { public void addPluginListener() {
PluginListenerRegistration.getInstance().listen(PluginEventType.AfterRun, this.pluginAfterRunEventListener); PluginListenerRegistration.getInstance().listen(PluginEventType.AfterRun, this.pluginAfterRunEventListener);
PluginListenerRegistration.getInstance().listen(PluginEventType.BeforeAllActive, beforeAllPluginActive);
PluginListenerRegistration.getInstance().listen(PluginEventType.AfterAllActive, afterAllPluginsActive);
} }
} }

39
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
Unescape View File

@ -47,7 +47,6 @@ import com.fr.design.menu.MenuDef;
import com.fr.design.menu.NameSeparator; import com.fr.design.menu.NameSeparator;
import com.fr.design.menu.ShortCut; import com.fr.design.menu.ShortCut;
import com.fr.design.preview.PagePreview; import com.fr.design.preview.PagePreview;
import com.fr.design.ui.util.UIUtil;
import com.fr.design.write.submit.DBManipulationInWidgetEventPane; import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
import com.fr.design.write.submit.DBManipulationPane; import com.fr.design.write.submit.DBManipulationPane;
import com.fr.event.EventDispatcher; import com.fr.event.EventDispatcher;
@ -80,6 +79,7 @@ import javax.swing.BorderFactory;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.SwingWorker;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.undo.UndoManager; import javax.swing.undo.UndoManager;
import java.util.ArrayList; import java.util.ArrayList;
@ -340,17 +340,34 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
public void refreshResource(FILE file) { public void refreshResource(FILE file) {
try {
this.template = JTemplateFactory.asIOFile(file, this.suffix());
setTarget(this.template);
// 先移除旧的。 new SwingWorker<Void, Void>() {
removeCenterPane();
// 加入新的 @Override
addCenterPane(); protected Void doInBackground() throws Exception {
} catch (Exception e) { setTargetByFile(file);
FineLoggerFactory.getLogger().error(e.getMessage(), e); return null;
} }
@Override
public void done() {
try {
get();
// 先移除旧的。
removeCenterPane();
// 加入新的
addCenterPane();
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
}
}.execute();
}
private void setTargetByFile(FILE file) {
this.template = JTemplateFactory.asIOFile(file, this.suffix());
setTarget(this.template);
} }
private void addCenterPane() { private void addCenterPane() {

44
designer-base/src/main/java/com/fr/env/PluginErrorRemindDialog.java vendored
Unescape View File

@ -6,7 +6,6 @@ import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.FRFont; import com.fr.general.FRFont;
import com.fr.general.GeneralContext;
import com.fr.general.IOUtils; import com.fr.general.IOUtils;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
@ -14,52 +13,65 @@ import javax.swing.Icon;
import javax.swing.JDialog; import javax.swing.JDialog;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JTextArea; import javax.swing.JTextPane;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.FlowLayout; import java.awt.FlowLayout;
import java.awt.Frame; import java.awt.Frame;
import java.awt.Insets;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.Locale;
/** /**
* 插件启动失败提示窗 * 插件启动失败提示窗
*/ */
public class PluginErrorRemindDialog extends JDialog implements ActionListener { public class PluginErrorRemindDialog extends JDialog implements ActionListener {
public PluginErrorRemindDialog(Frame parent, String areaText) { private static final String SIM_HEI = "SimHei";
public PluginErrorRemindDialog(Frame parent, String text) {
super(parent, true); super(parent, true);
//上面的标签面板 //上面的标签面板
JPanel topPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); JPanel topPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
JPanel imagePanel = new JPanel(); JPanel imagePanel = new JPanel();
Icon icon = IOUtils.readIcon("com/fr/design/images/warnings/warning5.png"); Icon icon = IOUtils.readIcon("com/fr/design/images/warnings/icon_WarningIcon_normal.png");
JLabel imageLabel = new JLabel(); JLabel imageLabel = new JLabel();
imageLabel.setIcon(icon); imageLabel.setIcon(icon);
imagePanel.add(imageLabel); imagePanel.add(imageLabel);
imagePanel.setPreferredSize(new Dimension(130, 100)); imagePanel.setPreferredSize(new Dimension(48, 48));
JPanel verticalPanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true); JPanel verticalPanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
JLabel label = new JLabel(Toolkit.i18nText("Fine-Design_Plugin_Error_Remind_Title")); JLabel label = new JLabel(Toolkit.i18nText("Fine-Design_Plugin_Error_Remind_Title"));
label.setFont(FRFont.getInstance().applySize(18).applyStyle(1)); label.setFont(FRFont.getInstance().applySize(16).applyName(SIM_HEI));
label.setPreferredSize(new Dimension(650, 100)); label.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 20));
verticalPanel.add(label); verticalPanel.add(label);
topPanel.add(imagePanel, BorderLayout.WEST); topPanel.add(imagePanel, BorderLayout.WEST);
topPanel.add(verticalPanel, BorderLayout.CENTER); topPanel.add(verticalPanel, BorderLayout.CENTER);
topPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10)); topPanel.setPreferredSize(new Dimension(600, 73));
topPanel.setBorder(BorderFactory.createEmptyBorder(10, 20, 0, 20));
//中间的文本域面板 //中间的文本域面板
JPanel centerPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); JPanel centerPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
centerPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10)); centerPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
centerPanel.setPreferredSize(new Dimension(480, 320)); centerPanel.setPreferredSize(new Dimension(580, 269));
JTextPane textPane = new JTextPane();
SimpleAttributeSet attributeSet = new SimpleAttributeSet();
StyleConstants.setFontFamily(attributeSet, SIM_HEI);
StyleConstants.setLineSpacing(attributeSet, 0.5f);
textPane.setParagraphAttributes(attributeSet, true);
JTextArea checkArea = new JTextArea(areaText); textPane.setEditable(false);
checkArea.setEnabled(false); textPane.setMargin(new Insets(10, 10, 10, 10));
centerPanel.add(checkArea, BorderLayout.CENTER); textPane.setText(text);
centerPanel.add(textPane, BorderLayout.CENTER);
UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Plugin_Error_Remind_Not_Deal_With")); UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Plugin_Error_Remind_Not_Deal_With"));
UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Plugin_Error_Remind_Deal_With")); UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Plugin_Error_Remind_Deal_With"));
@ -69,7 +81,7 @@ public class PluginErrorRemindDialog extends JDialog implements ActionListener {
// 按钮 // 按钮
JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10)); buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
buttonPanel.add(cancelButton); buttonPanel.add(cancelButton);
buttonPanel.add(okButton); buttonPanel.add(okButton);
@ -80,7 +92,7 @@ public class PluginErrorRemindDialog extends JDialog implements ActionListener {
this.add(topPanel, BorderLayout.NORTH); this.add(topPanel, BorderLayout.NORTH);
this.add(centerPanel, BorderLayout.CENTER); this.add(centerPanel, BorderLayout.CENTER);
this.add(buttonPanel, BorderLayout.SOUTH); this.add(buttonPanel, BorderLayout.SOUTH);
this.setSize(new Dimension(GeneralContext.getLocale().equals(Locale.US) ? 750 : 600, 500)); this.setSize(new Dimension(600, 400));
GUICoreUtils.centerWindow(this); GUICoreUtils.centerWindow(this);
} }

1
designer-base/src/main/resources/com/fr/design/images/gui/color/background_normal.svg
Unescape View File

@ -3,6 +3,5 @@
<title>icon_文本背景色_normal</title> <title>icon_文本背景色_normal</title>
<g id="icon_文本背景色_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="icon_文本背景色_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M9,0 L8.9993,1.656 L11.3546845,4.01296053 C12.496044,4.07957725 16,4.48860182 16,7 C16,10 13,12 13,12 C13,12 13.4489375,10.2042499 12.842809,7.81595247 L7.6363,13.021 L1.9793,7.364 L4.9993,4.344 L5,0 L9,0 Z M7.9993,2.756 L3.3933,7.364 L7.6363,11.606 L12.5054659,6.73651111 C12.4728171,6.64900228 12.4386503,6.56099677 12.4029036,6.47254402 L8.9993,3.07 L9,6 L8,6 L7.9993,2.756 Z M7.9993,1 L5.9993,1 L5.9993,3.344 L7.9993,1.344 L7.9993,1 Z" id="Combined-Shape" fill="#333334"></path> <path d="M9,0 L8.9993,1.656 L11.3546845,4.01296053 C12.496044,4.07957725 16,4.48860182 16,7 C16,10 13,12 13,12 C13,12 13.4489375,10.2042499 12.842809,7.81595247 L7.6363,13.021 L1.9793,7.364 L4.9993,4.344 L5,0 L9,0 Z M7.9993,2.756 L3.3933,7.364 L7.6363,11.606 L12.5054659,6.73651111 C12.4728171,6.64900228 12.4386503,6.56099677 12.4029036,6.47254402 L8.9993,3.07 L9,6 L8,6 L7.9993,2.756 Z M7.9993,1 L5.9993,1 L5.9993,3.344 L7.9993,1.344 L7.9993,1 Z" id="Combined-Shape" fill="#333334"></path>
<rect id="Rectangle" fill="#F87777" x="0" y="12" width="16" height="4"></rect>
</g> </g>
</svg> </svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 938 B

After

Width:  |  Height:  |  Size: 850 B

BIN
designer-base/src/main/resources/com/fr/design/images/warnings/icon_WarningIcon_normal.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
designer-base/src/main/resources/com/fr/design/images/warnings/icon_WarningIcon_normal@2x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

283
designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java
Unescape View File

@ -1,143 +1,140 @@
//package com.fr.design; package com.fr.design;
//
////import com.fr.decision.webservice.v10.plugin.helper.PluginErrorRemindHandler; import com.fr.decision.webservice.v10.plugin.helper.PluginErrorRemindHandler;
//import com.fr.design.env.DesignerWorkspaceInfo; import com.fr.design.env.DesignerWorkspaceInfo;
//import com.fr.design.env.DesignerWorkspaceType; import com.fr.design.env.DesignerWorkspaceType;
//import com.fr.design.env.LocalDesignerWorkspaceInfo; import com.fr.design.env.LocalDesignerWorkspaceInfo;
//import com.fr.design.env.RemoteDesignerWorkspaceInfo; import com.fr.design.env.RemoteDesignerWorkspaceInfo;
//import com.fr.env.CheckServiceDialog; import com.fr.env.CheckServiceDialog;
//import com.fr.env.PluginErrorRemindDialog; import com.fr.env.PluginErrorRemindDialog;
//import com.fr.invoke.Reflect; import com.fr.invoke.Reflect;
//import com.fr.workspace.connect.WorkspaceConnectionInfo; import com.fr.workspace.WorkContext;
//import com.fr.workspace.engine.channel.http.FunctionalHttpRequest; import com.fr.workspace.Workspace;
//import org.easymock.EasyMock; import com.fr.workspace.connect.WorkspaceConnectionInfo;
//import org.junit.Assert; import com.fr.workspace.engine.channel.http.FunctionalHttpRequest;
//import org.junit.Test; import org.easymock.EasyMock;
//import org.junit.runner.RunWith; import org.junit.Assert;
//import org.powermock.api.easymock.PowerMock; import org.junit.Test;
//import org.powermock.core.classloader.annotations.PrepareForTest; import org.junit.runner.RunWith;
//import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.api.easymock.PowerMock;
// import org.powermock.core.classloader.annotations.PrepareForTest;
//import java.awt.Frame; import org.powermock.modules.junit4.PowerMockRunner;
//
///** import java.awt.Frame;
// * @author: Maksim
// * @Date: Created in 2020/3/5 /**
// * @Description: * @author: Maksim
// */ * @Date: Created in 2020/3/5
//@RunWith(PowerMockRunner.class) * @Description:
//@PrepareForTest({FunctionalHttpRequest.class, */
// EnvChangeEntrance.class, @RunWith(PowerMockRunner.class)
// CheckServiceDialog.class, @PrepareForTest({FunctionalHttpRequest.class,
// DesignerEnvManager.class, EnvChangeEntrance.class,
// PluginErrorRemindHandler.class}) CheckServiceDialog.class,
//public class EnvChangeEntranceTest { DesignerEnvManager.class,
// PluginErrorRemindHandler.class,
// @Test WorkContext.class})
// public void showServiceDialog() throws Exception { public class EnvChangeEntranceTest {
// try {
// EnvChangeEntrance entrance = EnvChangeEntrance.getInstance(); @Test
// DesignerWorkspaceInfo selectedEnv = EasyMock.mock(DesignerWorkspaceInfo.class); public void showServiceDialog() throws Exception {
// WorkspaceConnectionInfo connectionInfo = EasyMock.mock(WorkspaceConnectionInfo.class); try {
// EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
// String remoteBranch = "Build#persist-2020.02.15.01.01.12.12"; DesignerWorkspaceInfo selectedEnv = EasyMock.mock(DesignerWorkspaceInfo.class);
// EasyMock.expect(selectedEnv.getConnection()).andReturn(connectionInfo); WorkspaceConnectionInfo connectionInfo = EasyMock.mock(WorkspaceConnectionInfo.class);
// EasyMock.expect(selectedEnv.getType()).andReturn(DesignerWorkspaceType.Remote);
// EasyMock.expect(selectedEnv.getRemindTime()).andReturn(null); String remoteBranch = "Build#persist-2020.02.15.01.01.12.12";
// EasyMock.expect(selectedEnv.getConnection()).andReturn(connectionInfo);
// FunctionalHttpRequest request = EasyMock.mock(FunctionalHttpRequest.class); EasyMock.expect(selectedEnv.getType()).andReturn(DesignerWorkspaceType.Remote);
// EasyMock.expect(request.getServiceList()).andReturn(null); EasyMock.expect(selectedEnv.getRemindTime()).andReturn(null);
//
// PowerMock.expectNew(FunctionalHttpRequest.class, connectionInfo).andReturn(request).anyTimes(); FunctionalHttpRequest request = EasyMock.mock(FunctionalHttpRequest.class);
// EasyMock.expect(request.getServerBranch()).andReturn(remoteBranch); EasyMock.expect(request.getServiceList()).andReturn(null);
//
// CheckServiceDialog dialog = EasyMock.mock(CheckServiceDialog.class); PowerMock.expectNew(FunctionalHttpRequest.class, connectionInfo).andReturn(request).anyTimes();
// PowerMock.expectNew(CheckServiceDialog.class, EasyMock.anyObject(Frame.class), EasyMock.anyString(), EasyMock.anyString(), EasyMock.anyString()).andReturn(dialog); EasyMock.expect(request.getServerBranch()).andReturn(remoteBranch);
//
// EasyMock.replay(request, selectedEnv, connectionInfo); CheckServiceDialog dialog = EasyMock.mock(CheckServiceDialog.class);
// PowerMock.replayAll(); PowerMock.expectNew(CheckServiceDialog.class, EasyMock.anyObject(Frame.class), EasyMock.anyString(), EasyMock.anyString(), EasyMock.anyString()).andReturn(dialog);
//
// entrance.showServiceDialog(selectedEnv); EasyMock.replay(request, selectedEnv, connectionInfo);
// PowerMock.replayAll();
// }catch (Exception e){
// Assert.fail(); entrance.showServiceDialog(selectedEnv);
// }
// } }catch (Exception e){
// Assert.fail();
// @Test }
// public void testUpdateNotRememberPwdEnv() { }
//
// DesignerEnvManager manager = new DesignerEnvManager(); @Test
// public void testUpdateNotRememberPwdEnv() {
// PowerMock.mockStatic(DesignerEnvManager.class);
// EasyMock.expect(DesignerEnvManager.getEnvManager()).andReturn(manager).anyTimes(); DesignerEnvManager manager = new DesignerEnvManager();
//
// PowerMock.replayAll(); PowerMock.mockStatic(DesignerEnvManager.class);
// EasyMock.expect(DesignerEnvManager.getEnvManager()).andReturn(manager).anyTimes();
// EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
// PowerMock.replayAll();
// manager.putEnv("test1", RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", true)));
// manager.putEnv("test2", RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", false))); EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
// manager.putEnv("test3", LocalDesignerWorkspaceInfo.create("name", "path"));
// manager.putEnv("test1", RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", true)));
// Reflect.on(entrance).call("updateNotRememberPwdEnv"); manager.putEnv("test2", RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", false)));
// manager.putEnv("test3", LocalDesignerWorkspaceInfo.create("name", "path"));
// Assert.assertEquals(manager.getWorkspaceInfo("test1").getConnection(), RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", true)).getConnection());
// Assert.assertEquals(manager.getWorkspaceInfo("test2").getConnection(), RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "", "", "", false)).getConnection()); Reflect.on(entrance).call("updateNotRememberPwdEnv");
// Assert.assertEquals(manager.getWorkspaceInfo("test3").getName(), "name");
// Assert.assertEquals(manager.getWorkspaceInfo("test3").getPath(), "path"); Assert.assertEquals(manager.getWorkspaceInfo("test1").getConnection(), RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", true)).getConnection());
// Assert.assertEquals(manager.getWorkspaceInfo("test2").getConnection(), RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "", "", "", false)).getConnection());
// PowerMock.verifyAll(); Assert.assertEquals(manager.getWorkspaceInfo("test3").getName(), "name");
// Assert.assertEquals(manager.getWorkspaceInfo("test3").getPath(), "path");
// }
// PowerMock.verifyAll();
// @Test
// public void testIsNotRememberPwd() { }
// EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
// @Test
// DesignerWorkspaceInfo info1 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", true)); public void testIsNotRememberPwd() {
// DesignerWorkspaceInfo info2 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "111", "", "", false)); EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
// DesignerWorkspaceInfo info3 = LocalDesignerWorkspaceInfo.create("name", "path");
// DesignerWorkspaceInfo info4 = null; DesignerWorkspaceInfo info1 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", true));
// DesignerWorkspaceInfo info2 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "111", "", "", false));
// Assert.assertFalse(Reflect.on(entrance).call("isNotRememberPwd", info1).get()); DesignerWorkspaceInfo info3 = LocalDesignerWorkspaceInfo.create("name", "path");
// Assert.assertTrue(Reflect.on(entrance).call("isNotRememberPwd", info2).get()); DesignerWorkspaceInfo info4 = null;
// Assert.assertFalse(Reflect.on(entrance).call("isNotRememberPwd", info3).get());
// Assert.assertFalse(Reflect.on(entrance).call("isNotRememberPwd", info4).get()); Assert.assertFalse(Reflect.on(entrance).call("isNotRememberPwd", info1).get());
// } Assert.assertTrue(Reflect.on(entrance).call("isNotRememberPwd", info2).get());
// Assert.assertFalse(Reflect.on(entrance).call("isNotRememberPwd", info3).get());
// @Test Assert.assertFalse(Reflect.on(entrance).call("isNotRememberPwd", info4).get());
// public void testPluginErrorRemind() throws Exception { }
//
// try { @Test
// DesignerWorkspaceInfo selectedEnv = EasyMock.mock(DesignerWorkspaceInfo.class); public void testPluginErrorRemind() {
// EasyMock.expect(selectedEnv.getType()).andReturn(DesignerWorkspaceType.Remote).once();
// EasyMock.expect(selectedEnv.getType()).andReturn(DesignerWorkspaceType.Local).times(2); try {
//
// PowerMock.mockStatic(PluginErrorRemindHandler.class); Workspace workspace = EasyMock.mock(Workspace.class);
// EasyMock.expect(PluginErrorRemindHandler.pluginErrorContent()).andReturn("").once(); EasyMock.expect(workspace.isLocal()).andReturn(false).once();
// EasyMock.expect(PluginErrorRemindHandler.pluginErrorContent()).andReturn("111").once(); EasyMock.expect(workspace.isLocal()).andReturn(true).once();
// PowerMock.mockStatic(WorkContext.class);
// PluginErrorRemindDialog dialog = EasyMock.mock(PluginErrorRemindDialog.class); EasyMock.expect(WorkContext.getCurrent()).andReturn(workspace).anyTimes();
// PowerMock.expectNew(PluginErrorRemindDialog.class, EasyMock.anyObject(Frame.class), EasyMock.anyString()).andReturn(dialog).once();
// PowerMock.mockStatic(PluginErrorRemindHandler.class);
// dialog.setVisible(true); EasyMock.expect(PluginErrorRemindHandler.pluginErrorContent()).andReturn("").once();
// EasyMock.expectLastCall();
// EasyMock.replay(workspace);
// EasyMock.replay(selectedEnv, dialog); PowerMock.replayAll();
// PowerMock.replayAll();
// EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
// EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
// entrance.pluginErrorRemind();
// entrance.pluginErrorRemind(selectedEnv); entrance.pluginErrorRemind();
// entrance.pluginErrorRemind(selectedEnv);
// entrance.pluginErrorRemind(selectedEnv); EasyMock.verify(workspace);
// PowerMock.verifyAll();
// } catch (Exception e) {
// EasyMock.verify(selectedEnv, dialog); Assert.fail();
// PowerMock.verifyAll(); }
// } catch (Exception e) { }
// Assert.fail(); }
// }
// }
//}

310
designer-base/src/test/java/com/fr/design/extra/PluginOperateUtilsTest.java
Unescape View File

@ -1,155 +1,155 @@
//package com.fr.design.extra; package com.fr.design.extra;
//
//import com.fr.invoke.Reflect; import com.fr.invoke.Reflect;
//import com.fr.json.JSONObject; import com.fr.json.JSONObject;
//import com.fr.plugin.context.PluginContext; import com.fr.plugin.context.PluginContext;
//import com.fr.plugin.context.PluginMarker; import com.fr.plugin.context.PluginMarker;
//import com.fr.plugin.context.PluginMarkerAdapter; import com.fr.plugin.context.PluginMarkerAdapter;
//import com.fr.plugin.error.PluginErrorCode; import com.fr.plugin.error.PluginErrorCode;
//import com.fr.plugin.manage.PluginManager; import com.fr.plugin.manage.PluginManager;
//import com.fr.plugin.manage.control.PluginTask; import com.fr.plugin.manage.control.PluginTask;
//import com.fr.plugin.manage.control.PluginTaskResult; import com.fr.plugin.manage.control.PluginTaskResult;
//import org.easymock.EasyMock; import org.easymock.EasyMock;
//import org.junit.Assert; import org.junit.Assert;
//import org.junit.Test; import org.junit.Test;
//import org.junit.runner.RunWith; import org.junit.runner.RunWith;
//import org.powermock.api.easymock.PowerMock; import org.powermock.api.easymock.PowerMock;
//import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.core.classloader.annotations.PrepareForTest;
//import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunner;
//
//import java.util.ArrayList; import java.util.ArrayList;
//import java.util.List; import java.util.List;
//
///** /**
// * @author Lucian.Chen * @author Lucian.Chen
// * @version 10.0 * @version 10.0
// * Created by Lucian.Chen on 2020/12/17 * Created by Lucian.Chen on 2020/12/17
// */ */
//@RunWith(PowerMockRunner.class) @RunWith(PowerMockRunner.class)
//@PrepareForTest({PluginManager.class, PluginUtils.class}) @PrepareForTest({PluginManager.class, PluginUtils.class})
//public class PluginOperateUtilsTest { public class PluginOperateUtilsTest {
//
// @Test @Test
// public void testGetSuccessInfo() { public void testGetSuccessInfo() {
// PluginTaskResult pluginTaskResult = EasyMock.mock(PluginTaskResult.class); PluginTaskResult pluginTaskResult = EasyMock.mock(PluginTaskResult.class);
// PluginTaskResult pluginTaskResult1 = EasyMock.mock(PluginTaskResult.class); PluginTaskResult pluginTaskResult1 = EasyMock.mock(PluginTaskResult.class);
// PluginTaskResult pluginTaskResult2 = EasyMock.mock(PluginTaskResult.class); PluginTaskResult pluginTaskResult2 = EasyMock.mock(PluginTaskResult.class);
//
// List<PluginTaskResult> pluginTaskResults1 = new ArrayList<>(); List<PluginTaskResult> pluginTaskResults1 = new ArrayList<>();
// pluginTaskResults1.add(pluginTaskResult1); pluginTaskResults1.add(pluginTaskResult1);
// List<PluginTaskResult> pluginTaskResults2 = new ArrayList<>(); List<PluginTaskResult> pluginTaskResults2 = new ArrayList<>();
// pluginTaskResults2.add(pluginTaskResult1); pluginTaskResults2.add(pluginTaskResult1);
// pluginTaskResults2.add(pluginTaskResult2); pluginTaskResults2.add(pluginTaskResult2);
//
// PluginMarker pluginMarker1 = PluginMarker.create("plugin-1", "1.0"); PluginMarker pluginMarker1 = PluginMarker.create("plugin-1", "1.0");
// PluginMarker pluginMarker2 = PluginMarkerAdapter.create("plugin-2", "2.0", "name-2"); PluginMarker pluginMarker2 = PluginMarkerAdapter.create("plugin-2", "2.0", "name-2");
// PluginTask pluginTask1 = PluginTask.installTask(pluginMarker1); PluginTask pluginTask1 = PluginTask.installTask(pluginMarker1);
// PluginTask pluginTask2 = PluginTask.installTask(pluginMarker2); PluginTask pluginTask2 = PluginTask.installTask(pluginMarker2);
//
// EasyMock.expect(pluginTaskResult.asList()).andReturn(pluginTaskResults1).times(2); EasyMock.expect(pluginTaskResult.asList()).andReturn(pluginTaskResults1).times(2);
// EasyMock.expect(pluginTaskResult.asList()).andReturn(pluginTaskResults2).times(2); EasyMock.expect(pluginTaskResult.asList()).andReturn(pluginTaskResults2).times(2);
// EasyMock.expect(pluginTaskResult1.getCurrentTask()).andReturn(pluginTask1).anyTimes(); EasyMock.expect(pluginTaskResult1.getCurrentTask()).andReturn(pluginTask1).anyTimes();
// EasyMock.expect(pluginTaskResult2.getCurrentTask()).andReturn(pluginTask2).anyTimes(); EasyMock.expect(pluginTaskResult2.getCurrentTask()).andReturn(pluginTask2).anyTimes();
//
// EasyMock.expect(pluginTaskResult1.errorCode()).andReturn(PluginErrorCode.BelowSystem).anyTimes(); EasyMock.expect(pluginTaskResult1.errorCode()).andReturn(PluginErrorCode.BelowSystem).anyTimes();
// EasyMock.expect(pluginTaskResult2.errorCode()).andReturn(PluginErrorCode.BeyondSystem).anyTimes(); EasyMock.expect(pluginTaskResult2.errorCode()).andReturn(PluginErrorCode.BeyondSystem).anyTimes();
//
// PluginContext plugin1 = EasyMock.mock(PluginContext.class); PluginContext plugin1 = EasyMock.mock(PluginContext.class);
// PluginContext plugin2 = EasyMock.mock(PluginContext.class); PluginContext plugin2 = EasyMock.mock(PluginContext.class);
// EasyMock.expect(plugin1.getName()).andReturn("context-1").anyTimes(); EasyMock.expect(plugin1.getName()).andReturn("context-1").anyTimes();
// EasyMock.expect(plugin2.getName()).andReturn("context-2").anyTimes(); EasyMock.expect(plugin2.getName()).andReturn("context-2").anyTimes();
// PowerMock.mockStatic(PluginManager.class); PowerMock.mockStatic(PluginManager.class);
// EasyMock.expect(PluginManager.getContext(pluginMarker1.getPluginID())) EasyMock.expect(PluginManager.getContext(pluginMarker1.getPluginID()))
// .andReturn(plugin1).once().andReturn(null).once().andReturn(plugin1).once().andReturn(null).once(); .andReturn(plugin1).once().andReturn(null).once().andReturn(plugin1).once().andReturn(null).once();
// EasyMock.expect(PluginManager.getContext(pluginMarker2.getPluginID())) EasyMock.expect(PluginManager.getContext(pluginMarker2.getPluginID()))
// .andReturn(plugin2).once().andReturn(null).once(); .andReturn(plugin2).once().andReturn(null).once();
//
// EasyMock.replay(pluginTaskResult, pluginTaskResult1, pluginTaskResult2, plugin1, plugin2); EasyMock.replay(pluginTaskResult, pluginTaskResult1, pluginTaskResult2, plugin1, plugin2);
// PowerMock.replayAll(); PowerMock.replayAll();
//
// // 1个 // 1个
// Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "context-1Fine-Core_Plugin_Error_BelowSystem"); Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "context-1Fine-Core_Plugin_Error_BelowSystem");
// Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "plugin-1Fine-Core_Plugin_Error_BelowSystem"); Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "plugin-1Fine-Core_Plugin_Error_BelowSystem");
//
//
// // 2个 // 2个
// Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "context-1Fine-Core_Plugin_Error_BelowSystem\ncontext-2Fine-Core_Plugin_Error_BeyondSystem"); Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "context-1Fine-Core_Plugin_Error_BelowSystem\ncontext-2Fine-Core_Plugin_Error_BeyondSystem");
// Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "plugin-1Fine-Core_Plugin_Error_BelowSystem\nname-2Fine-Core_Plugin_Error_BeyondSystem"); Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "plugin-1Fine-Core_Plugin_Error_BelowSystem\nname-2Fine-Core_Plugin_Error_BeyondSystem");
//
// EasyMock.verify(pluginTaskResult, pluginTaskResult1, pluginTaskResult2, plugin1, plugin2); EasyMock.verify(pluginTaskResult, pluginTaskResult1, pluginTaskResult2, plugin1, plugin2);
// PowerMock.verifyAll(); PowerMock.verifyAll();
//
// } }
//
//
// @Test @Test
// public void testGetPluginName() { public void testGetPluginName() {
// PluginContext pluginContext = EasyMock.mock(PluginContext.class); PluginContext pluginContext = EasyMock.mock(PluginContext.class);
// EasyMock.expect(pluginContext.getName()).andReturn("pluginContext").once(); EasyMock.expect(pluginContext.getName()).andReturn("pluginContext").once();
//
// PluginMarker pluginMarker1 = PluginMarker.create("id-1", "1"); PluginMarker pluginMarker1 = PluginMarker.create("id-1", "1");
// PluginMarker pluginMarker2 = PluginMarkerAdapter.create("id-2", "2", "name-2"); PluginMarker pluginMarker2 = PluginMarkerAdapter.create("id-2", "2", "name-2");
//
// EasyMock.replay(pluginContext); EasyMock.replay(pluginContext);
//
// Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", null, null).get(), ""); Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", null, null).get(), "");
// Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", pluginContext, pluginMarker1).get(), "pluginContext"); Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", pluginContext, pluginMarker1).get(), "pluginContext");
// Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", null, pluginMarker1).get(), "id-1"); Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", null, pluginMarker1).get(), "id-1");
// Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", null, pluginMarker2).get(), "name-2"); Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", null, pluginMarker2).get(), "name-2");
//
// EasyMock.verify(pluginContext); EasyMock.verify(pluginContext);
// } }
//
// @Test @Test
// public void testUpdateMarker2Online() { public void testUpdateMarker2Online() {
//
// try { try {
// PluginMarker pluginMarker = PluginMarker.create("plugin-1", "1.0"); PluginMarker pluginMarker = PluginMarker.create("plugin-1", "1.0");
// String pluginJson = "{\"id\": plugin-1,\"name\": \"图表(新特性)\",\"version\": \"8.6.16\"}"; String pluginJson = "{\"id\": plugin-1,\"name\": \"图表(新特性)\",\"version\": \"8.6.16\"}";
// JSONObject object = new JSONObject(pluginJson); JSONObject object = new JSONObject(pluginJson);
//
// PowerMock.mockStatic(PluginUtils.class); PowerMock.mockStatic(PluginUtils.class);
// EasyMock.expect(PluginUtils.getLatestPluginInfo("plugin-1")).andReturn(object).once(); EasyMock.expect(PluginUtils.getLatestPluginInfo("plugin-1")).andReturn(object).once();
// EasyMock.expect(PluginUtils.getLatestPluginInfo("plugin-1")).andThrow(new NullPointerException()).once(); EasyMock.expect(PluginUtils.getLatestPluginInfo("plugin-1")).andThrow(new NullPointerException()).once();
//
// PowerMock.replayAll(); PowerMock.replayAll();
//
// PluginMarker marker1 = PluginOperateUtils.updateMarker2Online(pluginMarker); PluginMarker marker1 = PluginOperateUtils.updateMarker2Online(pluginMarker);
// PluginMarker marker2 = PluginOperateUtils.updateMarker2Online(pluginMarker); PluginMarker marker2 = PluginOperateUtils.updateMarker2Online(pluginMarker);
//
// Assert.assertTrue(marker1 instanceof PluginMarkerAdapter); Assert.assertTrue(marker1 instanceof PluginMarkerAdapter);
// Assert.assertEquals(marker1.getPluginID(), "plugin-1"); Assert.assertEquals(marker1.getPluginID(), "plugin-1");
// Assert.assertEquals(marker1.getVersion(), "1.0"); Assert.assertEquals(marker1.getVersion(), "1.0");
// Assert.assertEquals(((PluginMarkerAdapter) marker1).getPluginName(), "图表(新特性)"); Assert.assertEquals(((PluginMarkerAdapter) marker1).getPluginName(), "图表(新特性)");
// Assert.assertEquals(marker2, pluginMarker); Assert.assertEquals(marker2, pluginMarker);
//
// PowerMock.verifyAll(); PowerMock.verifyAll();
// } catch (Exception e) { } catch (Exception e) {
// Assert.fail(); Assert.fail();
// } }
//
// } }
//
//
// @Test @Test
// public void testUpdatePluginOnline() { public void testUpdatePluginOnline() {
// try { try {
// PluginMarker pluginMarker = PluginMarker.create("plugin-1", "1.0"); PluginMarker pluginMarker = PluginMarker.create("plugin-1", "1.0");
// String pluginJson = "{\"id\": plugin-1,\"name\": \"图表(新特性)\",\"version\": \"8.6.16\"}"; String pluginJson = "{\"id\": plugin-1,\"name\": \"图表(新特性)\",\"version\": \"8.6.16\"}";
// JSONObject object = new JSONObject(pluginJson); JSONObject object = new JSONObject(pluginJson);
//
// PowerMock.mockStatic(PluginUtils.class); PowerMock.mockStatic(PluginUtils.class);
// EasyMock.expect(PluginUtils.getLatestPluginInfo("plugin-1")).andReturn(object).once(); EasyMock.expect(PluginUtils.getLatestPluginInfo("plugin-1")).andReturn(object).once();
// EasyMock.expect(PluginUtils.getInstalledPluginMarkerByID("plugin-1")).andReturn(pluginMarker).once(); EasyMock.expect(PluginUtils.getInstalledPluginMarkerByID("plugin-1")).andReturn(pluginMarker).once();
//
// PowerMock.replayAll(); PowerMock.replayAll();
//
// PluginOperateUtils.updatePluginOnline(pluginMarker, null); PluginOperateUtils.updatePluginOnline(pluginMarker, null);
//
// PowerMock.verifyAll(); PowerMock.verifyAll();
// } catch (Exception e) { } catch (Exception e) {
// Assert.fail(); Assert.fail();
// } }
// } }
//
//} }

10
designer-form/src/main/java/com/fr/design/mainframe/JForm.java
Unescape View File

@ -97,6 +97,7 @@ import java.awt.image.BufferedImage;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import javax.swing.tree.TreePath;
public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<Form> { public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<Form> {
private static final String FORM_CARD = "FORM"; private static final String FORM_CARD = "FORM";
@ -623,6 +624,15 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
this.formDesign.getSelectionModel().setSelectedCreators(FormSelectionUtils.rebuildSelection(formDesign.getRootComponent(), this.formDesign.getSelectionModel().setSelectedCreators(FormSelectionUtils.rebuildSelection(formDesign.getRootComponent(),
formDesign.getRootComponent() == selectedBodyLayout() ? u.getSelectWidgets() : new Widget[]{selectedBodyLayout().toData()})); formDesign.getRootComponent() == selectedBodyLayout() ? u.getSelectWidgets() : new Widget[]{selectedBodyLayout().toData()}));
refreshToolArea(); refreshToolArea();
// 停止编辑 恢复浮层展示
TreePath[] treePaths = FormHierarchyTreePane.getInstance(formDesign).getComponentTree().getSelectedTreePath();
if (treePaths != null) {
for (TreePath path : treePaths) {
if (path != null) {
formDesign.stopEditing(path);
}
}
}
} else { } else {
// 只在报表块里撤销是不需要修改外部form对象的, 因为编辑的是当前报表块. // 只在报表块里撤销是不需要修改外部form对象的, 因为编辑的是当前报表块.
// 修改了JForm的Target需要同步修改formDesign的Target. // 修改了JForm的Target需要同步修改formDesign的Target.

14
designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
Unescape View File

@ -14,13 +14,16 @@ import com.fr.design.designer.creator.XWTitleLayout;
import com.fr.design.designer.creator.cardlayout.XWCardTagLayout; import com.fr.design.designer.creator.cardlayout.XWCardTagLayout;
import com.fr.design.dialog.AttrScrollPane; import com.fr.design.dialog.AttrScrollPane;
import com.fr.design.dialog.BasicScrollPane; import com.fr.design.dialog.BasicScrollPane;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.foldablepane.UIExpandablePane;
import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.EastRegionContainerPane;
import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormDesigner;
import com.fr.design.mainframe.JForm;
import com.fr.design.widget.DataModify; import com.fr.design.widget.DataModify;
import com.fr.design.widget.FormWidgetDefinePaneFactoryBase; import com.fr.design.widget.FormWidgetDefinePaneFactoryBase;
import com.fr.design.widget.Operator; import com.fr.design.widget.Operator;
@ -147,6 +150,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
} }
}; };
freshPropertyMode(innerCreator);
if (isExtraWidget) { if (isExtraWidget) {
return; return;
} }
@ -159,6 +163,16 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
} }
private static void freshPropertyMode(XCreator xCreator) {
if (!(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate() instanceof JForm)) {
if (xCreator instanceof XWParameterLayout) {
EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA);
} else {
EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA_WIDGET);
}
}
}
private void initDefinePane() { private void initDefinePane() {
currentEditorDefinePane = null; currentEditorDefinePane = null;
XCreator creator = getXCreatorDedicated(); XCreator creator = getXCreatorDedicated();

16
designer-form/src/main/java/com/fr/design/mainframe/widget/ui/WidgetBasicPropertyPaneFactory.java
Unescape View File

@ -1,10 +1,6 @@
package com.fr.design.mainframe.widget.ui; package com.fr.design.mainframe.widget.ui;
import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XCreator;
import com.fr.design.designer.creator.XWParameterLayout;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.mainframe.EastRegionContainerPane;
import com.fr.design.mainframe.JForm;
/** /**
* Created by kerry on 2017/9/30. * Created by kerry on 2017/9/30.
@ -12,7 +8,6 @@ import com.fr.design.mainframe.JForm;
public class WidgetBasicPropertyPaneFactory { public class WidgetBasicPropertyPaneFactory {
public static FormBasicPropertyPane createBasicPropertyPane(XCreator xCreator) { public static FormBasicPropertyPane createBasicPropertyPane(XCreator xCreator) {
freshPropertyMode(xCreator);
if (xCreator.supportSetVisible() && xCreator.supportSetEnable()) { if (xCreator.supportSetVisible() && xCreator.supportSetEnable()) {
return new FormBasicWidgetPropertyPane(); return new FormBasicWidgetPropertyPane();
} }
@ -23,15 +18,4 @@ public class WidgetBasicPropertyPaneFactory {
} }
} }
private static void freshPropertyMode(XCreator xCreator) {
if (!(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate() instanceof JForm)) {
if (xCreator instanceof XWParameterLayout) {
EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA);
} else {
EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA_WIDGET);
}
}
}
} }

11
designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
Unescape View File

@ -71,7 +71,6 @@ public class DesignerWorkspaceProvider extends Activator {
} catch (Exception e) { } catch (Exception e) {
FineLoggerFactory.getLogger().warn("Check Service Failed"); FineLoggerFactory.getLogger().warn("Check Service Failed");
} }
EnvChangeEntrance.getInstance().pluginErrorRemind(selectEnv);
} }
}); });
} }
@ -88,6 +87,16 @@ public class DesignerWorkspaceProvider extends Activator {
EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner(); EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner();
} }
} }
pluginErrorRemind();
}
private void pluginErrorRemind() {
EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {
@Override
public void on(Event event, Null aNull) {
EnvChangeEntrance.getInstance().pluginErrorRemind();
}
});
} }
@Override @Override

50
designer-realize/src/test/java/com/fr/start/module/DesignerWorkspaceProviderTest.java
Unescape View File

@ -0,0 +1,50 @@
package com.fr.start.module;
import com.fr.design.constants.DesignerLaunchStatus;
import com.fr.event.EventDispatcher;
import com.fr.invoke.Reflect;
import com.fr.workspace.WorkContext;
import com.fr.workspace.Workspace;
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.api.easymock.PowerMock;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
/**
* @author Lucian.Chen
* @version 10.0
* Created by Lucian.Chen on 2021/1/7
*/
@RunWith(PowerMockRunner.class)
@PrepareForTest({WorkContext.class})
public class DesignerWorkspaceProviderTest {
@Test
public void testPluginErrorRemind() {
try {
Workspace workspace = EasyMock.mock(Workspace.class);
EasyMock.expect(workspace.isLocal()).andReturn(false).once();
PowerMock.mockStatic(WorkContext.class);
EasyMock.expect(WorkContext.getCurrent()).andReturn(workspace).anyTimes();
EasyMock.replay(workspace);
PowerMock.replayAll();
DesignerWorkspaceProvider provider = new DesignerWorkspaceProvider();
Reflect.on(provider).call("pluginErrorRemind");
EventDispatcher.fire(DesignerLaunchStatus.STARTUP_COMPLETE);
EasyMock.verify(workspace);
PowerMock.verifyAll();
} catch (Exception e) {
Assert.fail(e.getMessage());
}
}
}
Write Preview
Loading…
Cancel
Save