diff --git a/designer-base/src/main/java/com/fr/common/detect/CommonPortDetector.java b/designer-base/src/main/java/com/fr/common/detect/CommonPortDetector.java
new file mode 100644
index 000000000..310e75dce
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/common/detect/CommonPortDetector.java
@@ -0,0 +1,59 @@
+package com.fr.common.detect;
+
+import com.fr.concurrent.NamedThreadFactory;
+import com.fr.design.DesignerEnvManager;
+import com.fr.log.FineLoggerFactory;
+import com.fr.module.ModuleContext;
+import com.fr.web.WebSocketConfig;
+
+import java.net.Socket;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/3/10
+ */
+public class CommonPortDetector {
+
+ private static final CommonPortDetector INSTANCE = new CommonPortDetector();
+ private ExecutorService service = ModuleContext.getExecutor().newSingleThreadExecutor(new NamedThreadFactory("CommonPortDetector"));
+
+ public static CommonPortDetector getInstance() {
+ return INSTANCE;
+ }
+
+ public void execute() {
+ service.submit(new Runnable() {
+ @Override
+ public void run() {
+ detectTomcatPort();
+ detectWebSocketPort();
+ }
+ });
+ }
+
+ private void detectTomcatPort() {
+ int port = DesignerEnvManager.getEnvManager().getEmbedServerPort();
+ if (checkPort(port)) {
+ FineLoggerFactory.getLogger().error("EmbedTomcat Port: {} is not available, maybe occupied by other programs, please check it!", port);
+ }
+ }
+
+ private void detectWebSocketPort() {
+ Integer[] ports = WebSocketConfig.getInstance().getPort();
+ for (int port : ports) {
+ if (checkPort(port)) {
+ FineLoggerFactory.getLogger().error("WebSocKet Port: {} is not available, maybe occupied by other programs, please check it!", port);
+ }
+ }
+ }
+
+ private boolean checkPort(int port) {
+ try (Socket socket = new Socket("localhost", port)) {
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/common/report/ReportState.java b/designer-base/src/main/java/com/fr/common/report/ReportState.java
new file mode 100644
index 000000000..cc32e439c
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/common/report/ReportState.java
@@ -0,0 +1,21 @@
+package com.fr.common.report;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/3/27
+ */
+public enum ReportState {
+
+ STOP("stop"), ACTIVE("active");
+
+ private String value;
+
+ ReportState(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return this.value;
+ }
+}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
index 6ebd349cb..77c779ce3 100644
--- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
+++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
@@ -8,17 +8,21 @@ import com.fr.base.Utils;
import com.fr.design.actions.help.alphafine.AlphaFineConfigManager;
import com.fr.design.constants.UIConstants;
import com.fr.design.data.DesignTableDataManager;
+import com.fr.design.dialog.ErrorDialog;
import com.fr.design.env.DesignerWorkspaceGenerator;
import com.fr.design.env.DesignerWorkspaceInfo;
import com.fr.design.env.DesignerWorkspaceType;
import com.fr.design.env.LocalDesignerWorkspaceInfo;
import com.fr.design.env.RemoteDesignerWorkspaceInfo;
import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.i18n.Toolkit;
import com.fr.design.locale.impl.ProductImproveMark;
import com.fr.design.mainframe.vcs.VcsConfigManager;
import com.fr.design.update.push.DesignerPushUpdateConfigManager;
import com.fr.design.style.color.ColorSelectConfigManager;
import com.fr.design.utils.DesignUtils;
+import com.fr.design.utils.DesignerPort;
+import com.fr.exit.DesignerExiter;
import com.fr.file.FILEFactory;
import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogFormatter;
@@ -81,6 +85,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
private static final String VERSION_80 = "80";
private static final int CACHINGTEMPLATE_LIMIT = 5;
private static final String WEB_NAME = "webapps";
+ /**
+ * 指定默认工作空间
+ */
+ public static final String DEFAULT_WORKSPACE_PATH = "fr.designer.workspace.default";
private static DesignerEnvManager designerEnvManager; // gui.
private String activationKey = null;
@@ -194,6 +202,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
XMLTools.readFileXML(designerEnvManager, designerEnvManager.getDesignerEnvFile());
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ XmlHandler.Self.handle(e);
}
// james：如果没有env定义，要设置一个默认的
@@ -340,6 +349,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
} catch (IOException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ XmlHandler.Self.handle(e);
} finally {
if (null != fileWriter) {
try {
@@ -554,6 +564,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
private String getDefaultenvPath(String installHome) {
+ String defaultWorkspacePath = System.getProperty(DEFAULT_WORKSPACE_PATH);
+ if (defaultWorkspacePath != null) {
+ return defaultWorkspacePath;
+ }
//这里需要转成反斜杠和生成默认路径一致
return new File(StableUtils.pathJoin(installHome, WEB_NAME, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME)).getPath();
}
@@ -1396,6 +1410,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
/**
* 对国际化进行校验
* 非简繁英日韩的默认环境 设计器全部默认为英文版本
+ *
* @param locale
* @return
*/
@@ -1545,6 +1560,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
readDesignerPushUpdateAttr(reader);
} else if (name.equals(vcsConfigManager.XML_TAG)) {
readVcsAttr(reader);
+ } else if (DesignerPort.XML_TAG.equals(name)) {
+ readDesignerPort(reader);
} else {
readLayout(reader, name);
}
@@ -1736,6 +1753,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
reader.readXMLObject(vcsConfigManager);
}
+ public void readDesignerPort(XMLableReader reader) {
+ reader.readXMLObject(DesignerPort.getInstance());
+ }
+
/**
* Write XML.
* The method will be invoked when save data to XML file.
@@ -1761,6 +1782,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
writeOpenDebug(writer);
writeDesignerPushUpdateAttr(writer);
writeVcsAttr(writer);
+ writeDesignerPort(writer);
writer.end();
}
@@ -2010,6 +2032,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
this.vcsConfigManager.writeXML(writer);
}
+ private void writeDesignerPort(XMLPrintWriter writer) {
+ DesignerPort.getInstance().writeXML(writer);
+ }
+
public VcsConfigManager getVcsConfigManager() {
return vcsConfigManager;
@@ -2018,4 +2044,28 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
public void setVcsConfigManager(VcsConfigManager vcsConfigManager) {
this.vcsConfigManager = vcsConfigManager;
}
+
+ enum XmlHandler {
+ Self;
+ public void handle(Throwable throwable) {
+ ErrorDialog dialog = new ErrorDialog(null,
+ Toolkit.i18nText("Fine-Design_Error_Start_Apology_Message"),
+ Toolkit.i18nText("Fine-Design_Error_Start_Report"),
+ throwable.getMessage()) {
+ @Override
+ protected void okEvent() {
+ dispose();
+ DesignerExiter.getInstance().execute();
+ }
+
+ @Override
+ protected void restartEvent() {
+ dispose();
+ RestartHelper.restart();
+ }
+ };
+ dialog.setVisible(true);
+ DesignerExiter.getInstance().execute();
+ }
+ };
}
diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
index c1c11553f..81e62239b 100644
--- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
+++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
@@ -1,37 +1,62 @@
package com.fr.design;
+import com.fr.common.report.ReportState;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.env.DesignerWorkspaceGenerator;
import com.fr.design.env.DesignerWorkspaceInfo;
import com.fr.design.env.DesignerWorkspaceType;
+import com.fr.design.env.RemoteWorkspace;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.file.TemplateTreePane;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JTemplate;
import com.fr.design.utils.DesignUtils;
+import com.fr.env.CheckServiceDialog;
import com.fr.env.EnvListPane;
+import com.fr.exit.DesignerExiter;
import com.fr.general.GeneralContext;
+import com.fr.general.GeneralUtils;
+import com.fr.invoke.Reflect;
+import com.fr.json.JSONArray;
import com.fr.license.exception.RegistEditionException;
+import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
+import com.fr.process.ProcessEventPipe;
+import com.fr.process.engine.core.CarryMessageEvent;
+import com.fr.process.engine.core.FineProcessContext;
+import com.fr.rpc.Result;
import com.fr.stable.AssistUtils;
import com.fr.stable.EnvChangedListener;
+import com.fr.stable.StringUtils;
import com.fr.start.server.ServerTray;
import com.fr.workspace.WorkContext;
import com.fr.workspace.WorkContextCallback;
import com.fr.workspace.Workspace;
+import com.fr.workspace.base.WorkspaceAPI;
import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import com.fr.workspace.engine.base.FineObjectPool;
import com.fr.workspace.engine.channel.http.FunctionalHttpRequest;
import com.fr.workspace.engine.exception.WorkspaceAuthException;
+import com.fr.workspace.engine.exception.WorkspaceConnectionException;
+import com.fr.workspace.engine.rpc.WorkspaceProxyPool;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
+import java.lang.reflect.Method;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
import static javax.swing.JOptionPane.ERROR_MESSAGE;
import static javax.swing.JOptionPane.QUESTION_MESSAGE;
@@ -83,6 +108,7 @@ public class EnvChangeEntrance {
private boolean switch2Env(final String envName, PopTipStrategy strategy) {
DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
DesignerWorkspaceInfo selectedEnv = envManager.getWorkspaceInfo(envName);
+ WorkspaceConnectionInfo connectionInfo = selectedEnv.getConnection();
try {
Workspace workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
@@ -91,18 +117,13 @@ public class EnvChangeEntrance {
strategy.showTip(new PopTip() {
@Override
public void show() {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
- UIManager.getString("OptionPane.messageDialogTitle"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
}
});
return false;
}
- // 如果版本不一致，且确认 不继续 连接，这里返回 false.
- if (!versionCheckAndConfirm(selectedEnv)) {
- return false;
- }
-
WorkContext.switchTo(workspace, new WorkContextCallback() {
@Override
public void done() {
@@ -115,20 +136,25 @@ public class EnvChangeEntrance {
}
}
});
+ // REPORT-25688如果是war包部署的服务器，给与提示
+ if (WorkContext.getCurrent().isWarDeploy()) {
+ FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Basic_War_Deploy_Tip"),
+ Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.INFORMATION_MESSAGE);
+ }
//REPORT-13810如果只是添加了工作目录,没有切换,这里ToolArea也是要显示新建的工作目录
JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
if (template != null) {
template.refreshToolArea();
}
-
+ showServiceDialog(selectedEnv);
} catch (WorkspaceAuthException | RegistEditionException e) {
// String title = Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed");
// String title = Toolkit.i18nText("Fine-Design_Basic_Lic_Does_Not_Support_Remote");
strategy.showTip(new PopTip() {
@Override
public void show() {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
- UIManager.getString("OptionPane.messageDialogTitle"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
}
});
return false;
@@ -137,8 +163,8 @@ public class EnvChangeEntrance {
strategy.showTip(new PopTip() {
@Override
public void show() {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
- UIManager.getString("OptionPane.messageDialogTitle"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
}
});
@@ -153,6 +179,7 @@ public class EnvChangeEntrance {
}
/**
+ * 这个功能留着，可能会加回来，先做注释处理
* 切换远程环境之前，进行版本检测，当版本不一致的时候，提示。
* 当用户确认选择 ok 时，才继续。
*
@@ -196,6 +223,148 @@ public class EnvChangeEntrance {
return true;
}
+ /**
+ * 对选择的环境做服务检测
+ * @param selectedEnv 选择的工作环境
+ */
+ public void showServiceDialog(DesignerWorkspaceInfo selectedEnv) throws Exception {
+ //是否需要做服务校验
+ if(needCheckBranch(selectedEnv)) {
+ String localBranch;
+ String remoteBranch;
+ WorkspaceConnectionInfo connectionInfo = selectedEnv.getConnection();
+ localBranch = GeneralUtils.readFullBuildNO();
+ try {
+ remoteBranch = new FunctionalHttpRequest(connectionInfo).getServerBranch();
+ } catch (WorkspaceConnectionException e) {
+ remoteBranch = Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Branch_Is_Old") + formatBranch(localBranch);
+ }
+ //通过是否包含#来避免当前版本为非安装版本（主要是内部开发版本）
+ if (localBranch.contains("#") && localBranch.equals(remoteBranch)) {
+ //说明版本一致，仅做日志记录
+ FineLoggerFactory.getLogger().info("Remote Designer version consistency");
+ } else {
+ localBranch = formatBranch(localBranch);
+ remoteBranch = formatBranch(remoteBranch);
+ Set noExistServiceSet = getNoExistServiceSet(connectionInfo);
+ StringBuilder textBuilder = new StringBuilder();
+ for (Class clazz : noExistServiceSet) {
+ WorkspaceAPI workspaceAPI = (WorkspaceAPI) clazz.getAnnotation(WorkspaceAPI.class);
+ if(workspaceAPI == null){
+ FineLoggerFactory.getLogger().info("workspace service {} get annotation failed", clazz);
+ continue;
+ }
+ if(workspaceAPI.ignore()){
+ continue;
+ }
+ String descriptionOfCN = InterProviderFactory.getProvider().getLocText(workspaceAPI.description());
+ textBuilder.append(descriptionOfCN).append("\n");
+ }
+ String areaText = textBuilder.toString();
+ if(StringUtils.isEmpty(areaText)){
+ return;
+ }
+ CheckServiceDialog dialog = new CheckServiceDialog(DesignerContext.getDesignerFrame(), areaText, localBranch, remoteBranch);
+ dialog.setVisible(true);
+ }
+ }
+ }
+
+ /**
+ * 判断是否需要做版本验证，判断依据为
+ * 1、选择的环境为远程环境
+ * 2、一个月内不弹出是否勾选
+ * @param selectedEnv 选择的环境
+ * @return
+ */
+ private boolean needCheckBranch(DesignerWorkspaceInfo selectedEnv){
+ if(selectedEnv.getType() == DesignerWorkspaceType.Remote){
+ try {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ if(StringUtils.isEmpty(selectedEnv.getRemindTime())){
+ return true;
+ }
+ //获取记录的时间
+ Date remindTime = format.parse(selectedEnv.getRemindTime());
+ calendar.setTime(remindTime);
+ //获取一个月后的时间
+ calendar.add(Calendar.MONTH,1);
+ //与当前时间作对比，然后判断是否提示
+ if(new Date().after(calendar.getTime())){
+ return true;
+ }
+ } catch (ParseException e) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 获取不存在的服务列表
+ * @param info 环境连接信息
+ * @return 以Set形式返回不存在的服务
+ */
+ public Set getNoExistServiceSet(WorkspaceConnectionInfo info){
+ Set noExistServiceSet = new HashSet();
+ Set remoteServiceSet = new HashSet();
+ Set localServiceSet = FineObjectPool.getInstance().getServerPool().keySet();
+
+ try {
+ JSONArray serviceArray = new FunctionalHttpRequest(info).getServiceList();
+ for(int i = 0; i < serviceArray.size(); i++){
+ try{
+ Class clazz = Class.forName((String) serviceArray.get(i));
+ remoteServiceSet.add(clazz);
+ } catch (Exception e){
+ continue;
+ }
+ }
+ noExistServiceSet.addAll(localServiceSet);
+ noExistServiceSet.removeAll(remoteServiceSet);
+ return noExistServiceSet;
+ } catch (WorkspaceConnectionException e) {
+ FineLoggerFactory.getLogger().info(e.getMessage());
+ //根据本地的服务列表做逐一检测
+ for(Class clazz : localServiceSet) {
+ Method testMethod = Reflect.on(Method.class).create(clazz, "connectTest", new Class[0], String.class, new Class[0], 1025, 8, null, null, null, null).get();
+ WorkspaceProxyPool proxyPool = (WorkspaceProxyPool) (((RemoteWorkspace) WorkContext.getCurrent()).getClient()).getPool();
+ Result result = proxyPool.testInvoker(testMethod);
+ Exception invokeException = (Exception) result.getException();
+ if(invokeException != null){
+ Exception cause = (Exception) invokeException.getCause();
+ //获取被包装最底层的异常
+ while (cause != null) {
+ invokeException = cause;
+ cause = (Exception) invokeException.getCause();
+ }
+ //该异常表示服务不存在
+ if(invokeException instanceof ClassNotFoundException){
+ noExistServiceSet.add(clazz);
+ }
+ }
+ }
+ return noExistServiceSet;
+ } catch (Exception e){
+ FineLoggerFactory.getLogger().error(e.getMessage(),e);
+ return noExistServiceSet;
+ }
+ }
+
+ /**
+ * 格式化分支版本号
+ * @param branch 初始的分支版本号
+ * @return 格式化后的版本号
+ */
+ private String formatBranch(String branch){
+ if(branch.contains("#")){
+ return branch.substring(branch.lastIndexOf("#") + 1, branch.length() - 13);
+ }
+ return branch;
+ }
+
+
/**
* 编辑items
*
@@ -242,14 +411,18 @@ public class EnvChangeEntrance {
@Override
public void doOk() {
+ ProcessEventPipe pipe = FineProcessContext.getParentPipe();
+ if (FineProcessContext.getParentPipe() != null) {
+ pipe.fire(new CarryMessageEvent(ReportState.ACTIVE.getValue()));
+ }
if (!envListOkAction(envListPane, PopTipStrategy.NOW)) {
- System.exit(0);
+ DesignerExiter.getInstance().execute();
}
}
@Override
public void doCancel() {
- System.exit(0);
+ DesignerExiter.getInstance().execute();
}
});
envListDialog.setVisible(true);
diff --git a/designer-base/src/main/java/com/fr/design/RestartHelper.java b/designer-base/src/main/java/com/fr/design/RestartHelper.java
index cdb4fc532..64fdda7ba 100644
--- a/designer-base/src/main/java/com/fr/design/RestartHelper.java
+++ b/designer-base/src/main/java/com/fr/design/RestartHelper.java
@@ -2,6 +2,7 @@ package com.fr.design;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.os.impl.RestartAction;
+import com.fr.exit.DesignerExiter;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralUtils;
import com.fr.log.FineLoggerFactory;
@@ -152,7 +153,14 @@ public class RestartHelper {
} finally {
WorkContext.getCurrent().close();
frame.dispose();
- System.exit(0);
+ try {
+ // 更新升级过渡用 供当前测试 后面可删除
+ Class.forName("com.fr.exit.DesignerExiter");
+ DesignerExiter.getInstance().execute();
+ } catch (Exception ignore) {
+ } finally {
+ System.exit(0);
+ }
}
}
@@ -194,7 +202,11 @@ public class RestartHelper {
} catch (IOException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
- DesignerContext.getDesignerFrame().exit();
+ if (DesignerContext.getDesignerFrame() != null) {
+ DesignerContext.getDesignerFrame().exit();
+ } else {
+ DesignerExiter.getInstance().execute();
+ }
}
}
}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java b/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java
index 157f775b8..9e550377f 100644
--- a/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java
@@ -2,6 +2,7 @@ package com.fr.design.actions.community;
import com.fr.base.BaseUtils;
import com.fr.design.actions.UpdateAction;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.menu.MenuKeySet;
import com.fr.general.CloudCenter;
import com.fr.log.FineLoggerFactory;
@@ -38,7 +39,7 @@ public class UpAction extends UpdateAction
try {
Desktop.getDesktop().browse(new URI(url));
} catch (IOException exp) {
- JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
+ FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
} catch (URISyntaxException exp) {
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
diff --git a/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java b/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java
index 83aeaefe3..574195470 100644
--- a/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java
+++ b/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java
@@ -260,6 +260,13 @@ public class ActionFactory {
}
}
+ public static void referCellInsertActionClass(Class[] cls) {
+ if (cls != null) {
+ actionClasses.clear();
+ Collections.addAll(actionClasses, cls);
+ }
+ }
+
/**
* 生成单元格插入相关的Action
* 表单中报表块编辑需要屏蔽掉"插入子报表"
@@ -318,6 +325,13 @@ public class ActionFactory {
}
}
+ public static void referFloatInsertActionClass(Class[] cls) {
+ if (cls != null) {
+ floatActionClasses.clear();
+ Collections.addAll(floatActionClasses, cls);
+ }
+ }
+
/**
* 生成悬浮元素插入相关的Action
*
diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
index 55ccfce63..3fc03f438 100644
--- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
@@ -38,6 +38,7 @@ import com.fr.general.log.Log4jConfig;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.Constants;
+import com.fr.stable.os.OperatingSystem;
import com.fr.third.apache.log4j.Level;
import com.fr.transaction.Configurations;
import com.fr.transaction.Worker;
@@ -218,22 +219,23 @@ public class PreferencePane extends BasicPane {
oracleSpace = new UICheckBox(i18nText("Fine-Design_Basic_Show_All_Oracle_Tables"));
oraclePane.add(oracleSpace);
- JPanel upmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Update_Plugin_Manager"));
- useOptimizedUPMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_New_Update_Plugin_Manager"));
- upmSelectorPane.add(useOptimizedUPMCheckbox);
- advancePane.add(upmSelectorPane);
+ if (!OperatingSystem.isLinux()) {
+ JPanel upmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Update_Plugin_Manager"));
+ useOptimizedUPMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_New_Update_Plugin_Manager"));
+ upmSelectorPane.add(useOptimizedUPMCheckbox);
+ advancePane.add(upmSelectorPane);
+ }
- //REPORT-23578 先屏蔽掉
- //JPanel dbmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Database_Manager"));
- //useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager"));
- //dbmSelectorPane.add(useUniverseDBMCheckbox);
- //advancePane.add(dbmSelectorPane);
+ JPanel dbmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Database_Manager"));
+ useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager"));
+ dbmSelectorPane.add(useUniverseDBMCheckbox);
+ advancePane.add(dbmSelectorPane);
JPanel improvePane = FRGUIPaneFactory.createVerticalTitledBorderPane(i18nText("Fine-Design_Basic_Product_Improve"));
joinProductImproveCheckBox = new UICheckBox(i18nText("Fine-Design_Basic_Join_Product_Improve"));
improvePane.add(joinProductImproveCheckBox);
- if(SupportOSImpl.AUTOPUSHUPDATE.support()){
+ if (SupportOSImpl.AUTOPUSHUPDATE.support()) {
autoPushUpdateCheckBox = new UICheckBox(i18nText("Fine-Design_Automatic_Push_Update"));
improvePane.add(autoPushUpdateCheckBox);
}
@@ -511,23 +513,8 @@ public class PreferencePane extends BasicPane {
JPanel logLevelPane = FRGUIPaneFactory.createTitledBorderPane("log" + i18nText("Fine-Design_Basic_Level_Setting"));
logPane.add(logLevelPane);
logLevelComboBox = new UIComboBox(LOG);
+ logLevelComboBox.setEnabled(WorkContext.getCurrent().isLocal());
logLevelPane.add(logLevelComboBox);
- logLevelComboBox.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- Configurations.update(new Worker() {
- @Override
- public void run() {
- Log4jConfig.getInstance().setRootLevel((Level) logLevelComboBox.getSelectedItem());
- }
-
- @Override
- public Class[] targets() {
- return new Class[]{Log4jConfig.class};
- }
- });
- }
- });
}
private void createLanPane(JPanel generalPane) {
@@ -555,8 +542,8 @@ public class PreferencePane extends BasicPane {
});
UILabel noticeLabel = new UILabel(i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));//sail:提示重启后生效
double p = TableLayout.PREFERRED;
- double rowSize[] = {p};
- double columnSize[] = {p, p, p};
+ double[] rowSize = {p};
+ double[] columnSize = {p, p, p};
Component[][] components = {
{languageLabel, languageComboBox, noticeLabel},
};
@@ -596,7 +583,7 @@ public class PreferencePane extends BasicPane {
private void createLengthPane(JPanel advancePane) {
double p = TableLayout.PREFERRED;
- double rowSize[] = {p};
+ double[] rowSize = {p};
// 长度单位选择
JPanel lengthPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Setting_Ruler_Units"));
@@ -618,8 +605,8 @@ public class PreferencePane extends BasicPane {
private void createServerPane(JPanel advancePane) {
double p = TableLayout.PREFERRED;
- double rowSize[] = {p};
- double columnSize[] = {p, p, p};
+ double[] rowSize = {p};
+ double[] columnSize = {p, p, p};
JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Web_Preview_Port_Setting"));
advancePane.add(serverPortPane);
@@ -658,7 +645,7 @@ public class PreferencePane extends BasicPane {
/**
* The method of populate.
*
- * @param designerEnvManager
+ * @param designerEnvManager 设计器环境管理器
*/
public void populate(DesignerEnvManager designerEnvManager) {
if (designerEnvManager == null) {
@@ -687,7 +674,7 @@ public class PreferencePane extends BasicPane {
defaultStringToFormulaBox.setSelected(false);
}
VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager();
- if (WorkContext.getCurrent().isCluster()) {
+ if (WorkContext.getCurrent().isCluster()){
vcsEnableCheckBox.setEnabled(false);
gcEnableCheckBox.setEnabled(false);
}
@@ -727,9 +714,11 @@ public class PreferencePane extends BasicPane {
this.portEditor.setValue(new Integer(designerEnvManager.getEmbedServerPort()));
- useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM());
+ if (useOptimizedUPMCheckbox != null) {
+ useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM());
+ }
- //useUniverseDBMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseUniverseDBM());
+ useUniverseDBMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseUniverseDBM());
this.oracleSpace.setSelected(designerEnvManager.isOracleSystemSpace());
this.cachingTemplateSpinner.setValue(designerEnvManager.getCachingTemplateLimit());
@@ -826,23 +815,32 @@ public class PreferencePane extends BasicPane {
designerEnvManager.setUndoLimit(MAX_UNDO_LIMIT_50);
}
- Configurations.update(new Worker() {
- @Override
- public void run() {
- Log4jConfig.getInstance().setRootLevel(((Level) logLevelComboBox.getSelectedItem()));
- }
+ if (WorkContext.getCurrent().isLocal()) {
+ Configurations.update(new Worker() {
+ @Override
+ public void run() {
+ Level level = (Level) logLevelComboBox.getSelectedItem();
+ if (level != null) {
+ Log4jConfig.getInstance().setRootLevel(level);
+ }
+ }
- @Override
- public Class[] targets() {
- return new Class[]{Log4jConfig.class};
- }
- });
+ @Override
+ public Class[] targets() {
+ @SuppressWarnings("unchecked")
+ Class[] classes = new Class[]{Log4jConfig.class};
+ return classes;
+ }
+ });
+ }
Configurations.update(new Worker() {
@Override
public void run() {
- ServerPreferenceConfig.getInstance().setUseOptimizedUPM(useOptimizedUPMCheckbox.isSelected());
- //ServerPreferenceConfig.getInstance().setUseUniverseDBM(useUniverseDBMCheckbox.isSelected());
+ if (useOptimizedUPMCheckbox != null) {
+ ServerPreferenceConfig.getInstance().setUseOptimizedUPM(useOptimizedUPMCheckbox.isSelected());
+ }
+ ServerPreferenceConfig.getInstance().setUseUniverseDBM(useUniverseDBMCheckbox.isSelected());
}
@Override
diff --git a/designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java b/designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java
index f3bfe5622..f3c5236b5 100644
--- a/designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java
@@ -21,7 +21,7 @@ import java.util.Map;
import static javax.swing.JOptionPane.OK_CANCEL_OPTION;
import static javax.swing.JOptionPane.OK_OPTION;
import static javax.swing.JOptionPane.WARNING_MESSAGE;
-import static javax.swing.JOptionPane.showConfirmDialog;
+import static com.fr.design.dialog.FineJOptionPane.showConfirmDialog;
public final class WebPreviewUtils {
diff --git a/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java b/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java
index 4f8424c41..5277d2ebf 100644
--- a/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java
@@ -2,6 +2,7 @@ package com.fr.design.actions.file.export;
import com.fr.design.actions.JTemplateAction;
import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.iprogressbar.FRProgressBar;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
@@ -132,10 +133,10 @@ public abstract class AbstractExportAction> extends JT
E e = getEditingComponent();
if (!e.isALLSaved() && !DesignModeContext.isVcsMode()) {
e.stopEditing();
- int returnVal = JOptionPane.showConfirmDialog(
+ int returnVal = FineJOptionPane.showConfirmDialog(
DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + e.getEditingFILE() + "\" ?",
- ProductConstants.PRODUCT_NAME,
+ Toolkit.i18nText("Fine-Design_Basic_Confirm"),
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.QUESTION_MESSAGE
);
@@ -171,30 +172,30 @@ public abstract class AbstractExportAction> extends JT
this.setProgress(100);
FineLoggerFactory.getLogger().info("\"" + name + "\"" + Toolkit.i18nText("Fine-Design_Report_Finish_Export") + "!");
- JOptionPane.showMessageDialog(
+ FineJOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Report_Exported_Successfully") + "\n" + name);
} catch (RemoteDesignPermissionDeniedException exp) {
- FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
this.setProgress(100);
target.closeTemplate();
- JOptionPane.showMessageDialog(
+ FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
+ FineJOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Engine_Remote_Design_Permission_Denied"),
- UIManager.getString("OptionPane.messageDialogTitle"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"),
JOptionPane.ERROR_MESSAGE,
UIManager.getIcon("OptionPane.errorIcon")
);
} catch (Exception exp) {
- FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
this.setProgress(100);
target.closeTemplate();
- JOptionPane.showMessageDialog(
+ FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
+ FineJOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Report_Export_Failed") + "\n" + path,
- UIManager.getString("OptionPane.messageDialogTitle"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"),
JOptionPane.ERROR_MESSAGE,
UIManager.getIcon("OptionPane.errorIcon")
);
diff --git a/designer-base/src/main/java/com/fr/design/actions/help/FineUIAction.java b/designer-base/src/main/java/com/fr/design/actions/help/FineUIAction.java
index 4b09de856..0839c1476 100644
--- a/designer-base/src/main/java/com/fr/design/actions/help/FineUIAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/FineUIAction.java
@@ -51,7 +51,7 @@ public class FineUIAction extends UpdateAction {
BasicDialog dialog = pane.showLargeWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
@Override
public void doOk() {
-
+ // Do nothing
}
});
dialog.setVisible(true);
diff --git a/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java b/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java
index 2d4814d2e..0f3c5e9cc 100644
--- a/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java
@@ -6,6 +6,7 @@ package com.fr.design.actions.help;
import com.fr.base.BaseUtils;
import com.fr.design.actions.UpdateAction;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.menu.MenuKeySet;
import com.fr.general.CloudCenter;
import com.fr.log.FineLoggerFactory;
@@ -47,7 +48,7 @@ public class ForumAction extends UpdateAction {
try {
Desktop.getDesktop().browse(new URI(url));
} catch (IOException exp) {
- JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
+ FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
} catch (URISyntaxException exp) {
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
diff --git a/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java b/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java
index a118f9d87..16b8b19eb 100644
--- a/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java
@@ -6,6 +6,7 @@ package com.fr.design.actions.help;
import com.fr.base.BaseUtils;
import com.fr.design.actions.UpdateAction;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.menu.MenuKeySet;
import com.fr.log.FineLoggerFactory;
@@ -37,7 +38,7 @@ public class SupportQQAction extends UpdateAction {
try {
Desktop.getDesktop().browse(new URI(ProductConstants.SUPPORT_QQ));
} catch (IOException exp) {
- JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
+ FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
} catch (URISyntaxException exp) {
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindDialog.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindDialog.java
index fe894437d..e2d7b63c9 100644
--- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindDialog.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindDialog.java
@@ -31,7 +31,7 @@ public class RemindDialog extends UIDialog {
@Override
public void checkValid() throws Exception {
-
+ // Do nothing
}
public RemindPane getRemindPane() {
diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java
index 7591c2af3..1d8d99266 100644
--- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java
@@ -114,6 +114,7 @@ public class RemindPane extends JPanel {
@Override
public void removeLayoutComponent(Component comp) {
+ // Do nothing
}
@Override
@@ -139,6 +140,7 @@ public class RemindPane extends JPanel {
@Override
public void addLayoutComponent(String name, Component comp) {
+ // Do nothing
}
};
}
diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
index 15c6cb705..50ecd0ea6 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
@@ -57,49 +57,6 @@ public class ConnectionListAction extends UpdateAction {
osBasedAction.execute();
}
- /* private void openDesignDatabaseManager() {
- DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
- final ConnectionConfig datasourceManager = ConnectionConfig.getInstance();
- final ConnectionManagerPane databaseManagerPane = new ConnectionManagerPane() {
- public void complete() {
- ConnectionConfig connectionConfig = datasourceManager.mirror();
- populate(connectionConfig);
- }
-
- protected void renameConnection(String oldName, String newName) {
- datasourceManager.renameConnection(oldName, newName);
- }
- };
- final BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null);
- databaseListDialog.addDialogActionListener(new DialogActionAdapter() {
- public void doOk() {
- if (!databaseManagerPane.isNamePermitted()) {
- databaseListDialog.setDoOKSucceed(false);
- return;
- }
- Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
- @Override
- public void run() {
- databaseManagerPane.update(datasourceManager);
- }
- }.addCallBack(new CallBackAdaptor() {
- @Override
- public boolean beforeCommit() {
- //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
- return doWithDatasourceManager(datasourceManager, databaseManagerPane, databaseListDialog);
- }
-
- @Override
- public void afterCommit() {
- DesignerContext.getDesignerBean("databasename").refreshBeanElement();
- }
- }));
- }
- });
- databaseListDialog.setVisible(true);
- }
-*/
-
/**
* 更新datasourceManager
*
diff --git a/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java
index 7b41f6fd8..d000dbbbb 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java
@@ -16,7 +16,6 @@ import java.awt.event.ActionEvent;
* @since 8.0
*/
public class PluginManagerAction extends UpdateAction {
- private static String PLUGIN_MANAGER_ROUTE = "#management/plugin";
public PluginManagerAction() {
this.setMenuKeySet(PLUGIN_MANAGER);
this.setName(getMenuKeySet().getMenuKeySetName());
diff --git a/designer-base/src/main/java/com/fr/design/condition/ContinuousTreeSelectionModel.java b/designer-base/src/main/java/com/fr/design/condition/ContinuousTreeSelectionModel.java
index 69d3a51aa..8e83255cf 100644
--- a/designer-base/src/main/java/com/fr/design/condition/ContinuousTreeSelectionModel.java
+++ b/designer-base/src/main/java/com/fr/design/condition/ContinuousTreeSelectionModel.java
@@ -16,8 +16,6 @@ import com.fr.design.utils.gui.GUICoreUtils;
* 一个层次连续节点.
*/
public class ContinuousTreeSelectionModel extends DefaultTreeSelectionModel {
- public ContinuousTreeSelectionModel() {
- }
public void addSelectionPaths(TreePath[] paths) {
if (paths == null || paths.length == 0) {
diff --git a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
index 193c35775..98f5f3653 100644
--- a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
+++ b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
@@ -10,6 +10,7 @@ import com.fr.data.condition.ListCondition;
import com.fr.data.condition.ObjectCondition;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.formula.FormulaFactory;
import com.fr.design.formula.UIFormula;
import com.fr.design.formula.VariableResolver;
@@ -123,7 +124,7 @@ public abstract class LiteConditionPane extends BasicBeanPa
ExpandMutableTreeNode parentTreeNode = getParentTreeNode();
boolean result = isExistedInParentTreeNode(parentTreeNode, liteCondition, false);
if (result) {
- JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
+ FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BindColumn_This_Condition_Has_Been_Existed"));
return;
}
@@ -222,7 +223,7 @@ public abstract class LiteConditionPane extends BasicBeanPa
return;
}
- int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
+ int returnVal = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"),
JOptionPane.OK_CANCEL_OPTION);
if (returnVal == JOptionPane.OK_OPTION) {
@@ -610,7 +611,7 @@ public abstract class LiteConditionPane extends BasicBeanPa
//修改的时候加入判断条件重复 REPORT-13441
boolean result = isExistedInParentTreeNode(parentTreeNode, liteCondition, true);
if (result) {
- JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
+ FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BindColumn_This_Condition_Has_Been_Existed"));
return;
}
diff --git a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java
index 1e119d27e..15a7c87c0 100644
--- a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java
+++ b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java
@@ -145,7 +145,6 @@ public interface UIConstants {
public static final Color LIST_ITEM_SPLIT_LINE = new Color(0xf0f0f3);
-
public static final BufferedImage DRAG_BAR = IOUtils.readImage("com/fr/design/images/control/bar.png");
public static final BufferedImage DRAG_BAR_LIGHT = IOUtils.readImage("com/fr/design/images/control/bar-light.png");
public static final BufferedImage ARROW_NORTH = IOUtils.readImage("com/fr/design/images/control/up_arrow.png");
@@ -196,6 +195,7 @@ public interface UIConstants {
public static final Icon ANA_SMALL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/anas.png");
public static final Icon REFRESH_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/refresh.png");
public static final Icon FONT_ICON = IOUtils.readIcon("/com/fr/design/images/gui/color/foreground.png");
+ public static final Icon AUTO_FONT_ICON = IOUtils.readIcon("/com/fr/design/images/gui/color/autoForeground.png");
public static final Icon HISTORY_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/history.png");
public static final Icon DELETE_ICON = IOUtils.readIcon("com/fr/design/images/m_file/close.png");
public static final Icon EDIT_ICON = IOUtils.readIcon("com/fr/design/images/m_file/edit.png");
diff --git a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
index 313ca0e2f..45b3ac6a2 100644
--- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
@@ -272,10 +272,12 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
*/
@Override
public void editingCanceled(ChangeEvent e) {
+ // Do nothing
}
@Override
public void editingStopped(ChangeEvent e) {
+ // Do nothing
}
}
diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
index 44ec26127..dc7002fa8 100644
--- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
+++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
@@ -83,6 +83,7 @@ public abstract class DesignTableDataManager {
//用于记录是否要弹出参数框
private static ThreadLocal threadLocal = new ThreadLocal();
+ private static Map> columnCache = new HashMap<>();
/**
* 清除全局 数据集缓存.
@@ -113,11 +114,14 @@ public abstract class DesignTableDataManager {
public static void closeTemplate(JTemplate template) {
if (template != null) {
+ template.whenClose();
+ columnCache.remove(getEditingTableDataSource());
dsListenersMap.remove(template.getPath());
}
}
public static void envChange() {
+ columnCache.clear();
dsListenersMap.clear();
dsNameChangedMap.clear();
clearGlobalDs();
@@ -197,7 +201,60 @@ public abstract class DesignTableDataManager {
java.util.Map resMap = getAllEditingDataSet(source);
java.util.Map dsMap = getAllDataSetIncludingProcedure(resMap);
TableDataWrapper tabledataWrapper = dsMap.get(dsName);
- return tabledataWrapper == null ? new String[0] : tabledataWrapper.calculateColumnNameList().toArray(new String[0]);
+ if (tabledataWrapper == null) {
+ return new String[0];
+ } else {
+ return getSelectedColumnNamesFromCache(source, dsName, tabledataWrapper);
+ }
+ }
+
+ private static String[] getSelectedColumnNamesFromCache(TableDataSource dataSource, String dsName, TableDataWrapper tableDataWrapper) {
+ Map map = columnCache.get(dataSource);
+ if (map == null) {
+ map = new HashMap<>();
+ String[] columnNames = tableDataWrapper.calculateColumnNameList().toArray(new String[0]);
+ map.put(dsName, columnNames);
+ columnCache.put(dataSource, map);
+ return columnNames;
+ } else {
+ String[] columnNames = map.get(dsName);
+ if (columnNames == null) {
+ columnNames = tableDataWrapper.calculateColumnNameList().toArray(new String[0]);
+ map.put(dsName, columnNames);
+ return columnNames;
+ } else {
+ return columnNames;
+ }
+ }
+ }
+
+ public static void removeSelectedColumnNames(String dsName) {
+ Map map = columnCache.get(getEditingTableDataSource());
+ if (map == null) {
+ return;
+ }
+ map.remove(dsName);
+ }
+
+ public static void addDsColumnNames(String dsName, String[] columnNames) {
+ TableDataSource dataSource = getEditingTableDataSource();
+ Map map = columnCache.get(dataSource);
+ if (map == null) {
+ map = new HashMap<>();
+ map.put(dsName, columnNames);
+ columnCache.put(dataSource, map);
+ } else {
+ map.put(dsName, columnNames);
+ }
+ }
+
+ public static String[] getDsColumnNames(String dsName) {
+ TableDataSource dataSource = getEditingTableDataSource();
+ Map map = columnCache.get(dataSource);
+ if (map == null) {
+ return new String[0];
+ }
+ return map.get(dsName);
}
/**
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
index 028f71363..eda641467 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
@@ -17,6 +17,7 @@ import com.fr.design.data.datapane.preview.PreviewLabel;
import com.fr.design.data.datapane.preview.PreviewLabel.Previewable;
import com.fr.design.data.datapane.preview.PreviewTablePane;
import com.fr.design.data.tabledata.Prepare4DataSourceChange;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.icombobox.FRTreeComboBox;
import com.fr.design.gui.icombobox.FilterableComboBoxModel;
import com.fr.design.gui.icombobox.UIComboBox;
@@ -103,10 +104,12 @@ public class ChoosePane extends BasicBeanPane implements Refresha
@Override
public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+ // Do nothing
}
@Override
public void popupMenuCanceled(PopupMenuEvent e) {
+ // Do nothing
}
};
@@ -114,10 +117,12 @@ public class ChoosePane extends BasicBeanPane implements Refresha
private PopupMenuListener listener = new PopupMenuListener() {
@Override
public void popupMenuCanceled(PopupMenuEvent e) {
+ // Do nothing
}
@Override
public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+ // Do nothing
}
@Override
@@ -199,6 +204,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha
}
protected void addFocusListener() {
+ // Do nothing
}
@SuppressWarnings("unchecked")
@@ -332,7 +338,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha
DBUtils.refreshDatabase();
String schema = StringUtils.isEmpty(schemaBox.getSelectedItem()) ? null : schemaBox.getSelectedItem();
DataCoreUtils.refreshTables(getConnection(), TableProcedure.TABLE, schema);
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh_Successfully") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh_Database"),
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh_Successfully") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh_Database"),
JOptionPane.INFORMATION_MESSAGE);
}
@@ -438,7 +444,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha
}
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.ERROR_MESSAGE);
}
}
@@ -462,7 +468,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha
}
if (!connect) {
DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
- JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
+ FineJOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.ERROR_MESSAGE);
failedToFindTable();
return null;
@@ -492,6 +498,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha
}
protected void failedToFindTable() {
+ // Do nothing
}
protected String getTableName() {
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePaneSupportFormula.java b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePaneSupportFormula.java
index 0ca42c0f9..14d0431e2 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePaneSupportFormula.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePaneSupportFormula.java
@@ -75,6 +75,7 @@ public class ChoosePaneSupportFormula extends ChoosePane {
}
protected void addFocusListener() {
+ // Do nothing
}
/**
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
index 59880cc4e..d2fdc3229 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
@@ -5,6 +5,7 @@ import com.fr.data.TableDataSource;
import com.fr.data.api.StoreProcedureAssist;
import com.fr.data.impl.storeproc.StoreProcedure;
import com.fr.design.data.DesignTableDataManager;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.ilist.ListModelElement;
@@ -49,7 +50,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
if (StringUtils.isEmpty(tempName)) {
isNamePermitted = false;
nameableList.stopEditing();
- JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"));
+ FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"));
setIllegalIndex(editingIndex);
return;
}
@@ -58,17 +59,17 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
&& isNameRepeated(new List[]{Arrays.asList(allDSNames), Arrays.asList(allListNames)}, tempName)) {
isNamePermitted = false;
nameableList.stopEditing();
- JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName));
+ FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName));
setIllegalIndex(editingIndex);
} else if (editingType instanceof StoreProcedure && isIncludeUnderline(tempName)) {
isNamePermitted = false;
nameableList.stopEditing();
- JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Stored_Procedure_Name_Tips"));
+ FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Stored_Procedure_Name_Tips"));
setIllegalIndex(editingIndex);
}
if (nameableList.getSelectedValue() instanceof ListModelElement) {
Nameable selected = ((ListModelElement) nameableList.getSelectedValue()).wrapper;
- if (!ComparatorUtils.equals(tempName, selected.getName())) {
+ if (!ComparatorUtils.equals(tempName, selected.getName()) && !isNameRepeated(new List[]{Arrays.asList(allDSNames), Arrays.asList(allListNames)}, tempName)) {
rename(selected.getName(), tempName);
}
@@ -255,6 +256,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
}
protected void checkRepeatedDSName(List exsitTableDataNameList) {
+ // Do nothing
}
/**
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
index 56f81e9a5..531e12848 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
@@ -16,6 +16,9 @@ import com.fr.design.data.tabledata.wrapper.AbstractTableDataWrapper;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.fun.TableDataDefineProvider;
import com.fr.design.fun.TableDataPaneProcessor;
import com.fr.design.gui.ibutton.UIHeadGroup;
import com.fr.design.gui.icontainer.UIScrollPane;
@@ -24,12 +27,12 @@ import com.fr.design.gui.itoolbar.UIToolbar;
import com.fr.design.icon.IconPathConstants;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JTemplate;
import com.fr.design.menu.MenuDef;
import com.fr.design.menu.SeparatorDef;
import com.fr.design.menu.ToolBarDef;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext;
-
import com.fr.general.NameObject;
import com.fr.plugin.context.PluginContext;
import com.fr.plugin.injectable.PluginModule;
@@ -38,8 +41,13 @@ import com.fr.plugin.observer.PluginEvent;
import com.fr.plugin.observer.PluginEventListener;
import com.fr.stable.core.PropertyChangeAdapter;
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.ToolTipManager;
+import java.awt.BorderLayout;
+import java.awt.GridLayout;
import java.awt.dnd.DnDConstants;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
@@ -89,23 +97,9 @@ public class TableDataTreePane extends BasicTableDataTreePane {
createAddMenuDef();
- GeneralContext.listenPluginRunningChanged(new PluginEventListener(PLUGIN_LISTENER_PRIORITY) {
-
- @Override
- public void on(PluginEvent event) {
-
- addMenuDef.clearShortCuts();
- createAddMenuDef();
- }
- }, new PluginFilter() {
-
- @Override
- public boolean accept(PluginContext context) {
+ // 创建插件监听
+ createPluginListener();
- return context.contain(PluginModule.ExtraDesign);
- }
- });
-
editAction = new EditAction();
removeAction = new RemoveAction();
previewTableDataAction = new PreviewTableDataAction(dataTree);
@@ -145,8 +139,57 @@ public class TableDataTreePane extends BasicTableDataTreePane {
new TableDataTreeDragSource(dataTree, DnDConstants.ACTION_COPY);
checkButtonEnabled();
}
+
+ private void createPluginListener() {
+
+ //菜单栏监听
+ GeneralContext.listenPluginRunningChanged(new PluginEventListener(PLUGIN_LISTENER_PRIORITY) {
+
+ @Override
+ public void on(PluginEvent event) {
+
+ addMenuDef.clearShortCuts();
+ createAddMenuDef();
+ }
+ }, new PluginFilter() {
+
+ @Override
+ public boolean accept(PluginContext context) {
+
+ return context.contain(PluginModule.ExtraDesign);
+ }
+ });
+
+ //监听数据集插件
+ GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
+ @Override
+ public void on(PluginEvent event) {
+ //REPORT-25577
+ //如果数据集插件禁用或启用。需要清空当前模板中的缓存
+ reloadCurrTemplate();
+ }
+ private void reloadCurrTemplate() {
+ JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+ if (accept(jt)) {
+ jt.refreshResource();
+ }
+ }
+
+ private boolean accept(JTemplate jt) {
+
+ return jt != null && jt.getEditingFILE() != null && jt.getEditingFILE().exists();
+ }
+ }, new PluginFilter() {
+ @Override
+ public boolean accept(PluginContext pluginContext) {
+ return pluginContext.contain(TableDataDefineProvider.XML_TAG);
+ }
+ });
+ }
+
+
protected void checkButtonEnabled() {
super.checkButtonEnabled(editAction, previewTableDataAction, removeAction, op, dataTree);
}
@@ -243,6 +286,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
if (selectedNO == null) {
return;
}
+ DesignTableDataManager.removeSelectedColumnNames(selectedNO.getName());
dgEdit(((AbstractTableDataWrapper) selectedNO.getObject()).creatTableDataPane(), selectedNO.getName(), false);
}
}
@@ -263,7 +307,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
return;
}
- int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + ":" + selectedNO.getName() + "?",
+ int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + ":" + selectedNO.getName() + "?",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.OK_OPTION) {
// richer:这个地方为什么要在DataSourceTree里面去remove呢？多此一举吧
@@ -274,6 +318,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
dataTree.setSelectionRow(dataTree.getRowCount() - 1);
fireDSChanged();
checkButtonEnabled();
+ DesignTableDataManager.removeSelectedColumnNames(selectedNO.getName());
}
}
}
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
index a14944d5e..1e3f96a98 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
@@ -4,6 +4,7 @@ import com.fr.data.impl.Connection;
import com.fr.data.impl.JDBCDatabaseConnection;
import com.fr.data.impl.JNDIDatabaseConnection;
import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.fun.ConnectionProvider;
import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator;
@@ -43,7 +44,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
String tempName = getEditingName();
if (StringUtils.isEmpty(tempName)) {
nameableList.stopEditing();
- JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name"));
+ FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name"));
setIllegalIndex(editingIndex);
isNamePermitted = false;
return;
@@ -53,7 +54,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
isNamePermitted = false;
nameableList.stopEditing();
String message = Toolkit.i18nText("Fine-Design_Basic_Connection_Duplicate_Name", tempName);
- JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message);
+ FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message);
setIllegalIndex(editingIndex);
}
if (isNamePermitted && !ComparatorUtils.equals(tempName, selectedName)) {
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java
index f6f258285..4b4d66866 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java
@@ -98,7 +98,7 @@ public class ConnectionTableProcedurePane extends BasicPane {
}
protected void addKeyMonitor() {
-
+ //do nothing
}
protected JPanel createCheckBoxgroupPane() {
@@ -137,7 +137,7 @@ public class ConnectionTableProcedurePane extends BasicPane {
/**
* 给 itemComboBox 加上 itemListener
- *
+ *
* @param itemListener
*/
public void addItemListener(ItemListener itemListener) {
@@ -214,7 +214,7 @@ public class ConnectionTableProcedurePane extends BasicPane {
public static interface DoubleClickSelectedNodeOnTreeListener {
/**
* 处理双击事件
- *
+ *
* @param target
*/
public void actionPerformed(TableProcedure target);
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTableModel.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTableModel.java
index 6be5657bb..575ba43f5 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTableModel.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTableModel.java
@@ -140,8 +140,6 @@ public class PreviewTableModel extends AbstractTableModel {
* 就是由于预览的JTable在不停的getRowCount来显示数据.
*/
private static class ErrorResultSet extends AbstractDataModel {
- public ErrorResultSet() {
- }
public int getRowCount() {
return 0;
@@ -160,6 +158,7 @@ public class PreviewTableModel extends AbstractTableModel {
}
public void release() throws Exception {
+ // Do nothing
}
}
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
index 01d7c9a6f..2cd16b494 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
@@ -14,6 +14,7 @@ import com.fr.design.DesignerEnvManager;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.design.gui.ilable.UILabel;
@@ -303,7 +304,7 @@ public class PreviewTablePane extends BasicPane {
return;
}
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), columnErrMessage, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), columnErrMessage, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
}
private void populate(TableData tableData) throws Exception {
@@ -394,8 +395,8 @@ public class PreviewTablePane extends BasicPane {
} catch (Exception e) {
if (!(e instanceof CancellationException)) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(),
- null, 0, UIManager.getIcon("OptionPane.errorIcon"));
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
}
dialog.setVisible(false);
} finally {
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java
index a3248ba1d..333659659 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java
@@ -38,6 +38,7 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
this.setDefaultEditor(ParameterTableModel.ParameterEditor.class, new ParameterTableModel().new ParameterEditor());
this.setDefaultRenderer(StoreProcedureParameterValueEditor.class, new ProcedureParameterValueRenderer());
}
+ @Override
public boolean isCellEditable(int row, int col) {
if (ComparatorUtils.equals(getValueAt(row, col -1), "OUT")) {
return false;
@@ -48,6 +49,7 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
return false;
}
+ @Override
public boolean shouldResponseDoubleClickAction () {
return false;
}
@@ -60,7 +62,7 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
editor = ValueEditorPaneFactory.createStoreProcedValueEditorPane();
editor.getMenu().addPopupMenuListener(new PopupMenuListener() {
public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-
+ // Do nothing
}
public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
@@ -77,15 +79,16 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
}, 100);
}
+ @Override
public void popupMenuCanceled(PopupMenuEvent e) {
-
+ //do nothing
}
});
this.addCellEditorListener(new CellEditorListener() {
@Override
public void editingCanceled(ChangeEvent e) {
-
+ //do nothing
}
@Override
@@ -147,6 +150,7 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
editor = ValueEditorPaneFactory.createStoreProcedValueEditorPane();
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
editor.setCurrentEditor(0);
editor.populate(value);
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
index 7cd8dec3e..b454ddd89 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
@@ -57,8 +57,10 @@ public class ClassTableDataPane extends AbstractTableDataPane {
(Dialog) SwingUtilities.getWindowAncestor(ClassTableDataPane.this),
new DialogActionAdapter() {
public void doOk() {
- classNameTextField.setText(bPane.getClassPath());
- }
+ String classPath = bPane.getClassPath();
+ ClassTableData tableData = new ClassTableData(classPath);
+ populateBean(tableData);
+ }
});
dlg.setVisible(true);
}
@@ -124,6 +126,7 @@ public class ClassTableDataPane extends AbstractTableDataPane {
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
java.util.List oldParas = editorPane.update();
oldParas.add(new Parameter());
@@ -132,6 +135,7 @@ public class ClassTableDataPane extends AbstractTableDataPane {
@Override
public void checkEnabled() {
+ //do nothing
}
}
private class RemoveParaAction extends UITableEditAction {
@@ -149,6 +153,7 @@ public class ClassTableDataPane extends AbstractTableDataPane {
@Override
public void checkEnabled() {
+ //do nothing
}
}
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/CustomDictModel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/CustomDictModel.java
index fdf44df23..3d9fbad2a 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/CustomDictModel.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/CustomDictModel.java
@@ -1,22 +1,21 @@
package com.fr.design.data.tabledata.tabledatapane;
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
+import com.fr.design.gui.itableeditorpane.ActionStyle;
+import com.fr.design.gui.itableeditorpane.UIArrayTableModel;
+import com.fr.design.gui.itableeditorpane.UITableEditAction;
+import com.fr.design.gui.itableeditorpane.UITableModelAdapter;
+import com.fr.design.gui.itextfield.UITextField;
import javax.swing.AbstractCellEditor;
import javax.swing.JTable;
import javax.swing.event.CellEditorListener;
import javax.swing.event.ChangeEvent;
import javax.swing.table.TableCellEditor;
-
-import com.fr.design.gui.itableeditorpane.ActionStyle;
-import com.fr.design.gui.itableeditorpane.UIArrayTableModel;
-import com.fr.design.gui.itableeditorpane.UITableEditAction;
-import com.fr.design.gui.itableeditorpane.UITableModelAdapter;
-import com.fr.design.gui.itextfield.UITextField;
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
public class CustomDictModel extends UITableModelAdapter implements ActionStyle {
/**
@@ -34,11 +33,13 @@ public class CustomDictModel extends UITableModelAdapter implements Ac
this.setDefaultEditor(ParameterEditor.class, new ParameterEditor());
}
+ @Override
public Object getValueAt(int row, int column) {
Object[] os = this.getList().get(row);
return os[column];
}
+ @Override
public void setValueAt(Object value, int row, int column) {
Object[] os = this.getList().get(row);
os[column] = value;
@@ -104,7 +105,7 @@ public class CustomDictModel extends UITableModelAdapter implements Ac
@Override
public void editingCanceled(ChangeEvent e) {
-
+ //do nothing
}
@Override
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
index 44b87cad6..8b5a4e77f 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
@@ -101,10 +101,10 @@ public class DBTableDataPane extends AbstractTableDataPane {
@Override
protected void addKeyMonitor() {
searchField.addKeyListener(new KeyListener() {
-
+
@Override
public void keyTyped(KeyEvent e) {
-
+ //do nothing
}
@Override
@@ -117,7 +117,7 @@ public class DBTableDataPane extends AbstractTableDataPane {
@Override
public void keyReleased(KeyEvent e) {
-
+ //do nothing
}
});
}
@@ -240,7 +240,7 @@ public class DBTableDataPane extends AbstractTableDataPane {
maxPanel.setBorder(null);
JPanel wrapMaxPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
wrapMaxPanel.add(maxPanel);
- wrapMaxPanel.setPreferredSize(new Dimension(250, 20));
+ wrapMaxPanel.setPreferredSize(new Dimension(350, 20));
UIToolbar editToolBar = ToolBarDef.createJToolBar();
toolBarDef.updateToolBar(editToolBar);
editToolBar.add(isShareCheckBox);
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
index f55195d3b..6eb802619 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
@@ -14,6 +14,7 @@ import com.fr.data.impl.XMLTableData;
import com.fr.design.actions.UpdateAction;
import com.fr.design.data.datapane.preview.PreviewTablePane;
import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIRadioButton;
import com.fr.design.gui.icheckbox.UICheckBox;
@@ -222,7 +223,7 @@ public class FileTableDataPane extends AbstractTableDataPane {
public void actionPerformed(ActionEvent arg0) {
String uri = ParameterHelper.analyze4Templatee(urlText.getText(), params);
if (!checkURL(uri)) {
- JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(FileTableDataPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_JS_warning"));
+ FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(FileTableDataPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_JS_warning"));
return;
}
params = getEditorPaneParameter();
@@ -234,10 +235,10 @@ public class FileTableDataPane extends AbstractTableDataPane {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
if (in == null) {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
- null, 0, UIManager.getIcon("OptionPane.errorIcon"));
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
} else {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
try {
in.close();
} catch (IOException e) {
@@ -521,6 +522,7 @@ public class FileTableDataPane extends AbstractTableDataPane {
@Override
public void checkEnabled() {
+ //do nothing
}
}
@@ -832,7 +834,7 @@ public class FileTableDataPane extends AbstractTableDataPane {
}
private class XMLNodeTree extends JTree {
- private DefaultTreeModel treeModel;
+ private DefaultTreeModel xmlTreeModel;
private DefaultTreeModel waitTreeModel = null;
@@ -854,7 +856,7 @@ public class FileTableDataPane extends AbstractTableDataPane {
private MouseListener treeMouseListener = new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
- if (XMLNodeTree.this.getModel() != treeModel) {
+ if (XMLNodeTree.this.getModel() != xmlTreeModel) {
return;
}
int selRow = XMLNodeTree.this.getRowForLocation(e.getX(), e.getY());
@@ -891,7 +893,7 @@ public class FileTableDataPane extends AbstractTableDataPane {
}
public DefaultTreeModel getTreeModel() {
- return treeModel;
+ return xmlTreeModel;
}
//防止界面卡死。
@@ -908,7 +910,7 @@ public class FileTableDataPane extends AbstractTableDataPane {
//wikky:为满足706设计时对不合法的xml文件（有多个根节点）的处理，把拿到的InputStream强制在最外层添加作为唯一根节点而将文件转换为合法的xml。
private void initData() {
params = getEditorPaneParameter(); // 生成tree结构放哪儿呢？放这里感觉不对撒
- treeModel = null;
+ xmlTreeModel = null;
selectedNode = null;
xmlColumnsList.clear();
DataSource dataSource = null;
@@ -949,17 +951,17 @@ public class FileTableDataPane extends AbstractTableDataPane {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
loadedTreeModel();
}
- if (treeModel == null) {
+ if (xmlTreeModel == null) {
FineLoggerFactory.getLogger().info("The file is wrong or bad, can not create the XMLReader.");
return;
}
- if (treeModel.getChildCount(treeModel.getRoot()) == 1) {
- treeModel = new DefaultTreeModel((ExpandMutableTreeNode) treeModel.getChild(treeModel.getRoot(), 0));
+ if (xmlTreeModel.getChildCount(xmlTreeModel.getRoot()) == 1) {
+ xmlTreeModel = new DefaultTreeModel((ExpandMutableTreeNode) xmlTreeModel.getChild(xmlTreeModel.getRoot(), 0));
} else {
- ExpandMutableTreeNode root = (ExpandMutableTreeNode) treeModel.getRoot();
+ ExpandMutableTreeNode root = (ExpandMutableTreeNode) xmlTreeModel.getRoot();
root.setUserObject(StringUtils.EMPTY);
}
- this.setModel(treeModel);
+ this.setModel(xmlTreeModel);
}
private void loadedTreeModel() {
@@ -1011,7 +1013,7 @@ public class FileTableDataPane extends AbstractTableDataPane {
}
currentNode = new ExpandMutableTreeNode(nodeName);
if (layer == 0) {
- treeModel = new DefaultTreeModel(currentNode);
+ xmlTreeModel = new DefaultTreeModel(currentNode);
} else {
boolean conflict = false;
for (int i = 0; i < parentNode.getChildCount(); i++) {
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
index 4a5b33033..2cf170c55 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
@@ -144,12 +144,14 @@ public class MultiTDTableDataPane extends AbstractTableDataPane imp
}
populateWorker = new SwingWorker() {
+ @Override
protected Void doInBackground() throws Exception {
try {
storeProcedureContext.setText(StringUtils.EMPTY);
@@ -204,6 +206,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp
return null;
}
+ @Override
public void done() {
editorPane.populate(storeprocedure.getParameters());
}
@@ -218,6 +221,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp
*
* @param listener 监听器
*/
+ @Override
public void addStoreProcedureWorkerListener(StoreProcedureWorkerListener listener) {
this.storeProcedureWorkerListener = listener;
@@ -227,6 +231,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp
/**
* 去除存储过程监听器
*/
+ @Override
public void removeStoreProcedureWorkerListener() {
this.storeProcedureWorkerListener = null;
@@ -239,7 +244,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp
try {
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
} catch (Exception e) {
- JOptionPane.showMessageDialog(ProcedureDataPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
+ FineJOptionPane.showMessageDialog(ProcedureDataPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
}
}
@@ -264,6 +269,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp
}
updateWorker = new SwingWorker() {
+ @Override
protected Void doInBackground() throws Exception {
DesignTableDataManager.setThreadLocal(DesignTableDataManager.NO_PARAMETER);
sp.setCalculating(true);
@@ -271,6 +277,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp
return null;
}
+ @Override
public void done() {
DesignTableDataManager.setThreadLocal(DesignTableDataManager.NO_PARAMETER);
sp.setCalculating(false);
@@ -328,6 +335,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp
/**
* 响应数据集改变
*/
+ @Override
public void fireDSChanged() {
fireDSChanged(new HashMap());
}
@@ -337,6 +345,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp
*
* @param map 改变的map
*/
+ @Override
public void fireDSChanged(Map map) {
DesignTableDataManager.fireDSChanged(map);
}
@@ -348,6 +357,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
StoreProcedure sp = updateBeanWithOutExecute();
StoreProcedureDataWrapper storeProcedureDataWrappe = new StoreProcedureDataWrapper(sp, StringUtils.EMPTY, queryText.getText());
@@ -361,12 +371,14 @@ public class ProcedureDataPane extends AbstractTableDataPane imp
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
refresh();
}
@Override
public void checkEnabled() {
+ //do nothing
}
}
}
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java
index 7c484c7b2..c55e5871e 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java
@@ -33,9 +33,16 @@ public class TableDataManagerPane extends LoadingBasicPane {
);
}
tableDataPane = pane == null ? new TableDataPaneListPane() {
- public void rename(String oldName, String newName) {
+ @Override
+ public void rename(final String oldName, final String newName) {
super.rename(oldName, newName);
- renameConnection(oldName, newName);
+ new SwingWorker() {
+ @Override
+ protected Void doInBackground() {
+ renameConnection(oldName, newName);
+ return null;
+ }
+ }.execute();
}
} : pane;
container.add(tableDataPane.getPanel(), BorderLayout.CENTER);
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java
index fc94a0618..82022bea6 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java
@@ -50,10 +50,11 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
DesignModelAdapter adapter = DesignModelAdapter.getCurrentModelAdapter();
TableDataSource tds = adapter == null ? null : adapter.getBook();
String[] colNames = tabledata.getColumnNames(tds);
+ String[] colNamesInCache = DesignTableDataManager.getDsColumnNames(name);
if(ArrayUtils.isNotEmpty(colNames)){
- columnNameList = new ArrayList();
- columnNameList.addAll(Arrays.asList(colNames));
- return columnNameList;
+ return toColumnNameList(colNames);
+ } else if (ArrayUtils.isNotEmpty(colNamesInCache)) {
+ return toColumnNameList(colNamesInCache);
}
EmbeddedTableData embeddedTableData = null;
@@ -65,6 +66,13 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
}
}
columnNameList = DesignTableDataManager.getColumnNamesByTableData(embeddedTableData);
+ DesignTableDataManager.addDsColumnNames(name, columnNameList.toArray(new String[0]));
+ return columnNameList;
+ }
+
+ private List toColumnNameList(String[] colNames) {
+ columnNameList = new ArrayList<>();
+ columnNameList.addAll(Arrays.asList(colNames));
return columnNameList;
}
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java
index 49c7dcd11..cefc0e112 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java
@@ -9,6 +9,7 @@ import com.fr.design.data.DesignTableDataManager;
import com.fr.design.data.datapane.preview.PreviewTablePane;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.iprogressbar.AutoProgressBar;
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.mainframe.DesignerContext;
@@ -102,7 +103,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
return columnNameList;
}
if (!createStore(false)) {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_No_TableData"));
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_No_TableData"));
return new ArrayList();
}
columnNameList = Arrays.asList(procedureDataModel.getColumnName());
@@ -219,7 +220,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
} catch (Exception e) {
if (!(e instanceof CancellationException)) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage());
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage());
}
loadingBar.close();
}
diff --git a/designer-base/src/main/java/com/fr/design/dcm/UniversalDatabaseDialog.java b/designer-base/src/main/java/com/fr/design/dcm/UniversalDatabaseDialog.java
index 1a01a8641..f035d7e41 100644
--- a/designer-base/src/main/java/com/fr/design/dcm/UniversalDatabaseDialog.java
+++ b/designer-base/src/main/java/com/fr/design/dcm/UniversalDatabaseDialog.java
@@ -27,6 +27,6 @@ public class UniversalDatabaseDialog extends UIDialog {
@Override
public void checkValid() throws Exception {
-
+ //do nothing
}
}
diff --git a/designer-base/src/main/java/com/fr/design/designer/EditingState.java b/designer-base/src/main/java/com/fr/design/designer/EditingState.java
index 3f4fdf6f0..8bd46d4bd 100644
--- a/designer-base/src/main/java/com/fr/design/designer/EditingState.java
+++ b/designer-base/src/main/java/com/fr/design/designer/EditingState.java
@@ -7,6 +7,7 @@ public interface EditingState {
@Override
public void revert() {
+ //do nothing
}
};
diff --git a/designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java b/designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java
index d67b05d26..025574897 100644
--- a/designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java
@@ -121,12 +121,12 @@ public abstract class BasicScrollPane extends BasicBeanPane{
@Override
public void addLayoutComponent(String name, Component comp) {
-
+ //do nothing
}
@Override
public void removeLayoutComponent(Component comp) {
-
+ //do nothing
}
@Override
diff --git a/designer-base/src/main/java/com/fr/design/dialog/ErrorDialog.java b/designer-base/src/main/java/com/fr/design/dialog/ErrorDialog.java
new file mode 100644
index 000000000..21042a57a
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/dialog/ErrorDialog.java
@@ -0,0 +1,94 @@
+package com.fr.design.dialog;
+
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.FRFont;
+
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/1/8
+ */
+public abstract class ErrorDialog extends JDialog implements ActionListener {
+
+ private UIButton okButton;
+ private UIButton restartButton;
+
+
+ public ErrorDialog(Frame parent, String message, String title, String detail) {
+ super(parent, true);
+ JPanel northPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ JPanel messagePane = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
+ UILabel boldFontLabel = new UILabel(message);
+ UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Send_Report_To_Us"));
+ Font font = FRFont.getInstance("Dialog", Font.BOLD, 20);
+ boldFontLabel.setFont(font);
+ messagePane.add(boldFontLabel);
+ messagePane.add(label);
+ northPane.add(messagePane);
+
+ JTextArea area = new JTextArea(detail);
+ area.setPreferredSize(new Dimension(400, 100));
+ area.setEnabled(true);
+ area.setEditable(false);
+ JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ UILabel detailLabel = new UILabel(Toolkit.i18nText("Fine-Design_Problem_Detail_Message"));
+ centerPane.add(detailLabel, BorderLayout.NORTH);
+ centerPane.add(area, BorderLayout.CENTER);
+
+ JPanel southPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ JPanel buttonPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, 10, 0));
+ okButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Ok"));
+ okButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ okEvent();
+ }
+ });
+ buttonPane.add(okButton);
+ restartButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Restart"));
+ restartButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ restartEvent();
+ }
+ });
+ buttonPane.add(restartButton);
+ controlPane.add(buttonPane, BorderLayout.EAST);
+ southPane.add(controlPane);
+
+ this.setTitle(title);
+ this.setResizable(false);
+ this.add(northPane, BorderLayout.NORTH);
+ this.add(centerPane, BorderLayout.CENTER);
+ this.add(southPane, BorderLayout.SOUTH);
+ this.setSize(new Dimension(600, 500));
+ GUICoreUtils.centerWindow(this);
+
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ dispose();
+ }
+
+ protected abstract void okEvent();
+
+ protected abstract void restartEvent();
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java b/designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java
new file mode 100644
index 000000000..4a4424d9f
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java
@@ -0,0 +1,290 @@
+package com.fr.design.dialog;
+
+import com.fr.invoke.Reflect;
+
+import javax.swing.Icon;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import java.awt.Component;
+import java.awt.HeadlessException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Joe
+ * @version 10.0
+ * Created by Joe on 12/5/2019
+ */
+public class FineJOptionPane extends JOptionPane {
+
+ public final static String[] OPTION_DEFAULT = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_OK") };
+ public final static String[] OPTION_YES_NO = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No") };
+ public final static String[] OPTION_YES_NO_CANCEL = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Cancel") };
+ public final static String[] OPTION_OK_CANCEL = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_OK"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Cancel") };
+
+ //选项类型optionType 和 选项字符串数组 一一对应
+ private final static Map OPTION_MAP = new HashMap<>();
+
+ static {
+ OPTION_MAP.put(DEFAULT_OPTION, OPTION_DEFAULT);
+ OPTION_MAP.put(YES_NO_OPTION, OPTION_YES_NO);
+ OPTION_MAP.put(YES_NO_CANCEL_OPTION, OPTION_YES_NO_CANCEL);
+ OPTION_MAP.put(OK_CANCEL_OPTION, OPTION_OK_CANCEL);
+ }
+
+ private final static String MESSAGE_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message");
+ private final static String CONFIRM_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm");
+ private final static String INPUT_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips");
+
+ /**
+ * 使用默认 标题 和 消息类型 的消息提示弹出框
+ * @param parentComponent 父容器
+ * @param message 具体的提示消息
+ * @throws HeadlessException
+ */
+ public static void showMessageDialog(Component parentComponent, Object message)
+ throws HeadlessException {
+ showMessageDialog(parentComponent, message, MESSAGE_DIALOG_TITLE,
+ INFORMATION_MESSAGE);
+ }
+
+ /**
+ * 使用默认 Icon 的消息提示弹出框
+ * @param parentComponent 父容器
+ * @param message 具体的提示消息
+ * @param title 标题
+ * @param messageType 消息类型
+ * @throws HeadlessException
+ */
+ public static void showMessageDialog(Component parentComponent, Object message,
+ String title, int messageType)
+ throws HeadlessException {
+ showMessageDialog(parentComponent, message, title, messageType, null);
+ }
+
+ /**
+ * 使用默认 选项类型、选项 和 初始选项 的消息提示弹出框
+ * @param parentComponent 父容器
+ * @param message 具体的提示消息
+ * @param title 标题
+ * @param messageType 消息类型
+ * @param icon 图标
+ * @throws HeadlessException
+ */
+ public static void showMessageDialog(Component parentComponent, Object message,
+ String title, int messageType, Icon icon)
+ throws HeadlessException {
+ showMessageDialog(parentComponent, message, title, DEFAULT_OPTION,
+ messageType, icon, OPTION_DEFAULT, null);
+ }
+
+ /**
+ * 自定义的消息提示弹出框
+ * @param parentComponent 父容器
+ * @param message 具体的提示消息
+ * @param title 标题
+ * @param optionType 选项类型
+ * @param messageType 消息类型
+ * @param icon 图标
+ * @param options 选项
+ * @param initialValue 初始选项
+ * @throws HeadlessException
+ */
+ public static void showMessageDialog(Component parentComponent, Object message,
+ String title, int optionType, int messageType,
+ Icon icon, Object[] options, Object initialValue)
+ throws HeadlessException {
+ showOptionDialog(parentComponent, message, title, optionType,
+ messageType, icon, options, initialValue);
+ }
+
+ /**
+ * 使用默认 标题 和 选项类型 的确认弹出框
+ * @param parentComponent 父容器
+ * @param message 具体的提示消息
+ * @throws HeadlessException
+ */
+ public static int showConfirmDialog(Component parentComponent, Object message)
+ throws HeadlessException {
+ return showConfirmDialog(parentComponent, message,
+ CONFIRM_DIALOG_TITLE,
+ YES_NO_CANCEL_OPTION);
+ }
+
+ /**
+ * 使用默认 消息类型 的确认弹出框
+ * @param parentComponent 父容器
+ * @param message 具体的提示消息
+ * @param title 标题
+ * @param optionType 选项类型
+ * @throws HeadlessException
+ */
+ public static int showConfirmDialog(Component parentComponent, Object message,
+ String title, int optionType) throws HeadlessException {
+ return showConfirmDialog(parentComponent, message, title, optionType,
+ QUESTION_MESSAGE);
+ }
+
+ /**
+ * 使用默认 Icon 的确认弹出框
+ * @param parentComponent 父容器
+ * @param message 具体的提示消息
+ * @param title 标题
+ * @param optionType 选项类型
+ * @param messageType 消息类型
+ * @throws HeadlessException
+ */
+ public static int showConfirmDialog(Component parentComponent, Object message,
+ String title, int optionType, int messageType)
+ throws HeadlessException {
+ return showConfirmDialog(parentComponent, message, title, optionType,
+ messageType, null);
+ }
+
+ /**
+ * 根据 选项类型 获取对应 选项 ，且使用默认 初始选项 的确认弹出框
+ * @param parentComponent 父容器
+ * @param message 具体的提示消息
+ * @param title 标题
+ * @param optionType 选项类型
+ * @param messageType 消息类型
+ * @param icon 图标
+ * @throws HeadlessException
+ */
+ public static int showConfirmDialog(Component parentComponent, Object message,
+ String title, int optionType, int messageType, Icon icon)
+ throws HeadlessException {
+ String[] options = OPTION_MAP.get(optionType);
+ return showConfirmDialog(parentComponent, message, title, optionType,
+ messageType, icon, options, options[0]);
+ }
+
+ /**
+ * 自定义的确认弹出框
+ * @param parentComponent 父容器
+ * @param message 具体的提示消息
+ * @param title 标题
+ * @param optionType 选项类型
+ * @param messageType 消息类型
+ * @param icon 图标
+ * @param options 选项
+ * @param initialValue 初始选项
+ * @throws HeadlessException
+ */
+ public static int showConfirmDialog(Component parentComponent, Object message,
+ String title, int optionType, int messageType, Icon icon,
+ Object[] options, Object initialValue)
+ throws HeadlessException {
+ return showOptionDialog(parentComponent, message, title, optionType,
+ messageType, icon, options, initialValue);
+ }
+
+ /**
+ * 指定消息内容的输入弹出框
+ * @param message 消息内容
+ * @return
+ * @throws HeadlessException
+ */
+ public static String showInputDialog(Object message)
+ throws HeadlessException {
+ return showInputDialog(null, message);
+ }
+
+ /**
+ * 使用默认 标题 和 消息类型 的输入弹出框
+ * @param parentComponent 父容器
+ * @param message 消息内容
+ * @return
+ * @throws HeadlessException
+ */
+ public static String showInputDialog(Component parentComponent,
+ Object message) throws HeadlessException {
+ return showInputDialog(parentComponent, message, INPUT_DIALOG_TITLE, QUESTION_MESSAGE);
+ }
+
+ /**
+ * 使用默认 标题、消息类型、Icon 和 选项 的输入弹出框
+ * @param parentComponent 父容器
+ * @param message 消息类型
+ * @param initialSelectionValue 初始选项
+ * @return
+ */
+ public static String showInputDialog(Component parentComponent, Object message,
+ Object initialSelectionValue) {
+ return (String)showInputDialog(parentComponent, message,
+ INPUT_DIALOG_TITLE, QUESTION_MESSAGE, null, null,
+ initialSelectionValue);
+ }
+
+ /**
+ * 使用默认 父容器、消息内容 和 初始选项 的输入弹出框
+ * @param message 消息内容
+ * @param initialSelectionValue 初始选项
+ * @return
+ */
+ public static String showInputDialog(Object message, Object initialSelectionValue) {
+ return showInputDialog(null, message, initialSelectionValue);
+ }
+
+ /**
+ * 使用默认 Icon、选项 和 初始选项 的输入弹出框
+ * @param parentComponent 父容器
+ * @param message 消息内容
+ * @param title 标题
+ * @param messageType 消息类型
+ * @return
+ * @throws HeadlessException
+ */
+ public static String showInputDialog(Component parentComponent,
+ Object message, String title, int messageType)
+ throws HeadlessException {
+ return (String)showInputDialog(parentComponent, message, title,
+ messageType, null, null, null);
+ }
+
+ /**
+ * 自定义的输入弹出框
+ * @param parentComponent 父容器
+ * @param message 消息内容
+ * @param title 标题
+ * @param messageType 消息类型
+ * @param icon 图标
+ * @param selectionValues 选项
+ * @param initialSelectionValue 初始选项
+ * @return
+ * @throws HeadlessException
+ */
+ public static Object showInputDialog(Component parentComponent,
+ Object message, String title, int messageType, Icon icon,
+ Object[] selectionValues, Object initialSelectionValue)
+ throws HeadlessException {
+ JOptionPane pane = new JOptionPane(message, messageType,
+ OK_CANCEL_OPTION, icon,
+ OPTION_OK_CANCEL, null);
+
+ pane.setWantsInput(true);
+ pane.setSelectionValues(selectionValues);
+ pane.setInitialSelectionValue(initialSelectionValue);
+ pane.setComponentOrientation(((parentComponent == null) ?
+ getRootFrame() : parentComponent).getComponentOrientation());
+
+ int style = Reflect.on(JOptionPane.class).call("styleFromMessageType", messageType).get();
+ JDialog dialog = Reflect.on(pane).call("createDialog", parentComponent, title, style).get();
+
+ pane.selectInitialValue();
+ dialog.show();
+ dialog.dispose();
+
+ Object value = pane.getInputValue();
+
+ if (value == UNINITIALIZED_VALUE) {
+ return null;
+ }
+ return value;
+ }
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java b/designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java
index 95894bd01..891e1bf75 100644
--- a/designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java
@@ -363,5 +363,6 @@ public class JWizardDialog extends BasicDialog {
@Override
public void checkValid() throws Exception {
+ //do nothing
}
}
diff --git a/designer-base/src/main/java/com/fr/design/dialog/JWizardPanel.java b/designer-base/src/main/java/com/fr/design/dialog/JWizardPanel.java
index ce3a2f9da..c4762f255 100644
--- a/designer-base/src/main/java/com/fr/design/dialog/JWizardPanel.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/JWizardPanel.java
@@ -168,7 +168,7 @@ public class JWizardPanel extends BasicPane {
public void addNotify() {
if (firstNotify) {
Font font = stepTitleLabel.getFont();
- font = font.deriveFont(Font.BOLD, font.getSize() * 14 / 10.0F);
+ font = font.deriveFont(Font.BOLD, (float) (font.getSize() * 14 / 10.0D));
stepTitleLabel.setFont(font);
firstNotify = false;
}
diff --git a/designer-base/src/main/java/com/fr/design/dialog/TipDialog.java b/designer-base/src/main/java/com/fr/design/dialog/TipDialog.java
new file mode 100644
index 000000000..35f9c3c0f
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/dialog/TipDialog.java
@@ -0,0 +1,98 @@
+package com.fr.design.dialog;
+
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.IOUtils;
+import com.fr.stable.StringUtils;
+
+import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/1/8
+ */
+public abstract class TipDialog extends JDialog implements ActionListener {
+
+ private UIButton endButton;
+ private UIButton cancelButton;
+
+ public TipDialog(Frame parent, String type, String tip, String endText, String cancelText) {
+ super(parent, true);
+ JPanel northPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ JPanel iconPane = new JPanel();
+ UILabel iconLabel = new UILabel();
+ iconLabel.setIcon(IOUtils.readIcon("com/fr/design/images/error/error2.png"));
+ iconPane.add(iconLabel);
+ iconPane.setPreferredSize(new Dimension(50, 50));
+ JPanel tipPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ UILabel tipLabel = new UILabel(tip);
+ tipPane.add(tipLabel);
+ northPane.add(iconPane, BorderLayout.WEST);
+ northPane.add(tipPane, BorderLayout.CENTER);
+
+ JTextPane area = new JTextPane();
+ UILabel typeLabel = new UILabel(type);
+ area.insertComponent(typeLabel);
+ if (StringUtils.isNotEmpty(type)) {
+ UILabel logoIconLabel = new UILabel();
+ logoIconLabel.setIcon(IOUtils.readIcon("com/fr/base/images/oem/logo.png"));
+ area.insertComponent(logoIconLabel);
+ }
+ area.setPreferredSize(new Dimension(400, 100));
+ area.setEnabled(true);
+ area.setEditable(false);
+ JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ centerPane.add(area);
+
+ JPanel southPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ JPanel buttonPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, 10, 0));
+ endButton = new UIButton(endText);
+ endButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ endEvent();
+ }
+ });
+ buttonPane.add(endButton);
+ cancelButton = new UIButton(cancelText);
+ cancelButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ cancelEvent();
+ }
+ });
+ buttonPane.add(cancelButton);
+ controlPane.add(buttonPane, BorderLayout.EAST);
+ southPane.add(controlPane);
+
+ this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Error_Tittle"));
+ this.setResizable(false);
+ this.add(northPane, BorderLayout.NORTH);
+ this.add(centerPane, BorderLayout.CENTER);
+ this.add(southPane, BorderLayout.SOUTH);
+ this.setSize(new Dimension(600, 500));
+ GUICoreUtils.centerWindow(this);
+
+ }
+
+ protected abstract void endEvent();
+
+ protected abstract void cancelEvent();
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ dispose();
+ }
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
index c4e07e967..a885c5188 100644
--- a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
@@ -167,7 +167,7 @@ public abstract class UIDialog extends JDialog {
try {
checkValid();
} catch (Exception exp) {
- JOptionPane.showMessageDialog(this, exp.getMessage());
+ FineJOptionPane.showMessageDialog(this, exp.getMessage());
return;
}
diff --git a/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java
index de8df9a71..6e6c3d8b9 100644
--- a/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java
+++ b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java
@@ -3,6 +3,7 @@ package com.fr.design.editor;
import com.fr.base.BaseFormula;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.editor.editor.ColumnIndexEditor;
import com.fr.design.editor.editor.ColumnNameEditor;
import com.fr.design.editor.editor.Editor;
@@ -302,8 +303,8 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager();
if (designerEnvManager.isSupportStringToFormula()) {
if (!designerEnvManager.isDefaultStringToFormula()) {
- int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
- + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.YES_NO_OPTION);
+ int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
+ + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
if (returnValue == JOptionPane.OK_OPTION) {
setCurrentEditor(j);
diff --git a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
index 588fc1218..503929e22 100644
--- a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
+++ b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
@@ -3,6 +3,7 @@ package com.fr.design.editor;
import com.fr.base.BaseFormula;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.editor.editor.ColumnNameEditor;
import com.fr.design.editor.editor.Editor;
import com.fr.design.editor.editor.FormulaEditor;
@@ -283,8 +284,8 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager();
if (designerEnvManager.isSupportStringToFormula()) {
if (!designerEnvManager.isDefaultStringToFormula()) {
- int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
- + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.YES_NO_OPTION);
+ int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
+ + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
if (returnValue == JOptionPane.OK_OPTION) {
setCurrentEditor(j);
diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/WidgetNameEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/WidgetNameEditor.java
index 9258ce589..80c545e92 100644
--- a/designer-base/src/main/java/com/fr/design/editor/editor/WidgetNameEditor.java
+++ b/designer-base/src/main/java/com/fr/design/editor/editor/WidgetNameEditor.java
@@ -1,18 +1,17 @@
package com.fr.design.editor.editor;
-import java.awt.BorderLayout;
-import java.awt.Component;
-
-import javax.swing.JList;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
-
import com.fr.design.DesignModelAdapter;
-import com.fr.design.gui.icombobox.UIComboBoxRenderer;
import com.fr.design.gui.icombobox.FilterComboBox;
+import com.fr.design.gui.icombobox.UIComboBoxRenderer;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.stable.js.WidgetName;
+import javax.swing.JList;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+
/**
* the editor to edit WidgetName
*
@@ -43,12 +42,12 @@ public class WidgetNameEditor extends Editor {
@Override
public void popupMenuCanceled(PopupMenuEvent e) {
-
+ //do nothing
}
@Override
public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-
+ //do nothing
}
@Override
diff --git a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java
index 1174a8a73..288f6baa3 100644
--- a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java
+++ b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java
@@ -1,15 +1,40 @@
package com.fr.design.env;
+import com.fr.common.report.ReportState;
+import com.fr.concurrent.NamedThreadFactory;
+import com.fr.design.EnvChangeEntrance;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.messagecollect.StartErrorMessageCollector;
+import com.fr.design.mainframe.messagecollect.entity.DesignerErrorMessage;
+import com.fr.general.IOUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.process.ProcessEventPipe;
+import com.fr.process.engine.core.CarryMessageEvent;
+import com.fr.process.engine.core.FineProcessContext;
+import com.fr.stable.StringUtils;
import com.fr.workspace.WorkContext;
import com.fr.workspace.Workspace;
import com.fr.workspace.connect.WorkspaceClient;
+import javax.swing.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
/**
* 根据配置生成运行环境
*/
public class DesignerWorkspaceGenerator {
- public static Workspace generate(DesignerWorkspaceInfo config) throws Exception {
+ private static final int WAIT_FREQ = 60;
+ private static ExecutorService service = Executors.newCachedThreadPool(
+ new NamedThreadFactory("DesignerWorkspaceGenerator"));
+
+ public static Workspace generate(final DesignerWorkspaceInfo config) throws Exception {
if (config == null || config.getType() == null) {
return null;
@@ -22,7 +47,19 @@ public class DesignerWorkspaceGenerator {
break;
}
case Remote: {
- WorkspaceClient client = WorkContext.getConnector().connect(config.getConnection());
+ Future future = service.submit(new Callable() {
+ @Override
+ public WorkspaceClient call() throws Exception {
+ return WorkContext.getConnector().connect(config.getConnection());
+ }
+ });
+ WorkspaceClient client = null;
+ try {
+ client = future.get(WAIT_FREQ, TimeUnit.SECONDS);
+ } catch (TimeoutException e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ RemoteHandler.handle(config);
+ }
if (client != null) {
workspace = new RemoteWorkspace(client, config.getConnection());
}
@@ -31,4 +68,36 @@ public class DesignerWorkspaceGenerator {
}
return workspace;
}
+
+ enum RemoteHandler {
+ SELF;
+ public static void handle(DesignerWorkspaceInfo config) {
+ ProcessEventPipe eventPipe = FineProcessContext.getParentPipe();
+ if (eventPipe != null) {
+ eventPipe.fire(new CarryMessageEvent(ReportState.STOP.getValue()));
+ }
+ StartErrorMessageCollector.getInstance().record(DesignerErrorMessage.REMOTE_DESIGN_NO_RESPONSE.getId(),
+ DesignerErrorMessage.REMOTE_DESIGN_NO_RESPONSE.getMessage(),
+ StringUtils.EMPTY);
+ int result = FineJOptionPane.showOptionDialog(null,
+ Toolkit.i18nText("Fine-Design_Error_Remote_No_Response_Tip"),
+ Toolkit.i18nText("Fine-Design_Basic_Error_Tittle"),
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.ERROR_MESSAGE,
+ IOUtils.readIcon("com/fr/design/images/error/error2.png"),
+ new Object[] {Toolkit.i18nText("Fine-Design_Error_Remote_No_Response_Wait"), Toolkit.i18nText("Fine-Design_Error_Remote_No_Response_Switch")},
+ null);
+ if (result == JOptionPane.YES_OPTION) {
+ try {
+ generate(config);
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ }
+ }
+ }
+
+ public static void stop() {
+ service.shutdown();
+ }
}
diff --git a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceInfo.java b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceInfo.java
index 2e5cc9f8c..ccc98bfe3 100644
--- a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceInfo.java
+++ b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceInfo.java
@@ -10,6 +10,9 @@ public interface DesignerWorkspaceInfo extends XMLable {
String getPath();
+ //获取提醒时间，用于判断是否做服务检测
+ String getRemindTime();
+
WorkspaceConnectionInfo getConnection();
boolean checkValid();
diff --git a/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java b/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java
index efba8a2df..ef1f420d6 100644
--- a/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java
+++ b/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java
@@ -43,6 +43,11 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
return path;
}
+ @Override
+ public String getRemindTime() {
+ return null;
+ }
+
@Override
public WorkspaceConnectionInfo getConnection() {
return null;
@@ -64,7 +69,9 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
writer.attr("path", path);
}
+
@Override
+ @SuppressWarnings("squid:S2975")
public Object clone() throws CloneNotSupportedException {
LocalDesignerWorkspaceInfo object = (LocalDesignerWorkspaceInfo)super.clone();
diff --git a/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java b/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java
index ffc80cb08..af0b8a01c 100644
--- a/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java
+++ b/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java
@@ -1,16 +1,20 @@
package com.fr.design.env;
+import com.fr.log.FineLoggerFactory;
import com.fr.security.SecurityToolbox;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLableReader;
+import com.fr.workspace.WorkContext;
import com.fr.workspace.connect.WorkspaceConnectionInfo;
public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
private String name;
+ private String remindTime;
+
private WorkspaceConnectionInfo connection;
public static RemoteDesignerWorkspaceInfo create(WorkspaceConnectionInfo connection) {
@@ -43,11 +47,21 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
return connection;
}
+ public void setRemindTime(String remindTime){
+ this.remindTime = remindTime;
+ }
+
+ @Override
+ public String getRemindTime(){
+ return remindTime;
+ }
+
@Override
public void readXML(XMLableReader reader) {
if (reader.isAttr()) {
this.name = reader.getAttrAsString("name", StringUtils.EMPTY);
+ this.remindTime = reader.getAttrAsString("remindTime", StringUtils.EMPTY);
}
if (reader.isChildNode()) {
String tagName = reader.getTagName();
@@ -67,6 +81,7 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
public void writeXML(XMLPrintWriter writer) {
writer.attr("name", name);
+ writer.attr("remindTime", remindTime);
if (this.connection != null) {
writer.startTAG("Connection");
writer.attr("url", connection.getUrl());
@@ -79,6 +94,7 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
}
@Override
+ @SuppressWarnings("squid:S2975")
public Object clone() throws CloneNotSupportedException {
RemoteDesignerWorkspaceInfo object = (RemoteDesignerWorkspaceInfo) super.clone();
@@ -89,8 +105,14 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
@Override
- public boolean checkValid(){
-
- return true;
+ public boolean checkValid() {
+ boolean result = false;
+ try {
+ result = WorkContext.getConnector().testConnection(connection);
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ return result;
+ }
+ return result;
}
}
diff --git a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java
index c0319f935..3d96ea1ef 100644
--- a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java
+++ b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java
@@ -1,7 +1,10 @@
package com.fr.design.env;
-import com.fr.cluster.engine.base.FineClusterConfig;
+import com.fr.cluster.engine.remote.ClusterOperator;
import com.fr.design.i18n.Toolkit;
+import com.fr.base.operator.common.CommonOperator;
+import com.fr.rpc.ExceptionHandler;
+import com.fr.rpc.RPCInvokerExceptionInfo;
import com.fr.stable.AssistUtils;
import com.fr.workspace.WorkContext;
import com.fr.workspace.Workspace;
@@ -9,6 +12,8 @@ import com.fr.workspace.connect.WorkspaceClient;
import com.fr.workspace.connect.WorkspaceConnection;
import com.fr.workspace.connect.WorkspaceConnectionInfo;
import com.fr.workspace.server.authority.decision.DecisionOperator;
+import com.fr.workspace.engine.rpc.WorkspaceProxyPool;
+import com.fr.workspace.pool.WorkObjectPool;
/**
* Created by juhaoyu on 2018/6/14.
@@ -45,8 +50,12 @@ public class RemoteWorkspace implements Workspace {
@Override
public boolean isWarDeploy() {
-
- return false;
+ return WorkContext.getCurrent().get(CommonOperator.class, new ExceptionHandler() {
+ @Override
+ public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) {
+ return false;
+ }
+ }).isWarDeploy();
}
@Override
@@ -70,7 +79,12 @@ public class RemoteWorkspace implements Workspace {
@Override
public boolean isCluster() {
- return FineClusterConfig.getInstance().isCluster();
+ return WorkContext.getCurrent().get(ClusterOperator.class, new ExceptionHandler() {
+ @Override
+ public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) {
+ return false;
+ }
+ }).isCluster();
}
@Override
@@ -84,6 +98,19 @@ public class RemoteWorkspace implements Workspace {
return client.getPool().get(type);
}
+
+ @Override
+ public T get(Class type, ExceptionHandler exceptionHandler){
+ if(exceptionHandler != null) {
+ WorkObjectPool objectPool = client.getPool();
+ if (objectPool instanceof WorkspaceProxyPool) {
+ return ((WorkspaceProxyPool) objectPool).get(type, exceptionHandler);
+ }else {
+ return client.getPool().get(type);
+ }
+ }
+ return client.getPool().get(type);
+ }
@Override
public void close() {
@@ -102,4 +129,8 @@ public class RemoteWorkspace implements Workspace {
return obj instanceof RemoteWorkspace && AssistUtils.equals(((RemoteWorkspace) obj).connection, this.connection);
}
+
+ public WorkspaceClient getClient(){
+ return client;
+ }
}
diff --git a/designer-base/src/main/java/com/fr/design/event/RemoveListener.java b/designer-base/src/main/java/com/fr/design/event/RemoveListener.java
new file mode 100644
index 000000000..ff3eae305
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/event/RemoveListener.java
@@ -0,0 +1,11 @@
+package com.fr.design.event;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/3/19
+ */
+public interface RemoveListener {
+
+ void doRemoveAction();
+}
diff --git a/designer-base/src/main/java/com/fr/design/extra/AppStoreBuilder.java b/designer-base/src/main/java/com/fr/design/extra/AppStoreBuilder.java
index ba8950ec2..5599c7553 100644
--- a/designer-base/src/main/java/com/fr/design/extra/AppStoreBuilder.java
+++ b/designer-base/src/main/java/com/fr/design/extra/AppStoreBuilder.java
@@ -10,10 +10,10 @@ package com.fr.design.extra;
public class AppStoreBuilder {
public void checkStoreJavaSciptVersion() {
-
+ //do nothing
}
public void updateStoreJavaScript() {
-
+ //do nothing
}
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/LoginDialog.java b/designer-base/src/main/java/com/fr/design/extra/LoginDialog.java
index 33983baf2..42791ad52 100644
--- a/designer-base/src/main/java/com/fr/design/extra/LoginDialog.java
+++ b/designer-base/src/main/java/com/fr/design/extra/LoginDialog.java
@@ -4,12 +4,8 @@ import com.fr.design.dialog.UIDialog;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.stable.StableUtils;
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.Frame;
+import javax.swing.*;
+import java.awt.*;
/**
* Created by vito on 2017/5/5.
@@ -41,5 +37,6 @@ public class LoginDialog extends UIDialog {
@Override
public void checkValid() throws Exception {
+ // do nothing
}
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/LoginWebBridge.java b/designer-base/src/main/java/com/fr/design/extra/LoginWebBridge.java
index 50add423f..471e25109 100644
--- a/designer-base/src/main/java/com/fr/design/extra/LoginWebBridge.java
+++ b/designer-base/src/main/java/com/fr/design/extra/LoginWebBridge.java
@@ -14,10 +14,8 @@ import javafx.concurrent.Task;
import javafx.scene.web.WebEngine;
import netscape.javascript.JSObject;
-import javax.swing.JDialog;
-import javax.swing.SwingUtilities;
-import java.awt.Color;
-import java.awt.Desktop;
+import javax.swing.*;
+import java.awt.*;
import java.net.URI;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -221,5 +219,6 @@ public class LoginWebBridge {
}
public void openUrlAtLocalWebBrowser(WebEngine eng, String url) {
+ // do nothing
}
}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/extra/LoginWebPane.java b/designer-base/src/main/java/com/fr/design/extra/LoginWebPane.java
index a6b60b605..d0a155a58 100644
--- a/designer-base/src/main/java/com/fr/design/extra/LoginWebPane.java
+++ b/designer-base/src/main/java/com/fr/design/extra/LoginWebPane.java
@@ -1,5 +1,6 @@
package com.fr.design.extra;
+import com.fr.design.dialog.FineJOptionPane;
import javafx.application.Platform;
import javafx.embed.swing.JFXPanel;
import javafx.event.EventHandler;
@@ -46,7 +47,7 @@ public class LoginWebPane extends JFXPanel {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
- JOptionPane.showMessageDialog(LoginWebPane.this, message);
+ FineJOptionPane.showMessageDialog(LoginWebPane.this, message);
}
});
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginAbstractLoadingViewPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginAbstractLoadingViewPane.java
index 0eb114466..3f06ffb9c 100644
--- a/designer-base/src/main/java/com/fr/design/extra/PluginAbstractLoadingViewPane.java
+++ b/designer-base/src/main/java/com/fr/design/extra/PluginAbstractLoadingViewPane.java
@@ -4,7 +4,6 @@ import com.fr.base.BaseUtils;
import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.design.gui.ilable.UILabel;
-
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
@@ -88,7 +87,7 @@ public abstract class PluginAbstractLoadingViewPane extends PluginAbstract
@Override
public void pressInstallButton() {
-
+ // do nothing
}
@Override
diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginControlPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginControlPane.java
index e5b4feba2..312d83347 100644
--- a/designer-base/src/main/java/com/fr/design/extra/PluginControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/extra/PluginControlPane.java
@@ -7,7 +7,6 @@ import com.fr.design.gui.ilist.UIList;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.IOUtils;
-
import com.fr.plugin.context.PluginMarker;
import com.fr.plugin.license.Licensed;
import com.fr.plugin.manage.PluginManager;
@@ -23,7 +22,7 @@ import javax.swing.event.DocumentListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import java.awt.*;
-import java.util.*;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -155,7 +154,7 @@ public class PluginControlPane extends BasicPane {
PluginManager.getController().uninstall(PluginMarker.create(id, version), true, new PluginTaskCallback() {
@Override
public void done(PluginTaskResult result) {
-
+ // do nothing
}
});
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java b/designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java
index 115cc87dc..5f76dbafc 100644
--- a/designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java
+++ b/designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java
@@ -1,6 +1,7 @@
package com.fr.design.extra;
import com.fr.config.MarketConfig;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.extra.tradition.callback.UpdateOnlineCallback;
import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.design.gui.ilable.UILabel;
@@ -13,11 +14,7 @@ import com.fr.plugin.manage.control.ProgressCallback;
import com.fr.plugin.view.PluginView;
import com.fr.stable.StringUtils;
-import javax.swing.JComponent;
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
+import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.io.File;
import java.util.List;
@@ -98,7 +95,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane config;
private WebEngine webEngine;
@@ -94,10 +94,10 @@ public class PluginWebBridge {
* @return 配置信息
*/
public String getRunConfig() {
- if (action != null) {
+ if (actions != null) {
JSONObject jsonObject = new JSONObject();
try {
- jsonObject.put(ACTION, action.getContext());
+ jsonObject.put(ACTION, actions.getContext());
Set keySet = config.keySet();
for (String key : keySet) {
jsonObject.put(key, config.get(key).toString());
@@ -117,7 +117,7 @@ public class PluginWebBridge {
* @param config 参数
*/
public void setRunConfig(ACTIONS action, Map config) {
- this.action = action;
+ this.actions = action;
this.config = config;
}
@@ -125,7 +125,7 @@ public class PluginWebBridge {
* 清楚打开动作
*/
public void clearRunConfig() {
- this.action = null;
+ this.actions = null;
this.config = null;
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java
index 627d16855..002ac88bf 100644
--- a/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java
+++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java
@@ -1,6 +1,7 @@
package com.fr.design.extra;
import com.fr.base.TemplateUtils;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.general.GeneralContext;
import com.fr.general.IOUtils;
import com.fr.log.FineLoggerFactory;
@@ -104,7 +105,7 @@ public class PluginWebPane extends JFXPanel {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
- JOptionPane.showMessageDialog(PluginWebPane.this, message);
+ FineJOptionPane.showMessageDialog(PluginWebPane.this, message);
}
});
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/QQLoginDialog.java b/designer-base/src/main/java/com/fr/design/extra/QQLoginDialog.java
index 4773aff68..3ba60054f 100644
--- a/designer-base/src/main/java/com/fr/design/extra/QQLoginDialog.java
+++ b/designer-base/src/main/java/com/fr/design/extra/QQLoginDialog.java
@@ -3,7 +3,6 @@ package com.fr.design.extra;
import com.fr.design.dialog.UIDialog;
import com.fr.design.utils.gui.GUICoreUtils;
-
import javax.swing.*;
import java.awt.*;
@@ -27,6 +26,7 @@ public class QQLoginDialog extends UIDialog {
@Override
public void checkValid() throws Exception {
+ // do nothing
}
}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java b/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java
index 9928d9ae0..9c56738b4 100644
--- a/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java
+++ b/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java
@@ -1,5 +1,6 @@
package com.fr.design.extra;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.general.CloudCenter;
import com.fr.general.ComparatorUtils;
import com.fr.general.IOUtils;
@@ -138,7 +139,7 @@ public class QQLoginWebPane extends JFXPanel {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
- JOptionPane.showMessageDialog(QQLoginWebPane.this, message);
+ FineJOptionPane.showMessageDialog(QQLoginWebPane.this, message);
}
});
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/ShopDialog.java b/designer-base/src/main/java/com/fr/design/extra/ShopDialog.java
index e2fb97b62..72fa6149b 100644
--- a/designer-base/src/main/java/com/fr/design/extra/ShopDialog.java
+++ b/designer-base/src/main/java/com/fr/design/extra/ShopDialog.java
@@ -29,5 +29,6 @@ public class ShopDialog extends UIDialog {
@Override
public void checkValid() throws Exception {
+ // do nothing
}
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java b/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
index bbb10c6d6..3abcfc0a4 100644
--- a/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
+++ b/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
@@ -2,6 +2,7 @@ package com.fr.design.extra;
import com.fr.base.FRContext;
import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.dialog.UIDialog;
import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.design.mainframe.DesignerContext;
@@ -62,7 +63,7 @@ public class WebViewDlgHelper {
String mainJsPath = StableUtils.pathJoin(installHome, MAIN_JS_PATH);
File file = new File(mainJsPath);
if (!file.exists()) {
- int rv = JOptionPane.showConfirmDialog(
+ int rv = FineJOptionPane.showConfirmDialog(
null,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
@@ -79,7 +80,7 @@ public class WebViewDlgHelper {
updateShopScripts(SHOP_SCRIPTS);
showPluginDlg();
} else {
- int rv = JOptionPane.showConfirmDialog(
+ int rv = FineJOptionPane.showConfirmDialog(
null,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install_Version"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
@@ -199,7 +200,7 @@ public class WebViewDlgHelper {
private static void confirmDownLoadShopJS() {
- int rv = JOptionPane.showConfirmDialog(
+ int rv = FineJOptionPane.showConfirmDialog(
null,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
@@ -277,7 +278,7 @@ public class WebViewDlgHelper {
CommonUtils.deleteFile(scriptZip);
}
PluginStoreConstants.refreshProps(); // 下载完刷新一下版本号等
- JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.INFORMATION_MESSAGE);
+ FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.INFORMATION_MESSAGE);
}
} catch (InterruptedException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -300,7 +301,7 @@ public class WebViewDlgHelper {
JSONObject resultJSONObject = new JSONObject(text);
String isLatest = resultJSONObject.optString("result");
if (!ComparatorUtils.equals(isLatest, LATEST)) {
- int rv = JOptionPane.showConfirmDialog(
+ int rv = FineJOptionPane.showConfirmDialog(
null,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Update"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
index 4cbd06328..19bd89ef1 100644
--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
@@ -1,6 +1,7 @@
package com.fr.design.extra.exe.callback;
import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.extra.PluginOperateUtils;
import com.fr.design.extra.PluginUtils;
@@ -41,7 +42,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
String switchedInfo = PluginOperateUtils.getSwitchedInfo(result);
jsCallback.execute("success");
FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
- JOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
+ FineJOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
} else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
@@ -50,7 +51,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,
null,
- null,
+ FineJOptionPane.OPTION_YES_NO_CANCEL,
null
);
if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -70,7 +71,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,
null,
- null,
+ FineJOptionPane.OPTION_YES_NO_CANCEL,
null
);
if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -80,7 +81,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
}else {
jsCallback.execute("failed");
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));
- JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"), JOptionPane.ERROR_MESSAGE);
+ FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"), JOptionPane.ERROR_MESSAGE);
}
}
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
index 6e72c0478..f597180e8 100644
--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
@@ -1,6 +1,7 @@
package com.fr.design.extra.exe.callback;
import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.extra.PluginOperateUtils;
import com.fr.log.FineLoggerFactory;
@@ -38,7 +39,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
String switchedInfo = PluginOperateUtils.getSwitchedInfo(result);
jsCallback.execute("success");
FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
- JOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
+ FineJOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
} else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){
int rv = JOptionPane.showOptionDialog(
null,
@@ -47,7 +48,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,
null,
- null,
+ FineJOptionPane.OPTION_YES_NO_CANCEL,
null
);
if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -58,7 +59,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
}else {
jsCallback.execute("failed");
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));
- JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+ FineJOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
}
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java
index b7b817ef4..c48a47fae 100644
--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java
@@ -1,6 +1,7 @@
package com.fr.design.extra.exe.callback;
import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.extra.PluginUtils;
import com.fr.plugin.manage.control.PluginTaskCallback;
@@ -24,9 +25,9 @@ public class ModifyStatusCallback implements PluginTaskCallback{
if (result.isSuccess()) {
jsCallback.execute("success");
String modifyMessage = isActive ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Plugin_Has_Been_Actived_Duplicate");
- JOptionPane.showMessageDialog(null, modifyMessage);
+ FineJOptionPane.showMessageDialog(null, modifyMessage);
} else {
- JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+ FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
}
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
index db8a69188..b3773ef6f 100644
--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
@@ -1,6 +1,7 @@
package com.fr.design.extra.exe.callback;
import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.extra.PluginUtils;
import com.fr.log.FineLoggerFactory;
@@ -27,7 +28,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
if (result.isSuccess()) {
jsCallback.execute("success");
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Success"));
- JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Success"));
+ FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Success"));
}else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) {
int rv = JOptionPane.showOptionDialog(
null,
@@ -36,7 +37,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,
null,
- null,
+ FineJOptionPane.OPTION_YES_NO_CANCEL,
null
);
if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -46,7 +47,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
} else {
jsCallback.execute("failed");
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Failed"));
- JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+ FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
}
}
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
index 392d8074e..7cced40f0 100644
--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
@@ -1,6 +1,7 @@
package com.fr.design.extra.exe.callback;
import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.extra.PluginOperateUtils;
import com.fr.design.extra.PluginUtils;
@@ -39,7 +40,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
if (result.isSuccess()) {
jsCallback.execute("success");
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success"));
- JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success"));
+ FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success"));
} else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
@@ -48,7 +49,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,
null,
- null,
+ FineJOptionPane.OPTION_YES_NO_CANCEL,
null
);
if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -68,7 +69,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,
null,
- null,
+ FineJOptionPane.OPTION_YES_NO_CANCEL,
null
);
if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -78,7 +79,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
}else {
jsCallback.execute("failed");
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed"));
- JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+ FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
}
}
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java
index 28f4f6a31..69998a316 100644
--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java
@@ -1,6 +1,7 @@
package com.fr.design.extra.exe.callback;
import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.extra.PluginOperateUtils;
import com.fr.log.FineLoggerFactory;
@@ -33,11 +34,11 @@ public class UpdateOnlineCallback extends AbstractDealPreTaskCallback {
if (result.isSuccess()) {
jsCallback.execute("success");
FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success"));
- JOptionPane.showMessageDialog(null,pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success"));
+ FineJOptionPane.showMessageDialog(null,pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success"));
} else {
jsCallback.execute("failed");
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed"));
- JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+ FineJOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
}
}
}
diff --git a/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java b/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java
index 468e92316..97a2ae006 100644
--- a/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java
@@ -1,5 +1,6 @@
package com.fr.design.extra.tradition.callback;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.extra.PluginStatusCheckCompletePane;
import com.fr.design.extra.PluginUtils;
@@ -32,7 +33,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
public void done(PluginTaskResult result){
if (result.isSuccess()) {
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update_Success"));
- JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
+ FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
} else if (result.errorCode() == PluginErrorCode.OperationNotSupport) {
int rv = JOptionPane.showOptionDialog(
null,
@@ -41,7 +42,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,
null,
- null,
+ FineJOptionPane.OPTION_YES_NO_CANCEL,
null
);
if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
@@ -50,7 +51,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
PluginManager.getController().update(pluginMarker, toPluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane));
} else {
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Delete_Failed"));
- JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+ FineJOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
}
}
}
diff --git a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
index 8e75fae0b..f8b089fe6 100644
--- a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
+++ b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
@@ -178,15 +178,28 @@ public class HistoryTemplateListCache implements CallbackEvent {
* @return 位置
*/
public int contains(JTemplate jt) {
+ return contains(jt, null);
+ }
+
+ public int contains(FILE file) {
+ return contains(null, file);
+ }
+
+ private int contains(JTemplate jt, FILE file) {
+ FILE item = null;
+ if (jt != null) {
+ item = jt.getEditingFILE();
+ } else {
+ item = file;
+ }
for (int i = 0; i < historyList.size(); i++) {
- if (ComparatorUtils.equals(historyList.get(i).getEditingFILE(), jt.getEditingFILE())) {
+ if (ComparatorUtils.equals(historyList.get(i).getEditingFILE(), item)) {
return i;
}
}
return -1;
}
-
/**
* 判断是否打开过该模板
* 由于切换环境不会关闭模板，可能存在同名的模板，所以该方法不能准确找到所选的模板，
@@ -386,4 +399,16 @@ public class HistoryTemplateListCache implements CallbackEvent {
}
FineLoggerFactory.getLogger().info("Env Change Template Loaded.");
}
+
+ /**
+ * 重新载入当前模板，刷新数据/对象
+ */
+ public void reloadCurrentTemplate() {
+ JTemplate jt = getCurrentEditingTemplate();
+ boolean access = jt != null && jt.getEditingFILE() != null && jt.getEditingFILE().exists();
+ if (access) {
+ jt.refreshResource();
+ }
+ }
+
}
diff --git a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
index 5a722239c..e4ab99033 100644
--- a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
+++ b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
@@ -5,6 +5,7 @@ import com.fr.base.BaseUtils;
import com.fr.base.GraphHelper;
import com.fr.base.vcs.DesignerMode;
import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.gui.imenu.UIScrollPopUpMenu;
import com.fr.design.i18n.Toolkit;
@@ -21,26 +22,9 @@ import com.fr.third.javax.annotation.Nonnull;
import com.fr.workspace.WorkContext;
import com.fr.workspace.server.lock.TplOperator;
-import javax.swing.BorderFactory;
-import javax.swing.ButtonModel;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JSeparator;
+import javax.swing.*;
import javax.swing.plaf.basic.BasicMenuItemUI;
-import java.awt.AWTEvent;
-import java.awt.AlphaComposite;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
+import java.awt.*;
import java.awt.event.AWTEventListener;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -257,7 +241,7 @@ public class MutilTempalteTabPane extends JComponent {
private String tempalteShowName(JTemplate template) {
- String name = template.getEditingFILE().getName();
+ String name = template.getTemplateName();
if (!template.isSaved() && !name.endsWith(" *")) {
name += " *";
}
@@ -398,8 +382,8 @@ public class MutilTempalteTabPane extends JComponent {
//画下面的那条线
if (templateStartX < maxWidth) {
GeneralPath generalPath = new GeneralPath(Path2D.WIND_EVEN_ODD, 2);
- generalPath.moveTo((float) templateStartX, getHeight() - 1.0F);
- generalPath.lineTo((float) maxWidth, getHeight() - 1.0F);
+ generalPath.moveTo((float) templateStartX, (float) (getHeight() - 1.0D));
+ generalPath.lineTo((float) maxWidth, (float) (getHeight() - 1.0D));
g2d.fill(generalPath);
//TODO hzzz delete
// g2d.setPaint(UIConstants.LINE_COLOR);
@@ -409,7 +393,7 @@ public class MutilTempalteTabPane extends JComponent {
private void paintDefaultBackground(Graphics2D g2d) {
//画默认背景
- g2d.setPaint(new GradientPaint(1, 1, UIConstants.TEMPLATE_TAB_PANE_BACKGROUND, 1, getHeight() - 1.0F, UIConstants.TEMPLATE_TAB_PANE_BACKGROUND));
+ g2d.setPaint(new GradientPaint(1, 1, UIConstants.TEMPLATE_TAB_PANE_BACKGROUND, 1, (float) (getHeight() - 1.0D), UIConstants.TEMPLATE_TAB_PANE_BACKGROUND));
g2d.fillRect(0, 0, getWidth(), getHeight());
}
@@ -535,7 +519,7 @@ public class MutilTempalteTabPane extends JComponent {
double[] x = {templateStartX, templateStartX, templateStartX + realWidth, templateStartX + realWidth, templateStartX};
double[] y = {1, getHeight() + 1, getHeight() + 1, 1, 1};
RoundRectangle2D.Double rect1 = new RoundRectangle2D.Double(templateStartX, 1, this.getWidth(), this.getHeight(), 7, 7);
- g2d.setPaint(new GradientPaint(1, 1, UIConstants.SELECT_TAB, 1, getHeight() - 1.0F, UIConstants.SELECT_TAB));
+ g2d.setPaint(new GradientPaint(1, 1, UIConstants.SELECT_TAB, 1, (float) (getHeight() - 1.0D), UIConstants.SELECT_TAB));
//选了30度和60度的特殊角度的x,y作为经过的两个点的坐标
double specialLocation1 = 2.5;
double specialLocation2 = 4.330127;
@@ -590,9 +574,9 @@ public class MutilTempalteTabPane extends JComponent {
double[] x = {templateStartX, templateStartX, templateStartX + realWidth, templateStartX + realWidth, templateStartX};
double[] y = {-1, getHeight() - 1, getHeight() - 1, -1, -1};
if (selfIndex == mouseOveredIndex) {
- g2d.setPaint(new GradientPaint(1, 1, UIConstants.HOVER_BLUE, 1, getHeight() - 1.0F, UIConstants.HOVER_BLUE));
+ g2d.setPaint(new GradientPaint(1, 1, UIConstants.HOVER_BLUE, 1, (float) (getHeight() - 1.0D), UIConstants.HOVER_BLUE));
} else {
- g2d.setPaint(new GradientPaint(1, 1, UIConstants.SHADOW_GREY, 1, getHeight() - 1.0F, UIConstants.SHADOW_GREY));
+ g2d.setPaint(new GradientPaint(1, 1, UIConstants.SHADOW_GREY, 1, (float) (getHeight() - 1.0D), UIConstants.SHADOW_GREY));
}
@@ -678,8 +662,8 @@ public class MutilTempalteTabPane extends JComponent {
if (!specifiedTemplate.isALLSaved() && !DesignerMode.isVcsMode()) {
specifiedTemplate.stopEditing();
- int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
- ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+ int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
+ Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.YES_OPTION) {
specifiedTemplate.saveTemplate();
FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
@@ -854,7 +838,7 @@ public class MutilTempalteTabPane extends JComponent {
*/
@Override
public void mouseEntered(MouseEvent e) {
-
+ // do nothing
}
/**
@@ -877,6 +861,7 @@ public class MutilTempalteTabPane extends JComponent {
*/
@Override
public void mouseReleased(MouseEvent e) {
+ // do nothing
}
/**
@@ -886,6 +871,7 @@ public class MutilTempalteTabPane extends JComponent {
*/
@Override
public void mouseClicked(MouseEvent e) {
+ // do nothing
}
/**
@@ -931,7 +917,7 @@ public class MutilTempalteTabPane extends JComponent {
//如果在权限编辑情况下，不允许切换到表单类型的工作簿
if (DesignerMode.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) {
DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex));
- JOptionPane.showMessageDialog(MutilTempalteTabPane.this, Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
+ FineJOptionPane.showMessageDialog(MutilTempalteTabPane.this, Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
+ "!", Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
MutilTempalteTabPane.this.repaint();
return;
@@ -957,6 +943,7 @@ public class MutilTempalteTabPane extends JComponent {
*/
@Override
public void mouseDragged(MouseEvent e) {
+ // do nothing
}
/**
diff --git a/designer-base/src/main/java/com/fr/design/file/NodeAuthProcessor.java b/designer-base/src/main/java/com/fr/design/file/NodeAuthProcessor.java
index a1082b62f..c3b8d3e4d 100644
--- a/designer-base/src/main/java/com/fr/design/file/NodeAuthProcessor.java
+++ b/designer-base/src/main/java/com/fr/design/file/NodeAuthProcessor.java
@@ -135,7 +135,7 @@ public class NodeAuthProcessor {
* @param fileNode file nodes
* @return 带权限信息的文件节点
*/
- public boolean fixFileNodeAuth(FileNode fileNode) {
+ public boolean checkFileNodeAuth(FileNode fileNode) {
boolean isLocal = WorkContext.getCurrent().isLocal();
boolean isRoot = WorkContext.getCurrent().isRoot();
diff --git a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
index 295b63385..f271f23c0 100644
--- a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
+++ b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
@@ -1 +1 @@
-package com.fr.design.file;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ilist.UIList;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JTemplate;
import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.ProductConstants;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
/**
* Author : daisy
* Date: 13-8-9
* Time: 下午3:41
*/
public class SaveSomeTemplatePane extends BasicPane {
private UICheckBox[] templateCheckBoxes = null;
private BasicDialog dialog;
private JPanel templatesChoosePane;
private UIScrollPane scrollPane;
private java.util.List> unSavedTemplate = new ArrayList>();
private boolean isAllSaved = false;
//该变量用来判断是在关闭其他模板或是关闭设计器的时候，是否需要判断当前模板有没有保存
private boolean isJudgeCurrentEditingTemplate = true;
public SaveSomeTemplatePane(boolean isNeedTojudgeCurrent) {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
if (this.dialog == null) {
this.dialog = this.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
@Override
public void doOk() {
for (int i = 0; i < templateCheckBoxes.length; i++) {
if (templateCheckBoxes[i].isSelected()) {
saveSelectedTemplate(unSavedTemplate.get(i));
}
}
isAllSaved = true;
}
public void doCancel() {
isAllSaved = false;
}
});
}
UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_The_Source_To_Save"));
this.add(tip, BorderLayout.NORTH);
templatesChoosePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
UIScrollPane scrollPane = new UIScrollPane(templatesChoosePane);
this.add(scrollPane, BorderLayout.CENTER);
this.isJudgeCurrentEditingTemplate = isNeedTojudgeCurrent;
}
private void initTemplatesChoosePane() {
templatesChoosePane.setBorder(BorderFactory.createTitledBorder(""));
for (int i = 0; i < unSavedTemplate.size(); i++) {
templateCheckBoxes[i] = new UICheckBox(unSavedTemplate.get(i).getEditingFILE().getName());
templateCheckBoxes[i].setSelected(true);
}
final UIList templatesList = new UIList(templateCheckBoxes);
templatesList.setModel(new UnSeletedTemplateListDataMode());
templatesList.setCellRenderer(new UnSelectedListCellRender());
templatesList.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent e) {
super.mousePressed(e);
int index = templatesList.getSelectedIndex();
if (index < 0) {
return;
}
UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(index);
checkBox.setSelected(!checkBox.isSelected());
templatesList.repaint();
}
});
final UICheckBox filenameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Choose_All"));
filenameCheckBox.setSelected(true);
filenameCheckBox.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
boolean isSelected = filenameCheckBox.isSelected();
for (int i = 0; i < templatesList.getModel().getSize(); i++) {
UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(i);
checkBox.setSelected(isSelected);
}
templatesList.repaint();
}
});
templatesChoosePane.add(filenameCheckBox, BorderLayout.NORTH);
templatesChoosePane.add(templatesList, BorderLayout.CENTER);
}
public boolean showSavePane() {
populate();
//如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目
if (!unSavedTemplate.isEmpty()) {
dialog.setVisible(true);
} else {
isAllSaved = true;
}
return isAllSaved;
}
public void populate() {
java.util.List> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList();
JTemplate currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
for (int i = 0; i < opendedTemplate.size(); i++) {
if (isneedToAdd(opendedTemplate.get(i), currentTemplate)) {
unSavedTemplate.add(opendedTemplate.get(i));
}
}
templateCheckBoxes = new UICheckBox[unSavedTemplate.size()];
initTemplatesChoosePane();
}
private boolean isneedToAdd(JTemplate template, JTemplate currentTemplate) {
//所有模板都判断是不是保存
if (isJudgeCurrentEditingTemplate) {
return !template.isALLSaved();
}
//当前编辑的模板不判断是否已经保存
if (ComparatorUtils.equals(template, currentTemplate)) {
return false;
} else {
return !template.isALLSaved();
}
}
private void saveSelectedTemplate(JTemplate specifiedTemplate) {
if (!specifiedTemplate.isSaved()) {
specifiedTemplate.stopEditing();
specifiedTemplate.saveTemplate();
}
FineLoggerFactory.getLogger().info( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
}
public int saveLastOneTemplate() {
JTemplate specifiedTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
if (!specifiedTemplate.isALLSaved()) {
specifiedTemplate.stopEditing();
int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) {
specifiedTemplate.saveTemplate();
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
}
return returnVal;
}
return JOptionPane.YES_OPTION;
}
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save");
}
private class UnSelectedListCellRender extends DefaultListCellRenderer {
@Override
public Component getListCellRendererComponent(JList list, Object value, int index, final boolean isSelected, boolean cellHasFocus) {
super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
templateCheckBoxes[index] = (UICheckBox) value;
templateCheckBoxes[index].setBackground(list.getBackground());
return templateCheckBoxes[index];
}
}
private class UnSeletedTemplateListDataMode extends AbstractListModel {
@Override
public int getSize() {
return templateCheckBoxes.length;
}
@Override
public UICheckBox getElementAt(int index) {
if (index > getSize() - 1 || index < 0) {
return null;
}
return templateCheckBoxes[index];
}
}
}
\ No newline at end of file
+package com.fr.design.file;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ilist.UIList;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JTemplate;
import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.ProductConstants;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
/**
* Author : daisy
* Date: 13-8-9
* Time: 下午3:41
*/
public class SaveSomeTemplatePane extends BasicPane {
private UICheckBox[] templateCheckBoxes = null;
private BasicDialog dialog;
private JPanel templatesChoosePane;
private UIScrollPane scrollPane;
private java.util.List> unSavedTemplate = new ArrayList>();
private boolean isAllSaved = false;
//该变量用来判断是在关闭其他模板或是关闭设计器的时候，是否需要判断当前模板有没有保存
private boolean isJudgeCurrentEditingTemplate = true;
public SaveSomeTemplatePane(boolean isNeedTojudgeCurrent) {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
if (this.dialog == null) {
this.dialog = this.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
@Override
public void doOk() {
for (int i = 0; i < templateCheckBoxes.length; i++) {
if (templateCheckBoxes[i].isSelected()) {
saveSelectedTemplate(unSavedTemplate.get(i));
}
}
isAllSaved = true;
}
public void doCancel() {
isAllSaved = false;
}
});
}
UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_The_Source_To_Save"));
this.add(tip, BorderLayout.NORTH);
templatesChoosePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
UIScrollPane scrollPane = new UIScrollPane(templatesChoosePane);
this.add(scrollPane, BorderLayout.CENTER);
this.isJudgeCurrentEditingTemplate = isNeedTojudgeCurrent;
}
private void initTemplatesChoosePane() {
templatesChoosePane.setBorder(BorderFactory.createTitledBorder(""));
for (int i = 0; i < unSavedTemplate.size(); i++) {
templateCheckBoxes[i] = new UICheckBox(unSavedTemplate.get(i).getEditingFILE().getName());
templateCheckBoxes[i].setSelected(true);
}
final UIList templatesList = new UIList(templateCheckBoxes);
templatesList.setModel(new UnSeletedTemplateListDataMode());
templatesList.setCellRenderer(new UnSelectedListCellRender());
templatesList.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent e) {
super.mousePressed(e);
int index = templatesList.getSelectedIndex();
if (index < 0) {
return;
}
UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(index);
checkBox.setSelected(!checkBox.isSelected());
templatesList.repaint();
}
});
final UICheckBox filenameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Choose_All"));
filenameCheckBox.setSelected(true);
filenameCheckBox.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
boolean isSelected = filenameCheckBox.isSelected();
for (int i = 0; i < templatesList.getModel().getSize(); i++) {
UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(i);
checkBox.setSelected(isSelected);
}
templatesList.repaint();
}
});
templatesChoosePane.add(filenameCheckBox, BorderLayout.NORTH);
templatesChoosePane.add(templatesList, BorderLayout.CENTER);
}
public boolean showSavePane() {
populate();
//如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目
if (!unSavedTemplate.isEmpty()) {
dialog.setVisible(true);
} else {
isAllSaved = true;
}
return isAllSaved;
}
public void populate() {
java.util.List> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList();
JTemplate currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
for (int i = 0; i < opendedTemplate.size(); i++) {
if (isneedToAdd(opendedTemplate.get(i), currentTemplate)) {
unSavedTemplate.add(opendedTemplate.get(i));
}
}
templateCheckBoxes = new UICheckBox[unSavedTemplate.size()];
initTemplatesChoosePane();
}
private boolean isneedToAdd(JTemplate template, JTemplate currentTemplate) {
//所有模板都判断是不是保存
if (isJudgeCurrentEditingTemplate) {
return !template.isALLSaved();
}
//当前编辑的模板不判断是否已经保存
if (ComparatorUtils.equals(template, currentTemplate)) {
return false;
} else {
return !template.isALLSaved();
}
}
private void saveSelectedTemplate(JTemplate specifiedTemplate) {
if (!specifiedTemplate.isSaved()) {
specifiedTemplate.stopEditing();
specifiedTemplate.saveTemplate();
}
FineLoggerFactory.getLogger().info( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
}
public int saveLastOneTemplate() {
JTemplate specifiedTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
if (!specifiedTemplate.isALLSaved()) {
specifiedTemplate.stopEditing();
int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) {
specifiedTemplate.saveTemplate();
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
}
return returnVal;
}
return JOptionPane.YES_OPTION;
}
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save");
}
private class UnSelectedListCellRender extends DefaultListCellRenderer {
@Override
public Component getListCellRendererComponent(JList list, Object value, int index, final boolean isSelected, boolean cellHasFocus) {
super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
templateCheckBoxes[index] = (UICheckBox) value;
templateCheckBoxes[index].setBackground(list.getBackground());
return templateCheckBoxes[index];
}
}
private class UnSeletedTemplateListDataMode extends AbstractListModel {
@Override
public int getSize() {
return templateCheckBoxes.length;
}
@Override
public UICheckBox getElementAt(int index) {
if (index > getSize() - 1 || index < 0) {
return null;
}
return templateCheckBoxes[index];
}
}
}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
index 1708c0753..93001bde4 100644
--- a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
@@ -4,6 +4,7 @@
package com.fr.design.file;
import com.fr.base.FRContext;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.itree.filetree.TemplateFileTree;
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
@@ -254,16 +255,16 @@ public class TemplateTreePane extends JPanel implements FileOperations {
? Toolkit.i18nText("Fine-Design_Basic_Confirm_Delete_Folder")
: Toolkit.i18nText("Fine-Design_Basic_Confirm_Delete_File");
- if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+ if (FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
tipContent,
- UIManager.getString("OptionPane.messageDialogTitle"),
+ Toolkit.i18nText("Fine-Design_Basic_Confirm"),
YES_NO_OPTION)
== JOptionPane.YES_OPTION) {
// 删除所有选中的即可
if (!deleteNodes(Arrays.asList(treeNodes))) {
- JOptionPane.showConfirmDialog(null,
+ FineJOptionPane.showConfirmDialog(null,
Toolkit.i18nText("Fine-Design_Basic_Delete_Failure"),
- UIManager.getString("OptionPane.messageDialogTitle"),
+ Toolkit.i18nText("Fine-Design_Basic_Error"),
JOptionPane.DEFAULT_OPTION,
JOptionPane.ERROR_MESSAGE);
}
@@ -277,24 +278,24 @@ public class TemplateTreePane extends JPanel implements FileOperations {
if (deletableNodes.isEmpty()) {
// 提醒被锁定模板无法删除
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Unable_Delete_Locked_File"),
- Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+ Toolkit.i18nText("Fine-Design_Basic_Alert"),
WARNING_MESSAGE);
return;
}
- if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+ if (FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
tipContent,
- UIManager.getString("OptionPane.messageDialogTitle"),
+ Toolkit.i18nText("Fine-Design_Basic_Confirm"),
YES_NO_OPTION)
== JOptionPane.YES_OPTION) {
// 删除其他
if (!deleteNodes(deletableNodes)) {
- JOptionPane.showConfirmDialog(null,
+ FineJOptionPane.showConfirmDialog(null,
Toolkit.i18nText("Fine-Design_Basic_Delete_Failure"),
- UIManager.getString("OptionPane.messageDialogTitle"),
+ Toolkit.i18nText("Fine-Design_Basic_Error"),
JOptionPane.DEFAULT_OPTION,
JOptionPane.ERROR_MESSAGE);
}
@@ -415,9 +416,9 @@ public class TemplateTreePane extends JPanel implements FileOperations {
}
if (!lockedNodes.isEmpty()) {
- JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+ FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Warn_Rename_Lock_File"),
- UIManager.getString("OptionPane.messageDialogTitle"),
+ Toolkit.i18nText("Fine-Design_Basic_Alert"),
JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE);
return true;
}
diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
index a8c8c3477..32e7030bb 100644
--- a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
+++ b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
@@ -8,6 +8,7 @@ import com.fr.design.border.UIRoundedBorder;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
@@ -28,17 +29,7 @@ import com.fr.stable.ProductConstants;
import com.fr.stable.StringUtils;
import com.fr.stable.script.Expression;
-import javax.swing.BorderFactory;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.DefaultListModel;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JTree;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.event.TreeSelectionEvent;
@@ -48,10 +39,7 @@ import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.MutableTreeNode;
import javax.swing.tree.TreePath;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
@@ -149,10 +137,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
keyWordTextField.addKeyListener(new KeyListener() {
@Override
public void keyTyped(KeyEvent e) {
+ //do nothing
}
@Override
public void keyReleased(KeyEvent e) {
+ //do nothing
}
@Override
@@ -237,7 +227,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
protected void extendCheckBoxPane(JPanel checkBoxPane) {
-
+ // do nothing
}
private void configFormulaArea() {
@@ -413,6 +403,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
@Override
public void keyTyped(KeyEvent e) {
+ // do nothing
}
protected void search(String keyWord, boolean findDescription) {
@@ -583,14 +574,15 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
// alex:继续往下面走,expression为null时告知不合法公式
}
- JOptionPane.showMessageDialog(
+ FineJOptionPane.showMessageDialog(
FormulaPane.this,
/*
* alex:仅仅只需要根据expression是否为null作合法性判断
* 不需要eval
* TODO 但有个问题,有些函数的参数个数是有规定的,何以判别之
*/
- (expression != null ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Valid_Formula") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Invalid_Formula")) + ".", ProductConstants.PRODUCT_NAME,
+ (expression != null ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Valid_Formula") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Invalid_Formula")) + ".",
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.INFORMATION_MESSAGE);
}
}
diff --git a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
index 3d56dd925..c40a917e3 100644
--- a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
+++ b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
@@ -142,8 +142,10 @@ public class FunctionManagerPane extends BasicPane {
editorButton.setPreferredSize(new Dimension(editorButton.getPreferredSize().width, classNameTextField.getPreferredSize().height));
reportletNamePane.add(editorButton);
editorButton.addActionListener(createEditorButtonActionListener());
- northPane.add(GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"),
- reportletNamePane}, FlowLayout.LEFT));
+ JPanel classNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ classNamePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), BorderLayout.NORTH);
+ classNamePane.add(reportletNamePane, BorderLayout.CENTER);
+ northPane.add(classNamePane);
DescriptionTextArea descriptionArea = new DescriptionTextArea();
descriptionArea.setWrapStyleWord(true);
descriptionArea.setLineWrap(true);
diff --git a/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java b/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java
index a3bdbae21..9b5a95a43 100644
--- a/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java
+++ b/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java
@@ -2,6 +2,7 @@ package com.fr.design.formula;
import com.fr.base.FRContext;
import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
@@ -161,11 +162,11 @@ public class JavaEditorPane extends BasicPane {
}
try {
WorkContext.getWorkResource().write(StableUtils.pathJoin(ProjectConstants.CLASSES_NAME, getJavaPath()), text.getBytes(EncodeConstants.ENCODING_UTF_8));
- JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Successfully") + "！");
+ FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Successfully") + "！");
fireSaveActionListener();
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
- JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Failed") + "！");
+ FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Failed") + "！");
}
}
@@ -191,7 +192,7 @@ public class JavaEditorPane extends BasicPane {
if (StringUtils.isEmpty(message)) {
message = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile_Success") + "!";
}
- JOptionPane.showMessageDialog(null, message);
+ FineJOptionPane.showMessageDialog(null, message);
} catch (InterruptedException e1) {
FineLoggerFactory.getLogger().error(e1.getMessage(), e1);
Thread.currentThread().interrupt();
diff --git a/designer-base/src/main/java/com/fr/design/fun/MobileBookMarkStyleProvider.java b/designer-base/src/main/java/com/fr/design/fun/MobileBookMarkStyleProvider.java
new file mode 100644
index 000000000..d376dd9ac
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/fun/MobileBookMarkStyleProvider.java
@@ -0,0 +1,34 @@
+package com.fr.design.fun;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.form.ui.mobile.MobileBookMarkStyle;
+import com.fr.stable.fun.mark.Mutable;
+
+/**
+ * 移动端书签样式扩展接口
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/23
+ */
+public interface MobileBookMarkStyleProvider extends Mutable {
+
+ String XML_TAG = "MobileBookMarkStyleProvider";
+
+ int CURRENT_LEVEL = 1;
+
+ /**
+ * 书签样式
+ * @return
+ */
+ Class classForMobileBookMarkStyle();
+
+ /**
+ * 书签样式面板
+ * @return
+ */
+ Class> classForMobileBookMarkStyleAppearance();
+
+ String displayName();
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/fun/MultiStyleUIConfigProvider.java b/designer-base/src/main/java/com/fr/design/fun/MultiStyleUIConfigProvider.java
new file mode 100644
index 000000000..d00138eff
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/fun/MultiStyleUIConfigProvider.java
@@ -0,0 +1,23 @@
+package com.fr.design.fun;
+
+import com.fr.common.annotations.Open;
+import com.fr.stable.fun.mark.Mutable;
+
+import java.util.List;
+
+/**
+ * Created by kerry on 2019-11-11
+ */
+@Open
+public interface MultiStyleUIConfigProvider extends Mutable {
+ String XML_TAG = "MultiStyleUIConfigProvider";
+
+ int CURRENT_LEVEL = 1;
+
+ /**
+ * 获取配置项list
+ *
+ * @return 配置项list
+ */
+ List getConfigList();
+}
diff --git a/designer-base/src/main/java/com/fr/design/fun/StyleUIConfigProvider.java b/designer-base/src/main/java/com/fr/design/fun/StyleUIConfigProvider.java
new file mode 100644
index 000000000..a28d276df
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/fun/StyleUIConfigProvider.java
@@ -0,0 +1,39 @@
+package com.fr.design.fun;
+
+import com.fr.base.Style;
+import com.fr.common.annotations.Open;
+import com.fr.stable.fun.mark.Mutable;
+
+import javax.swing.JComponent;
+import javax.swing.event.ChangeListener;
+
+/**
+ * Created by kerry on 2019-11-11
+ */
+@Open
+public interface StyleUIConfigProvider extends Mutable {
+ String XML_TAG = "CustomStyleUIConfigProvider";
+
+ int CURRENT_LEVEL = 1;
+
+ /**
+ * @return 配置名
+ */
+ String configName();
+
+ /**
+ * @param changeListener 需要添加的listener
+ * @return 对应的component
+ */
+ JComponent uiComponent(ChangeListener changeListener);
+
+ /**
+ * @return 更新后的样式
+ */
+ Style updateConfig();
+
+ /**
+ * @param style 待渲染的样式
+ */
+ void populateConfig(Style style);
+}
diff --git a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMobileBookMarkStyleProvider.java b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMobileBookMarkStyleProvider.java
new file mode 100644
index 000000000..21ed6722b
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMobileBookMarkStyleProvider.java
@@ -0,0 +1,24 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.MobileBookMarkStyleProvider;
+import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/24
+ */
+@API(level = MobileBookMarkStyleProvider.CURRENT_LEVEL)
+public abstract class AbstractMobileBookMarkStyleProvider extends AbstractProvider implements MobileBookMarkStyleProvider {
+
+ @Override
+ public int currentAPILevel() {
+ return CURRENT_LEVEL;
+ }
+
+ @Override
+ public String mark4Provider() {
+ return getClass().getName();
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMultiStyleUIConfigProvider.java b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMultiStyleUIConfigProvider.java
new file mode 100644
index 000000000..260d4099b
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMultiStyleUIConfigProvider.java
@@ -0,0 +1,26 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.StyleUIConfigProvider;
+import com.fr.design.fun.MultiStyleUIConfigProvider;
+import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by kerry on 2019-11-11
+ */
+@API(level = MultiStyleUIConfigProvider.CURRENT_LEVEL)
+public abstract class AbstractMultiStyleUIConfigProvider extends AbstractProvider implements MultiStyleUIConfigProvider {
+ @Override
+ public List getConfigList() {
+ return new ArrayList();
+ }
+
+ @Override
+ public int currentAPILevel() {
+ return CURRENT_LEVEL;
+ }
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractStyleUIConfigProvider.java b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractStyleUIConfigProvider.java
new file mode 100644
index 000000000..e3388feaf
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractStyleUIConfigProvider.java
@@ -0,0 +1,41 @@
+package com.fr.design.fun.impl;
+
+import com.fr.base.Style;
+import com.fr.design.fun.StyleUIConfigProvider;
+import com.fr.stable.StringUtils;
+import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+import javax.swing.JComponent;
+import javax.swing.event.ChangeListener;
+
+/**
+ * Created by kerry on 2019-11-11
+ */
+@API(level = StyleUIConfigProvider.CURRENT_LEVEL)
+public class AbstractStyleUIConfigProvider extends AbstractProvider implements StyleUIConfigProvider {
+ @Override
+ public int currentAPILevel() {
+ return CURRENT_LEVEL;
+ }
+
+ @Override
+ public String configName() {
+ return StringUtils.EMPTY;
+ }
+
+ @Override
+ public JComponent uiComponent(ChangeListener changeListener) {
+ return null;
+ }
+
+ @Override
+ public Style updateConfig() {
+ return null;
+ }
+
+ @Override
+ public void populateConfig(Style style) {
+
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java
index 4bb286dbc..ebe41b2bc 100644
--- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java
@@ -1,10 +1,13 @@
package com.fr.design.gui.controlpane;
+import com.fr.design.DesignerEnvManager;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.data.tabledata.tabledatapane.GlobalMultiTDTableDataPane;
import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane;
import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane;
import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane;
+import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.env.RemoteDesignerWorkspaceInfo;
import com.fr.design.gui.ilist.ListModelElement;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.ComparatorUtils;
@@ -99,6 +102,15 @@ class JControlUpdatePane extends JPanel {
if (pane != null && pane.isVisible()) {
Object bean = pane.updateBean();
+ try {
+ if (bean instanceof RemoteDesignerWorkspaceInfo) {
+ DesignerWorkspaceInfo info = DesignerEnvManager.getEnvManager().getWorkspaceInfo(elEditing.wrapper.getName());
+ String remindTime = info.getRemindTime();
+ ((RemoteDesignerWorkspaceInfo) bean).setRemindTime(remindTime);
+ }
+ }catch (Exception e){
+ FineLoggerFactory.getLogger().info("remindTime is not exist");
+ }
if (i < creators.length) {
creators[i].saveUpdatedBean(elEditing, bean);
}
diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java
index 5618c407c..0d12772d3 100644
--- a/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java
+++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java
@@ -1,6 +1,7 @@
package com.fr.design.gui.controlpane;
import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ilist.JNameEdList;
import com.fr.design.gui.ilist.ListModelElement;
import com.fr.stable.Nameable;
@@ -32,7 +33,7 @@ class ListControlPaneHelper {
try {
listControlPane.checkValid();
} catch (Exception exp) {
- JOptionPane.showMessageDialog((Component) listControlPane, exp.getMessage());
+ FineJOptionPane.showMessageDialog((Component) listControlPane, exp.getMessage());
listControlPane.setSelectedIndex(idx);
return true;
}
diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java
index 6ab6bce56..747dbe32f 100644
--- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java
@@ -1,6 +1,7 @@
package com.fr.design.gui.controlpane;
import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.controlpane.shortcutfactory.ShortCutFactory;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itoolbar.UIToolBarUI;
@@ -10,15 +11,25 @@ import com.fr.design.mainframe.DesignerContext;
import com.fr.design.menu.ShortCut;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.design.widget.FRWidgetFactory;
+import com.fr.invoke.Reflect;
import com.fr.stable.ArrayUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.os.OperatingSystem;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
+import javax.swing.border.EmptyBorder;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
+import java.awt.Frame;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.GraphicsEnvironment;
@@ -26,14 +37,6 @@ import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Toolkit;
import java.awt.Window;
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JSplitPane;
-import javax.swing.border.EmptyBorder;
-
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
@@ -243,6 +246,20 @@ abstract class UIControlPane extends JControlPane {
return;
}
}
+
+ try {
+ //没有指定owner的弹出框用的是SwingUtilities.getSharedOwnerFrame()
+ Frame sharedOwnerFrame = Reflect.on(SwingUtilities.class).call("getSharedOwnerFrame").get();
+ for (Window window : sharedOwnerFrame.getOwnedWindows()) {
+ if (window instanceof JDialog && window.isVisible() && ((JDialog) window).isModal()) {
+ // 如果有可见模态对话框，则不隐藏
+ return;
+ }
+ }
+ } catch (Exception ignore) {
+ //do nothing
+ }
+
// 要隐藏 先检查有没有非法输入
// 非法输入检查放在最后，因为可能出现面板弹出新弹框而失去焦点的情况，比如 输入公式时，弹出公式编辑对话框
try {
@@ -250,7 +267,7 @@ abstract class UIControlPane extends JControlPane {
} catch (Exception exp) {
// 存在非法输入 拒绝隐藏
this.setAlwaysOnTop(true);
- JOptionPane.showMessageDialog(this, exp.getMessage());
+ FineJOptionPane.showMessageDialog(this, exp.getMessage());
this.requestFocus();
return;
}
diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java
index c97b671de..c21b740c4 100644
--- a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java
+++ b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java
@@ -437,18 +437,18 @@ public class UICalendarPanel extends JPanel {
};
}
- protected EventListenerList listenerList = new EventListenerList();
+ protected EventListenerList eventlistenerList = new EventListenerList();
public void addDateChangeListener(ChangeListener l) {
- listenerList.add(ChangeListener.class, l);
+ eventlistenerList.add(ChangeListener.class, l);
}
public void removeDateChangeListener(ChangeListener l) {
- listenerList.remove(ChangeListener.class, l);
+ eventlistenerList.remove(ChangeListener.class, l);
}
protected void fireDateChanged(ChangeEvent e) {
- Object[] listeners = listenerList.getListenerList();
+ Object[] listeners = eventlistenerList.getListenerList();
for (int i = listeners.length - 2; i >= 0; i -= 2) {
if (listeners[i] == ChangeListener.class) {
((ChangeListener) listeners[i + 1]).stateChanged(e);
diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java
index afbf43c30..66b057d0c 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java
@@ -3,6 +3,7 @@ package com.fr.design.gui.frpane;
import com.fr.base.BaseUtils;
import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.write.submit.DBManipulationPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.javascript.Commit2DBJavaScriptPane;
@@ -408,7 +409,7 @@ public class CommitTabbedPane extends JComponent implements MouseListener, Mous
selectedIndex = dbManipulationPaneList.size()-1;
commit2DBJavaScriptPane.updateCardPane();
} else if (isOverCloseIcon(x)){
- int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CommitTab_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CommitTab_Remove")
+ int re = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CommitTab_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CommitTab_Remove")
, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
if (re == JOptionPane.OK_OPTION) {
dbManipulationPaneList.remove(getTabIndex(x));
diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
index d3370a7c0..068e9cc9d 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
@@ -1,6 +1,7 @@
package com.fr.design.gui.frpane;
import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
@@ -127,7 +128,7 @@ public abstract class EditingStringListPane extends BasicBeanPane>
setAddEnabled(false);
}
} else {
- JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), newvalue + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Already_Exists_Not_Add_Repeat")+"!");
+ FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), newvalue + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Already_Exists_Not_Add_Repeat")+"!");
}
}
});
@@ -149,7 +150,7 @@ public abstract class EditingStringListPane extends BasicBeanPane>
public void actionPerformed(ActionEvent e) {
Object selected = jlist.getSelectedValue();
if (selected != null) {
- int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete") + selected.toString() + "?");
+ int re = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete") + selected.toString() + "?");
if (re == JOptionPane.OK_OPTION) {
JListUtils.removeSelectedListItems(jlist);
}
diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java
index 3f4ae9b2a..8405ce09e 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java
@@ -2,6 +2,7 @@ package com.fr.design.gui.frpane;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.designer.TargetComponent;
+import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.fun.HyperlinkProvider;
import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.controlpane.UIListControlPane;
@@ -45,6 +46,7 @@ public abstract class HyperlinkGroupPane extends UIListControlPane {
@Override
public void on(PluginEvent event) {
refreshNameableCreator(createNameableCreators());
+ HistoryTemplateListCache.getInstance().reloadCurrentTemplate();
}
}, new PluginFilter() {
diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java
index 0c266b81a..04e3626a4 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java
@@ -5,6 +5,7 @@ import com.fr.data.impl.TreeNodeAttr;
import com.fr.data.impl.TreeNodeWrapper;
import com.fr.design.actions.UpdateAction;
import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.controlpane.ControlPane;
import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
@@ -231,7 +232,7 @@ public class JTreeControlPane extends ControlPane {
public void actionPerformed(ActionEvent e) {
// TODO remove tree node
- int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
+ int val = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (val != JOptionPane.OK_OPTION) {
return;
diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java
index 92ad39559..c1021321b 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java
@@ -1,5 +1,6 @@
package com.fr.design.gui.frpane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.general.ComparatorUtils;
@@ -113,7 +114,7 @@ public class UITabbedPane extends JTabbedPane{
* @param i tab索引
*/
public void doRemoveTab(int i){
- int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")
+ int re = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")
, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
if (re == JOptionPane.OK_OPTION) {
super.removeTabAt(i);
diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPaneUI.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPaneUI.java
index d95740798..5798a864b 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPaneUI.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPaneUI.java
@@ -330,7 +330,9 @@ public class UITabbedPaneUI extends BasicTabbedPaneUI {
g.drawLine(x + 1, y + h - 2, x + w - 3, y + h - 2); // bottom
}
+ @Override
protected void paintContentBorder(Graphics g, int tabPlacement, int selectedIndex) {
+ // do nothing
}
/**
diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UnitInputPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UnitInputPane.java
index 798b79af0..bab3e8851 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/UnitInputPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UnitInputPane.java
@@ -133,14 +133,17 @@ public abstract class UnitInputPane extends BasicPane {
@Override
public void keyTyped(KeyEvent arg0) {
+ // 敲击键盘，发生在按键按下后，按键放开前
}
@Override
public void keyReleased(KeyEvent arg0) {
+ // 松开按键时
}
@Override
public void keyPressed(KeyEvent arg0) {
+ // 按下按键时
changed = true;
}
};
@@ -149,23 +152,28 @@ public abstract class UnitInputPane extends BasicPane {
@Override
public void mouseReleased(MouseEvent arg0) {
+ // 鼠标按键在组件上释放时
}
@Override
public void mousePressed(MouseEvent arg0) {
+ // 鼠标按键在组件上按下时
changed = true;
}
@Override
public void mouseExited(MouseEvent arg0) {
+ // 鼠标离开组件时
}
@Override
public void mouseEntered(MouseEvent arg0) {
+ // 鼠标进入到组件时
}
@Override
public void mouseClicked(MouseEvent arg0) {
+ // 鼠标按键在组件上单击时
}
};
}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java
index 128adca1f..6d74e4801 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java
@@ -2,6 +2,7 @@ package com.fr.design.gui.frpane.tree.layer.config;
import com.fr.base.BaseUtils;
import com.fr.design.actions.UpdateAction;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.controlpane.ControlPane;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.itoolbar.UIToolbar;
@@ -177,7 +178,7 @@ public class LayerDataControlPane extends ControlPane {
public void actionPerformed(ActionEvent e) {
// TODO remove tree node
- int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
+ int val = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (val != JOptionPane.OK_OPTION) {
return;
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/SpecialUIButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/SpecialUIButton.java
index 338cbac7e..c423ac582 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/SpecialUIButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/SpecialUIButton.java
@@ -25,6 +25,8 @@ public class SpecialUIButton extends JButton {
*
* @see javax.swing.AbstractButton#setUI(ButtonUI)
*/
+ @Override
public void setUI(ButtonUI ui) {
+ // do nothing
}
}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIBasicButtonUI.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIBasicButtonUI.java
index 64db1e91d..87aae662b 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIBasicButtonUI.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIBasicButtonUI.java
@@ -43,6 +43,7 @@ public class UIBasicButtonUI extends MetalButtonUI {
private boolean isDefault;
public UIBasicButtonUI() {
+ // do nothing
}
/**
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButton.java
index c1dc9b058..28f583061 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButton.java
@@ -1,19 +1,5 @@
package com.fr.design.gui.ibutton;
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-import javax.swing.AbstractButton;
-import javax.swing.ButtonModel;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
-
import com.fr.base.Utils;
import com.fr.design.constants.UIConstants;
import com.fr.design.event.GlobalNameListener;
@@ -21,231 +7,235 @@ import com.fr.design.event.GlobalNameObserver;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import com.fr.design.gui.ipoppane.PopupHider;
-import com.fr.general.ComparatorUtils;
import com.fr.design.style.color.ColorControlWindow;
import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.ComparatorUtils;
+
+import javax.swing.AbstractButton;
+import javax.swing.ButtonModel;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
public class UIColorButton extends UIButton implements PopupHider, UIObserver, GlobalNameObserver {
- private static final int SIZE = 16;
- private static final int SIZE_2 = 2;
- private static final int SIZE_4 = 4;
- private static final int SIZE_6 = 6;
- private static final int POPUP_MENU_SHIFT = -70;
- private Color color = Color.BLACK;
- private ColorControlWindow popupWin;
- private EventListenerList colorChangeListenerList = new EventListenerList();
- private boolean isEventBanned = false;
- private String colorButtonName = "";
- private UIObserverListener uiObserverListener;
- private GlobalNameListener globalNameListener = null;
-
- public UIColorButton() {
- this(UIConstants.FONT_ICON);
- }
-
- public UIColorButton(Icon icon) {
- super(icon);
- setUI(getButtonUI());
- addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent e) {
- showPopupMenu();
- }
- });
- iniListener();
- }
-
- private void iniListener() {
- if (shouldResponseChangeListener()) {
- this.addColorChangeListener(new ChangeListener() {
- @Override
- public void stateChanged(ChangeEvent e) {
- if (uiObserverListener == null) {
- return;
- }
- if (globalNameListener != null && shouldResponseNameListener()) {
- globalNameListener.setGlobalName(colorButtonName);
- }
- uiObserverListener.doChange();
- }
- });
- }
- }
-
- private UIButtonUI getButtonUI() {
- return new UIButtonUI() {
- @Override
- protected void paintIcon(Graphics g, JComponent c) {
- super.paintIcon(g, c);
- AbstractButton b = (AbstractButton) c;
- ButtonModel model = b.getModel();
- if (model.isEnabled()) {
- g.setColor(UIColorButton.this.getColor());
- } else {
- g.setColor(new Color(Utils.filterRGB(UIColorButton.this.getColor().getRGB(), 50)));
- }
- g.fillRect((b.getWidth() - SIZE) / SIZE_2, b.getHeight() - SIZE_6, SIZE, SIZE_4);
- }
- };
- }
-
- public void setEventBanned(boolean isEventBanned) {
- this.isEventBanned = isEventBanned;
- }
-
- public void setGlobalName(String name) {
- colorButtonName = name;
- }
-
- public Color getColor() {
- return color;
- }
-
- public void setColor(Color color) {
- if (ComparatorUtils.equals(this.color, color)) {
- return;
- }
-
- this.color = color;
- hidePopupMenu();
- fireColorStateChanged();
- }
-
- private void showPopupMenu() {
- if (isEventBanned) {
- return;
- }
-
- if (popupWin != null && popupWin.isVisible()) {
- hidePopupMenu();
- return;
- }
-
- if (!this.isEnabled()) {
- return;
- }
-
- popupWin = this.getColorControlWindow();
-
- GUICoreUtils.showPopupMenu(popupWin, this, POPUP_MENU_SHIFT, this.getSize().height);
- }
-
- /**
- * 隐藏popupmenu
- */
- public void hidePopupMenu() {
- if (popupWin != null) {
- popupWin.setVisible(false);
- repaint();
- }
-
- popupWin = null;
- }
-
- private ColorControlWindow getColorControlWindow() {
- //find parant.
- if (this.popupWin == null) {
- this.popupWin = new ColorControlWindow(UIColorButton.this) {
- @Override
- protected void colorChanged() {
- UIColorButton.this.setColor(this.getColor());
- }
-
- };
- }
-
- return popupWin;
- }
-
- /**
- * 添加监听
- *
- * @param changeListener 监听列表
- */
- public void addColorChangeListener(ChangeListener changeListener) {
- colorChangeListenerList.add(ChangeListener.class, changeListener);
- }
-
- /**
- * 移除监听
- * Removes an old ColorChangeListener.
- * @param changeListener 监听列表
- */
- public void removeColorChangeListener(ChangeListener changeListener) {
- colorChangeListenerList.remove(ChangeListener.class, changeListener);
- }
-
- /**
- * 颜色状态改变
- */
- public void fireColorStateChanged() {
- Object[] listeners = colorChangeListenerList.getListenerList();
- ChangeEvent e = null;
-
- for (int i = listeners.length - 2; i >= 0; i -= 2) {
- if (listeners[i] == ChangeListener.class) {
- if (e == null) {
- e = new ChangeEvent(this);
- }
- ((ChangeListener) listeners[i + 1]).stateChanged(e);
- }
- }
- }
-
-
- /**
- * 注册状态改变监听
- *
- * @param listener 观察者监听事件
- */
- public void registerChangeListener(UIObserverListener listener) {
- uiObserverListener = listener;
- }
-
- /**
- * 是否需要响应监听
- *
- * @return 是否响应
- */
- public boolean shouldResponseChangeListener() {
- return true;
- }
-
- /**
- * 注册监听
- *
- * @param listener 观察者监听事件
- */
- public void registerNameListener(GlobalNameListener listener) {
- globalNameListener = listener;
- }
-
- /**
- * 是否需要相应
- *
- * @return 是否响应
- */
- public boolean shouldResponseNameListener() {
- return true;
- }
-
- /**
- * 主函数
- *
- * @param args 参数
- */
- public static void main(String... args) {
- LayoutManager layoutManager = null;
- JFrame jf = new JFrame("test");
- jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- JPanel content = (JPanel) jf.getContentPane();
- content.setLayout(layoutManager);
-
- UIColorButton bb = new UIColorButton(UIConstants.FONT_ICON);
- bb.setBounds(20, 20, bb.getPreferredSize().width, bb.getPreferredSize().height);
- content.add(bb);
- GUICoreUtils.centerWindow(jf);
- jf.setSize(400, 400);
- jf.setVisible(true);
- }
+ public static final int SIZE = 16;
+ public static final int SIZE_2 = 2;
+ public static final int SIZE_4 = 4;
+ public static final int SIZE_6 = 6;
+ private static final int POPUP_MENU_SHIFT = -70;
+ private Color color = Color.BLACK;
+ private ColorControlWindow popupWin;
+ private EventListenerList colorChangeListenerList = new EventListenerList();
+ private boolean isEventBanned = false;
+ private String colorButtonName = "";
+ private UIObserverListener uiObserverListener;
+ private GlobalNameListener globalNameListener = null;
+
+ public UIColorButton() {
+ this(UIConstants.FONT_ICON);
+ }
+
+ public UIColorButton(Icon icon) {
+ super(icon);
+ setUI(getButtonUI());
+ addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ showPopupMenu();
+ }
+ });
+ iniListener();
+ }
+
+ public ColorControlWindow getPopupWin() {
+ return popupWin;
+ }
+
+ public void setPopupWin(ColorControlWindow popupWin) {
+ this.popupWin = popupWin;
+ }
+
+ private void iniListener() {
+ if (shouldResponseChangeListener()) {
+ this.addColorChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ if (uiObserverListener == null) {
+ return;
+ }
+ if (globalNameListener != null && shouldResponseNameListener()) {
+ globalNameListener.setGlobalName(colorButtonName);
+ }
+ uiObserverListener.doChange();
+ }
+ });
+ }
+ }
+
+ private UIButtonUI getButtonUI() {
+ return new UIButtonUI() {
+ @Override
+ protected void paintIcon(Graphics g, JComponent c) {
+ super.paintIcon(g, c);
+ AbstractButton b = (AbstractButton) c;
+ ButtonModel model = b.getModel();
+ if (model.isEnabled()) {
+ g.setColor(UIColorButton.this.getColor());
+ } else {
+ g.setColor(new Color(Utils.filterRGB(UIColorButton.this.getColor().getRGB(), 50)));
+ }
+ g.fillRect((b.getWidth() - SIZE) / SIZE_2, b.getHeight() - SIZE_6, SIZE, SIZE_4);
+ }
+ };
+ }
+
+ public void setEventBanned(boolean isEventBanned) {
+ this.isEventBanned = isEventBanned;
+ }
+
+ public void setGlobalName(String name) {
+ colorButtonName = name;
+ }
+
+ public Color getColor() {
+ return color;
+ }
+
+ public void setColor(Color color) {
+ if (ComparatorUtils.equals(this.color, color)) {
+ return;
+ }
+ Color oldColor = this.color;
+ this.color = color;
+ checkColorChange(oldColor, this.color);
+ }
+
+ protected void checkColorChange(Color oldColor, Color newColor) {
+ hidePopupMenu();
+ fireColorStateChanged();
+ }
+
+ private void showPopupMenu() {
+ if (isEventBanned) {
+ return;
+ }
+
+ if (popupWin != null && popupWin.isVisible()) {
+ hidePopupMenu();
+ return;
+ }
+
+ if (!this.isEnabled()) {
+ return;
+ }
+
+ popupWin = this.getColorControlWindow();
+
+ GUICoreUtils.showPopupMenu(popupWin, this, POPUP_MENU_SHIFT, this.getSize().height);
+ }
+
+ /**
+ * 隐藏popupmenu
+ */
+ public void hidePopupMenu() {
+ if (popupWin != null) {
+ popupWin.setVisible(false);
+ }
+ popupWin = null;
+ repaint();
+ }
+
+ protected ColorControlWindow getColorControlWindow() {
+ //find parant.
+ if (this.popupWin == null) {
+ this.popupWin = new ColorControlWindow(UIColorButton.this) {
+ @Override
+ protected void colorChanged() {
+ UIColorButton.this.setColor(this.getColor());
+ }
+
+ };
+ }
+
+ return popupWin;
+ }
+
+ /**
+ * 添加监听
+ *
+ * @param changeListener 监听列表
+ */
+ public void addColorChangeListener(ChangeListener changeListener) {
+ colorChangeListenerList.add(ChangeListener.class, changeListener);
+ }
+
+ /**
+ * 移除监听
+ * Removes an old ColorChangeListener.
+ *
+ * @param changeListener 监听列表
+ */
+ public void removeColorChangeListener(ChangeListener changeListener) {
+ colorChangeListenerList.remove(ChangeListener.class, changeListener);
+ }
+
+ /**
+ * 颜色状态改变
+ */
+ public void fireColorStateChanged() {
+ Object[] listeners = colorChangeListenerList.getListenerList();
+ ChangeEvent e = null;
+
+ for (int i = listeners.length - 2; i >= 0; i -= 2) {
+ if (listeners[i] == ChangeListener.class) {
+ if (e == null) {
+ e = new ChangeEvent(this);
+ }
+ ((ChangeListener) listeners[i + 1]).stateChanged(e);
+ }
+ }
+ }
+
+
+ /**
+ * 注册状态改变监听
+ *
+ * @param listener 观察者监听事件
+ */
+ public void registerChangeListener(UIObserverListener listener) {
+ uiObserverListener = listener;
+ }
+
+ /**
+ * 是否需要响应监听
+ *
+ * @return 是否响应
+ */
+ public boolean shouldResponseChangeListener() {
+ return true;
+ }
+
+ /**
+ * 注册监听
+ *
+ * @param listener 观察者监听事件
+ */
+ public void registerNameListener(GlobalNameListener listener) {
+ globalNameListener = listener;
+ }
+
+ /**
+ * 是否需要相应
+ *
+ * @return 是否响应
+ */
+ public boolean shouldResponseNameListener() {
+ return true;
+ }
}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java
new file mode 100644
index 000000000..a7dcad008
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java
@@ -0,0 +1,38 @@
+package com.fr.design.gui.ibutton;
+
+import com.fr.chart.base.ChartConstants;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.style.color.ColorControlWindow;
+import com.fr.design.style.color.ColorControlWindowWithAuto;
+import com.fr.general.ComparatorUtils;
+
+import java.awt.Color;
+
+public class UIColorButtonWithAuto extends UIColorButton {
+
+ protected void checkColorChange(Color oldColor, Color newColor) {
+ if (ComparatorUtils.equals(oldColor, ChartConstants.AUTO_FONT_COLOR) && !ComparatorUtils.equals(newColor, ChartConstants.AUTO_FONT_COLOR)) {
+ setIcon(UIConstants.FONT_ICON);
+ }
+
+ if (!ComparatorUtils.equals(oldColor, ChartConstants.AUTO_FONT_COLOR) && ComparatorUtils.equals(newColor, ChartConstants.AUTO_FONT_COLOR)) {
+ setIcon(UIConstants.AUTO_FONT_ICON);
+ }
+
+ super.checkColorChange(oldColor, newColor);
+ }
+
+ protected ColorControlWindow getColorControlWindow() {
+ if (getPopupWin() == null) {
+ ColorControlWindowWithAuto colorControlWindowWithAuto = new ColorControlWindowWithAuto(UIColorButtonWithAuto.this) {
+ protected void colorChanged() {
+ UIColorButtonWithAuto.this.setColor(this.getColor());
+ }
+ };
+
+ setPopupWin(colorControlWindowWithAuto);
+ }
+
+ return getPopupWin();
+ }
+}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UICombinationButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UICombinationButton.java
index 4efd50589..4a24c8de2 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UICombinationButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UICombinationButton.java
@@ -18,11 +18,11 @@ public class UICombinationButton extends JPanel{
protected UIButton rightButton;
protected void leftButtonClickEvent() {
-
+ // 左边按钮点击事件
}
protected void rightButtonClickEvent() {
-
+ // 右边按钮点击事件
}
public UICombinationButton() {
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java
index edbc01340..e21f4c217 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java
@@ -25,7 +25,7 @@ public class UIHeadGroup extends JPanel {
protected int selectedIndex = -1;
protected void tabChanged(int newSelectedIndex) {
-
+ // do nothing
}
public UIHeadGroup(String[] textArray) {
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIPasswordField.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIPasswordField.java
index 8d26b5e87..8963119a0 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIPasswordField.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIPasswordField.java
@@ -1 +1 @@
-package com.fr.design.gui.ibutton;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import javax.swing.*;
/**
* Author : Shockway
* Date: 13-10-21
* Time: 下午3:23
*/
public class UIPasswordField extends JPasswordField implements UIObserver {
public void registerChangeListener(UIObserverListener listener) {
}
public boolean shouldResponseChangeListener() {
return false;
}
}
\ No newline at end of file
+package com.fr.design.gui.ibutton;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import javax.swing.*;
/**
* Author : Shockway
* Date: 13-10-21
* Time: 下午3:23
*/
public class UIPasswordField extends JPasswordField implements UIObserver {
public void registerChangeListener(UIObserverListener listener) {
// do nothing
}
public boolean shouldResponseChangeListener() {
return false;
}
}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIPreviewButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIPreviewButton.java
index a5f9de9b7..50bbc1440 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIPreviewButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIPreviewButton.java
@@ -1 +1 @@
-package com.fr.design.gui.ibutton;
import com.fr.design.constants.UIConstants;
import com.fr.stable.Constants;
import com.fr.design.utils.gui.GUICoreUtils;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
/**
* Author : daisy
* Date: 13-8-1
* Time: 下午3:41
*/
public class UIPreviewButton extends JPanel {
private static final int START_X = -7;
protected UIButton upButton;
protected UIButton downButton;
protected void upButtonClickEvent() {
}
protected void downButtonClickEvent() {
}
public UIPreviewButton() {
this(new UIButton(), new UIButton());
}
public UIPreviewButton(UIButton up, UIButton down) {
upButton = up;
downButton = down;
upButton.setRoundBorder(true, Constants.CENTER);
downButton.setRoundBorder(true, Constants.CENTER);
upButton.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
downButton.getModel().setPressed(true);
downButton.getModel().setSelected(true);
downButton.repaint();
}
@Override
public void mouseReleased(MouseEvent e) {
downButton.getModel().setPressed(false);
downButton.getModel().setSelected(false);
downButton.repaint();
}
@Override
public void mouseClicked(MouseEvent e) {
upButtonClickEvent();
}
});
downButton.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
upButton.getModel().setPressed(true);
upButton.getModel().setSelected(true);
upButton.repaint();
}
@Override
public void mouseReleased(MouseEvent e) {
upButton.getModel().setPressed(false);
upButton.getModel().setSelected(false);
upButton.repaint();
}
@Override
public void mouseClicked(MouseEvent e) {
downButtonClickEvent();
}
});
this.setLayout(new FlowLayout(FlowLayout.CENTER,5,0));
this.add(upButton);
this.add(downButton);
}
public UIPreviewButton(Icon left, Icon right) {
this();
upButton.setIcon(left);
downButton.setIcon(right);
}
public UIButton getUpButton() {
return upButton;
}
public void setExtraPainted(boolean isExtraPainted) {
if (!isExtraPainted) {
upButton.setBackground(null);
downButton.setBackground(null);
upButton.setOpaque(false);
downButton.setOpaque(false);
}
}
public UIButton getDownButton() {
return downButton;
}
public void set4Toolbar() {
upButton.setNormalPainted(false);
downButton.setNormalPainted(false);
upButton.setBorderPaintedOnlyWhenPressed(true);
downButton.setBorderPaintedOnlyWhenPressed(true);
}
protected void showPopWindow(JPopupMenu menu) {
GUICoreUtils.showPopupMenu(menu, this, START_X, getY() + getHeight() - 3);
}
public static void main(String... args) {
JFrame jf = new JFrame("test");
jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
JPanel content = (JPanel) jf.getContentPane();
content.setLayout(null);
UIPreviewButton bb = new UIPreviewButton(UIConstants.PAGE_BIG_ICON, UIConstants.PREVIEW_DOWN);
bb.setBounds(20, 20, bb.getPreferredSize().width, bb.getPreferredSize().height);
content.add(bb);
GUICoreUtils.centerWindow(jf);
jf.setSize(100, 100);
jf.setVisible(true);
}
}
\ No newline at end of file
+package com.fr.design.gui.ibutton;
import com.fr.design.constants.UIConstants;
import com.fr.stable.Constants;
import com.fr.design.utils.gui.GUICoreUtils;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
/**
* Author : daisy
* Date: 13-8-1
* Time: 下午3:41
*/
public class UIPreviewButton extends JPanel {
private static final int START_X = -7;
protected UIButton upButton;
protected UIButton downButton;
protected void upButtonClickEvent() {
// do nothing
}
protected void downButtonClickEvent() {
// do nothing
}
public UIPreviewButton() {
this(new UIButton(), new UIButton());
}
public UIPreviewButton(UIButton up, UIButton down) {
upButton = up;
downButton = down;
upButton.setRoundBorder(true, Constants.CENTER);
downButton.setRoundBorder(true, Constants.CENTER);
upButton.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
downButton.getModel().setPressed(true);
downButton.getModel().setSelected(true);
downButton.repaint();
}
@Override
public void mouseReleased(MouseEvent e) {
downButton.getModel().setPressed(false);
downButton.getModel().setSelected(false);
downButton.repaint();
}
@Override
public void mouseClicked(MouseEvent e) {
upButtonClickEvent();
}
});
downButton.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
upButton.getModel().setPressed(true);
upButton.getModel().setSelected(true);
upButton.repaint();
}
@Override
public void mouseReleased(MouseEvent e) {
upButton.getModel().setPressed(false);
upButton.getModel().setSelected(false);
upButton.repaint();
}
@Override
public void mouseClicked(MouseEvent e) {
downButtonClickEvent();
}
});
this.setLayout(new FlowLayout(FlowLayout.CENTER,5,0));
this.add(upButton);
this.add(downButton);
}
public UIPreviewButton(Icon left, Icon right) {
this();
upButton.setIcon(left);
downButton.setIcon(right);
}
public UIButton getUpButton() {
return upButton;
}
public void setExtraPainted(boolean isExtraPainted) {
if (!isExtraPainted) {
upButton.setBackground(null);
downButton.setBackground(null);
upButton.setOpaque(false);
downButton.setOpaque(false);
}
}
public UIButton getDownButton() {
return downButton;
}
public void set4Toolbar() {
upButton.setNormalPainted(false);
downButton.setNormalPainted(false);
upButton.setBorderPaintedOnlyWhenPressed(true);
downButton.setBorderPaintedOnlyWhenPressed(true);
}
protected void showPopWindow(JPopupMenu menu) {
GUICoreUtils.showPopupMenu(menu, this, START_X, getY() + getHeight() - 3);
}
public static void main(String... args) {
JFrame jf = new JFrame("test");
jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
JPanel content = (JPanel) jf.getContentPane();
content.setLayout(null);
UIPreviewButton bb = new UIPreviewButton(UIConstants.PAGE_BIG_ICON, UIConstants.PREVIEW_DOWN);
bb.setBounds(20, 20, bb.getPreferredSize().width, bb.getPreferredSize().height);
content.add(bb);
GUICoreUtils.centerWindow(jf);
jf.setSize(100, 100);
jf.setVisible(true);
}
}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIRadioButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIRadioButton.java
index 0752eef4d..1c2aef38a 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIRadioButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIRadioButton.java
@@ -25,36 +25,43 @@ public class UIRadioButton extends JRadioButton implements UIObserver, GlobalNam
public UIRadioButton() {
super();
initListener();
+ initComponent();
}
public UIRadioButton(Icon icon) {
super(icon);
initListener();
+ initComponent();
}
public UIRadioButton(Action a) {
super(a);
initListener();
+ initComponent();
}
public UIRadioButton(Icon icon, boolean selected) {
super(icon, selected);
initListener();
+ initComponent();
}
public UIRadioButton(String text) {
super(text);
initListener();
+ initComponent();
}
public UIRadioButton(String text, boolean selected) {
super(text, selected);
initListener();
+ initComponent();
}
public UIRadioButton(String text, Icon icon) {
super(text, icon);
initListener();
+ initComponent();
}
@@ -81,6 +88,10 @@ public class UIRadioButton extends JRadioButton implements UIObserver, GlobalNam
}
}
+ private void initComponent() {
+ this.setFocusPainted(false);
+ }
+
/**
* 给组件登记一个观察者监听事件
*
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UISliderButtonUI.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UISliderButtonUI.java
index 6a92f5057..6b406588b 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UISliderButtonUI.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UISliderButtonUI.java
@@ -176,11 +176,11 @@ public class UISliderButtonUI extends BasicButtonUI {
private void fillNormal(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection, boolean isAuthorityEdited, boolean isPressedPainted) {
GradientPaint gp;
if (DesignerMode.isAuthorityEditing() && isAuthorityEdited) {
- gp = new GradientPaint(1, 1, UIConstants.AUTHORITY_BLUE, 1, height - 1f, UIConstants.AUTHORITY_DARK_BLUE);
+ gp = new GradientPaint(1, 1, UIConstants.AUTHORITY_BLUE, 1, height - 1F, UIConstants.AUTHORITY_DARK_BLUE);
} else if (isPressedPainted) {
- gp = new GradientPaint(1, 1, UIConstants.SELECT_TAB, 1, height - 1, UIConstants.SELECT_TAB);
+ gp = new GradientPaint(1, 1, UIConstants.SELECT_TAB, 1, height - 1F, UIConstants.SELECT_TAB);
}else{
- gp = new GradientPaint(1, 1, UIConstants.POP_DIALOG_BORDER, 1, height - 1, UIConstants.POP_DIALOG_BORDER);
+ gp = new GradientPaint(1, 1, UIConstants.POP_DIALOG_BORDER, 1, height - 1F, UIConstants.POP_DIALOG_BORDER);
}
fillPaint(g2d, x, y, width, height, isRound, rectDirection, gp, UIConstants.ARC);
@@ -189,11 +189,11 @@ public class UISliderButtonUI extends BasicButtonUI {
private void fillRollOver(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection, boolean isAuthorityEdited, boolean isPressedPainted) {
GradientPaint gp;
if (DesignerMode.isAuthorityEditing() && isAuthorityEdited) {
- gp = new GradientPaint(1, 1, UIConstants.AUTHORITY_BLUE, 1, height - 1, UIConstants.HOVER_BLUE);
+ gp = new GradientPaint(1, 1, UIConstants.AUTHORITY_BLUE, 1, height - 1F, UIConstants.HOVER_BLUE);
} else if (isPressedPainted) {
- gp = new GradientPaint(1, 1, UIConstants.POP_DIALOG_BORDER, 1, height - 1, UIConstants.POP_DIALOG_BORDER);
+ gp = new GradientPaint(1, 1, UIConstants.POP_DIALOG_BORDER, 1, height - 1F, UIConstants.POP_DIALOG_BORDER);
}else {
- gp = new GradientPaint(1, 1, UIConstants.POP_DIALOG_BORDER, 1, height - 1, UIConstants.POP_DIALOG_BORDER);
+ gp = new GradientPaint(1, 1, UIConstants.POP_DIALOG_BORDER, 1, height - 1F, UIConstants.POP_DIALOG_BORDER);
}
fillPaint(g2d, x, y, width, height, isRound, rectDirection, gp, UIConstants.ARC);
}
@@ -225,4 +225,4 @@ public class UISliderButtonUI extends BasicButtonUI {
g2d.setColor(oldColor);
}
-}
\ No newline at end of file
+}
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UITabButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UITabButton.java
index 4e50dd994..aa5c34f60 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UITabButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UITabButton.java
@@ -162,12 +162,12 @@ public class UITabButton extends UILabel implements UISelectedComponent {
Color blue = UIConstants.LIGHT_BLUE;
g2d.setColor(blue);
g2d.fillRect(0, 1, w - 1, h / 2);
- GradientPaint gp = new GradientPaint(1, 1, UIConstants.OCEAN_BLUE, 1, h - 1, blue);
+ GradientPaint gp = new GradientPaint(1, 1, UIConstants.OCEAN_BLUE, 1, h - 1F, blue);
g2d.setPaint(gp);
g2d.fillRect(0, h / 2, w - 1, h / 2);
this.setForeground(UIConstants.FONT_COLOR);
} else if (!isSelected() && !isRollover) {
- GradientPaint gp = new GradientPaint(1, 1, TOP, 1, h - 1, DOWN);
+ GradientPaint gp = new GradientPaint(1, 1, TOP, 1, h - 1F, DOWN);
g2d.setPaint(gp);
g2d.fillRect(0, h / 2, w - 1, h / 2);
this.setForeground(UIConstants.FONT_COLOR);
@@ -175,7 +175,7 @@ public class UITabButton extends UILabel implements UISelectedComponent {
}
protected void paintOther(Graphics2D g2d, int w, int h) {
-
+ // do nothing
}
-}
\ No newline at end of file
+}
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIToggleButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIToggleButton.java
index 45c878419..dc380c0c9 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIToggleButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIToggleButton.java
@@ -187,7 +187,7 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{
@Override
protected void fireStateChanged() {
-
+ // do nothing
}
@@ -220,7 +220,7 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{
protected void paintOtherBorder(Graphics g) {
Graphics2D g2d = (Graphics2D) g;
g2d.setStroke(UIConstants.BS);
- Shape shape = new RoundRectangle2D.Float(0.5f, 0.5f, getWidth() - 1, getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
+ Shape shape = new RoundRectangle2D.Float(0.5f, 0.5f, getWidth() - 1F, getHeight() - 1F, UIConstants.ARC, UIConstants.ARC);
g2d.setColor(UIConstants.LINE_COLOR);
g2d.draw(shape);
}
@@ -252,4 +252,4 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{
return true;
}
-}
\ No newline at end of file
+}
diff --git a/designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java b/designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java
index 10ea06a8c..379274b90 100644
--- a/designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java
@@ -59,24 +59,28 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser
initListener();
}
- private void initListener() {
+ protected void initListener() {
if (shouldResponseChangeListener()) {
this.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
- if (uiObserverListener == null) {
- return;
- }
- if (globalNameListener != null && shouldResponseNameListener()) {
- globalNameListener.setGlobalName(checkboxName);
- }
- uiObserverListener.doChange();
+ attributeChange();
}
});
}
}
+ protected void attributeChange() {
+ if (uiObserverListener == null) {
+ return;
+ }
+ if (globalNameListener != null && shouldResponseNameListener()) {
+ globalNameListener.setGlobalName(checkboxName);
+ }
+ uiObserverListener.doChange();
+ }
+
/**
* 给组件登记一个观察者监听事件
*
diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/ComboCheckBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/ComboCheckBox.java
index 31290d6b0..3a0be4a8f 100644
--- a/designer-base/src/main/java/com/fr/design/gui/icombobox/ComboCheckBox.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/ComboCheckBox.java
@@ -77,8 +77,8 @@ public class ComboCheckBox extends UIComboBox {
protected ComboCheckBox comboBox;
protected JScrollPane scrollPane;
- protected MouseListener mouseListener;
- protected MouseMotionListener mouseMotionListener;
+ protected MouseListener checkListMouseListener;
+ protected MouseMotionListener checkListMouseMotionListener;
public CheckListPopup(JComboBox comboBox) {
this.comboBox = (ComboCheckBox) comboBox;
@@ -157,22 +157,22 @@ public class ComboCheckBox extends UIComboBox {
@Override
public MouseListener getMouseListener() {
- if (mouseListener == null) {
- mouseListener = new InvocationMouseHandler();
+ if (checkListMouseListener == null) {
+ checkListMouseListener = new InvocationMouseHandler();
}
- return mouseListener;
+ return checkListMouseListener;
}
public MouseMotionListener getMouseMotionListener() {
- if (mouseMotionListener == null) {
- mouseMotionListener = new MouseMotionAdapter() {
+ if (checkListMouseMotionListener == null) {
+ checkListMouseMotionListener = new MouseMotionAdapter() {
};
}
- return mouseMotionListener;
+ return checkListMouseMotionListener;
}
public void uninstallingUI() {
-
+ // do nothing
}
protected class InvocationMouseHandler extends MouseAdapter {
diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/FRTreeComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/FRTreeComboBox.java
index ae2e6b52d..a7a913335 100644
--- a/designer-base/src/main/java/com/fr/design/gui/icombobox/FRTreeComboBox.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/FRTreeComboBox.java
@@ -1,22 +1,14 @@
package com.fr.design.gui.icombobox;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.IllegalComponentStateException;
-import java.awt.RenderingHints;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionAdapter;
-import java.awt.event.MouseMotionListener;
-import java.util.Enumeration;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.NameObject;
+import com.fr.stable.Constants;
+import com.fr.stable.StringUtils;
import javax.swing.BorderFactory;
import javax.swing.DefaultListCellRenderer;
@@ -38,16 +30,23 @@ import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeCellRenderer;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
-
-import com.fr.design.constants.UIConstants;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.itextfield.UITextField;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.general.ComparatorUtils;
-import com.fr.general.NameObject;
-import com.fr.stable.Constants;
-import com.fr.stable.StringUtils;
+import java.util.Enumeration;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.IllegalComponentStateException;
+import java.awt.RenderingHints;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseMotionListener;
public class FRTreeComboBox extends UIComboBox {
@@ -79,7 +78,7 @@ public class FRTreeComboBox extends UIComboBox {
boolean showRoot, boolean editable) {
this.setTree(tree);
this.tree.setCellRenderer(renderer);
- this.setEditor(new FrTreeSearchComboBoxEditor(this));
+ this.setEditor(createEditor());
if (!showRoot) {
tree.expandPath(new TreePath(tree.getModel().getRoot()));
tree.setRootVisible(false);
@@ -101,6 +100,10 @@ public class FRTreeComboBox extends UIComboBox {
return true;
}
+ protected UIComboBoxEditor createEditor() {
+ return new FrTreeSearchComboBoxEditor(this);
+ }
+
public void setTree(JTree tree) {
this.tree = tree;
if (tree != null) {
@@ -318,6 +321,7 @@ public class FRTreeComboBox extends UIComboBox {
@Override
public void mouseClicked(MouseEvent e) {
+ // do nothing
}
@Override
@@ -528,7 +532,7 @@ public class FRTreeComboBox extends UIComboBox {
}
}
- class FrTreeSearchComboBoxEditor extends UIComboBoxEditor implements DocumentListener {
+ public class FrTreeSearchComboBoxEditor extends UIComboBoxEditor implements DocumentListener {
private volatile boolean setting = false;
private FRTreeComboBox comboBox;
private Object item;
diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java
index 74cd42a7e..ca4eddfe3 100644
--- a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java
@@ -3,6 +3,11 @@
*/
package com.fr.design.gui.icombobox;
+import com.fr.base.FRContext;
+import com.fr.base.GraphHelper;
+import com.fr.base.ScreenResolution;
+import com.fr.general.FRFont;
+import com.fr.stable.Constants;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
@@ -11,18 +16,10 @@ import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.geom.GeneralPath;
import java.awt.geom.Point2D;
-
import javax.swing.DefaultComboBoxModel;
import javax.swing.JLabel;
import javax.swing.JList;
-import com.fr.base.FRContext;
-import com.fr.base.GraphHelper;
-import com.fr.base.ScreenResolution;
-import com.fr.general.FRFont;
-
-import com.fr.stable.Constants;
-
/**
* Combobox for selecting line styles.
@@ -88,13 +85,13 @@ public class LineComboBox extends UIComboBox {
FontMetrics fm = GraphHelper.getFontMetrics(rfont);
if (style == Constants.LINE_NONE) {
//draw "none" string
- GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent());
+ GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), 4, (d.height - fm.getHeight()) / 2D + fm.getAscent());
} else {
- GraphHelper.drawLine(g2d, 4, d.height / 2, d.width - 8, d.height / 2, style);
+ GraphHelper.drawLine(g2d, 4, d.height / 2D, d.width - 8D, d.height / 2D, style);
}
if(isShowAxisWithLineStyle()) { // 带有坐标轴箭头的样式.
- drawArrow(g2d, new Point2D.Double(4, d.height / 2), new Point2D.Double(d.width - 8, d.height/2));
+ drawArrow(g2d, new Point2D.Double(4, d.height / 2D), new Point2D.Double(d.width - 8D, d.height / 2D));
}
}
@@ -142,4 +139,4 @@ public class LineComboBox extends UIComboBox {
private int style = Constants.LINE_NONE;
}
-}
\ No newline at end of file
+}
diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxButton.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxButton.java
index 9f96f655e..6130050dc 100644
--- a/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxButton.java
@@ -172,11 +172,9 @@ public class UIComboBoxButton extends JButton {
}
c.setBackground(UIManager.getColor("ComboBox.focusBackground"));
if (c instanceof JComponent) {
- mustResetOpaque = true;
JComponent jc = (JComponent) c;
- savedOpaque = jc.isOpaque();
+ jc.isOpaque();
jc.setOpaque(true);
- paintFocus = true;
}
} else {
c.setForeground(comboBox.getForeground());
diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java
index 1513eb6e9..2a5c29d8c 100644
--- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java
@@ -1,12 +1,11 @@
package com.fr.design.gui.icontainer;
-import com.fr.base.BaseUtils;
-import com.fr.base.vcs.DesignerMode;
+
+import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.stable.Constants;
import javax.swing.*;
import java.awt.*;
@@ -174,6 +173,7 @@ public class UIEastResizableContainer extends JPanel {
@Override
public void addLayoutComponent(String name, Component comp) {
+ // do nothing
}
};
@@ -238,6 +238,7 @@ public class UIEastResizableContainer extends JPanel {
* 伸缩右子面板时，触发此方法
*/
public void onResize() {
+ // do nothing here
}
private class TopToolPane extends JPanel {
@@ -261,6 +262,7 @@ public class UIEastResizableContainer extends JPanel {
@Override
public void mouseDragged(MouseEvent e) {
+ // do nothing
}
});
addMouseListener(new MouseAdapter() {
@@ -282,7 +284,7 @@ public class UIEastResizableContainer extends JPanel {
}
onResize();
refreshContainer();
- if (DesignerMode.isAuthorityEditing()) {
+ if (DesignModeContext.isAuthorityEditing()) {
DesignerContext.getDesignerFrame().doResize();
}
}
diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java
index eadb94109..a589b0c87 100644
--- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java
@@ -1,6 +1,7 @@
package com.fr.design.gui.icontainer;
import com.fr.base.vcs.DesignerMode;
+import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel;
@@ -46,7 +47,7 @@ public class UIModeControlContainer extends JLayeredPane {
private boolean isHideMode = false;
private boolean isSheeetCovered = false;
- private AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 30 / 100.0F);
+ private AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f);
public UIModeControlContainer() {
this(new JPanel(), new JPanel());
@@ -85,7 +86,7 @@ public class UIModeControlContainer extends JLayeredPane {
public void needToShowCoverAndHidPane() {
- if (DesignerMode.isAuthorityEditing()) {
+ if (DesignModeContext.isAuthorityEditing()) {
this.remove(coverPane);
this.remove(hidePane);
} else {
@@ -128,7 +129,7 @@ public class UIModeControlContainer extends JLayeredPane {
if (isHideMode || !upEditMode) {
return;
}
- if (DesignerMode.isAuthorityEditing()) {
+ if (DesignModeContext.isAuthorityEditing()) {
return;
}
setCursor(Cursor.getPredefinedCursor(Cursor.N_RESIZE_CURSOR));
@@ -151,11 +152,12 @@ public class UIModeControlContainer extends JLayeredPane {
MouseMotionListener mouseMotionListener = new MouseMotionListener() {
@Override
public void mouseMoved(MouseEvent e) {
+ //do nothing
}
@Override
public void mouseDragged(MouseEvent e) {
- if (DesignerMode.isAuthorityEditing()) {
+ if (DesignModeContext.isAuthorityEditing()) {
return;
}
boolean notUpEditMode = isHideMode || !upEditMode;
@@ -174,7 +176,7 @@ public class UIModeControlContainer extends JLayeredPane {
@Override
public void removeLayoutComponent(Component comp) {
-
+ //do nothing
}
@Override
@@ -234,11 +236,12 @@ public class UIModeControlContainer extends JLayeredPane {
@Override
public void addLayoutComponent(String name, Component comp) {
+ // do nothing
}
};
protected void onModeChanged() {
-
+ //do nothing here
}
/**
@@ -309,7 +312,7 @@ public class UIModeControlContainer extends JLayeredPane {
addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
-
+ // do nothing
}
});
}
@@ -319,6 +322,7 @@ public class UIModeControlContainer extends JLayeredPane {
@Override
public void removeLayoutComponent(Component comp) {
+ // do nothing
}
@Override
@@ -333,10 +337,12 @@ public class UIModeControlContainer extends JLayeredPane {
@Override
public void layoutContainer(Container parent) {
+ // do nothing
}
@Override
public void addLayoutComponent(String name, Component comp) {
+ // do nothing
}
};
@@ -366,7 +372,7 @@ public class UIModeControlContainer extends JLayeredPane {
addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
-
+ // do nothing
}
});
@@ -407,6 +413,7 @@ public class UIModeControlContainer extends JLayeredPane {
@Override
public void removeLayoutComponent(Component comp) {
+ // do nothing
}
@Override
@@ -437,6 +444,7 @@ public class UIModeControlContainer extends JLayeredPane {
@Override
public void addLayoutComponent(String name, Component comp) {
+ // do nothing
}
};
diff --git a/designer-base/src/main/java/com/fr/design/gui/ilable/ActionLabel.java b/designer-base/src/main/java/com/fr/design/gui/ilable/ActionLabel.java
index 432628f0f..ebccd24f4 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ilable/ActionLabel.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ilable/ActionLabel.java
@@ -1,5 +1,6 @@
package com.fr.design.gui.ilable;
+import javax.swing.event.MouseInputAdapter;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.Graphics;
@@ -7,9 +8,6 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
-import com.fr.design.gui.ilable.UILabel;
-import javax.swing.event.MouseInputAdapter;
-
/**
* Action label
*/
@@ -31,6 +29,7 @@ public class ActionLabel extends UILabel {
/**
* Repaints the text.
*/
+ @Override
public void paintComponent(Graphics _gfx) {
super.paintComponent(_gfx);
@@ -39,12 +38,17 @@ public class ActionLabel extends UILabel {
}
private MouseInputAdapter mouseInputAdapter = new MouseInputAdapter() {
+ @Override
public void mouseClicked(MouseEvent e) {
+ //do nothing
}
+ @Override
public void mousePressed(MouseEvent e) {
+ //do nothing
}
+ @Override
public void mouseReleased(MouseEvent evt) {
Object source = evt.getSource();
@@ -65,6 +69,7 @@ public class ActionLabel extends UILabel {
}
}
+ @Override
public void mouseExited(MouseEvent evt) {
Object source = evt.getSource();
@@ -73,6 +78,7 @@ public class ActionLabel extends UILabel {
}
}
+ @Override
public void mouseDragged(MouseEvent e) {
}
diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIBasicMenuItemUI.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIBasicMenuItemUI.java
index 844120c51..a14de81c5 100644
--- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIBasicMenuItemUI.java
+++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIBasicMenuItemUI.java
@@ -287,7 +287,7 @@ public class UIBasicMenuItemUI extends MenuItemUI {
View v = (View) c.getClientProperty(BasicHTML.propertyKey);
if (v != null) {
d = getPreferredSize(c);
- d.width -= v.getPreferredSpan(View.X_AXIS) - v.getMinimumSpan(View.X_AXIS);
+ d.width -= (double) v.getPreferredSpan(View.X_AXIS) - (double) v.getMinimumSpan(View.X_AXIS);
}
return d;
}
@@ -345,7 +345,7 @@ public class UIBasicMenuItemUI extends MenuItemUI {
View v = (View) c.getClientProperty(BasicHTML.propertyKey);
if (v != null) {
d = getPreferredSize(c);
- d.width += v.getMaximumSpan(View.X_AXIS) - v.getPreferredSpan(View.X_AXIS);
+ d.width += (double) v.getMaximumSpan(View.X_AXIS) - (double) v.getPreferredSpan(View.X_AXIS);
}
return d;
}
@@ -816,7 +816,6 @@ public class UIBasicMenuItemUI extends MenuItemUI {
// get Accelerator text
KeyStroke accelerator = b.getAccelerator();
String acceleratorText = "";
- drawMenu(acceleratorText, accelerator, c, ic, maxValue, offset, paintIcon, b);
String text = layoutMenuItem(fm, b.getText(), fmAccel, acceleratorText, ic, null,
arrowIcon, b.getVerticalAlignment(), b.getHorizontalAlignment(),
b.getVerticalTextPosition(), b.getHorizontalTextPosition(), viewRect,
@@ -834,43 +833,6 @@ public class UIBasicMenuItemUI extends MenuItemUI {
g.setFont(holdf);
}
- private void drawMenu(String acceleratorText, KeyStroke accelerator, JComponent c,
- Icon ic, int maxValue, int offset, Icon paintIcon, JMenuItem b) {
- if (accelerator != null) {
- int modifiers = accelerator.getModifiers();
- if (modifiers > 0) {
- acceleratorText = KeyEvent.getKeyModifiersText(modifiers);
- //acceleratorText += "-";
- acceleratorText += acceleratorDelimiter;
- }
-
- int keyCode = accelerator.getKeyCode();
- if (keyCode != 0) {
- acceleratorText += KeyEvent.getKeyText(keyCode);
- } else {
- acceleratorText += accelerator.getKeyChar();
- }
- }
- if (!isTopLevelMenu()) {
- if (c instanceof JCheckBoxMenuItem || c instanceof JRadioButtonMenuItem) {
- ic = checkIcon;
- if (checkIcon.getIconWidth() < maxValue) {
- ic = new EmptyIcon(maxValue, checkIcon.getIconHeight());
- offset = (maxValue - checkIcon.getIconWidth()) / 2;
- }
- paintIcon = null;
- } else if (c instanceof JMenuItem) {
- if (ic == null || ic.getIconWidth() < maxValue) {
- int height = (ic == null) ? 2 : b.getIcon().getIconHeight();
- int width = (ic == null) ? 2 : b.getIcon().getIconWidth();
- offset = (maxValue - width) / 2;
- ic = new EmptyIcon(maxValue, height);
- }
- }
- }
- }
-
-
private void drawAccText(String acceleratorText, Graphics g, JComponent p, ButtonModel model, FontMetrics fmAccel, JComponent c) {
if (acceleratorText != null && !ComparatorUtils.equals(acceleratorText, "")) {
//Get the maxAccWidth from the parent to calculate the offset.
diff --git a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java
index d950e91ed..938e0cacc 100644
--- a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java
+++ b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java
@@ -157,8 +157,7 @@ public class UIMenuTable extends JTable {
@Override
public TableCellRenderer getDefaultRenderer(Class columnClass) {
- columnClass = UITable.class;
- return super.getDefaultRenderer(columnClass);
+ return super.getDefaultRenderer(UITable.class);
}
private class UITableRender implements TableCellRenderer {
diff --git a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java
index 8dc90f10b..32b33cbab 100644
--- a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java
+++ b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java
@@ -10,6 +10,7 @@ import javax.swing.event.MouseInputListener;
import com.fr.base.GraphHelper;
import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.itable.UITableUI;
import com.fr.design.mainframe.DesignerContext;
@@ -74,7 +75,7 @@ public class UIMenuTableUI extends UITableUI{
@Override
public void mousePressed(MouseEvent e) {
if (e.getX() >= table.getWidth() - 20) {
- int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
+ int val = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (val == JOptionPane.OK_OPTION) {
uiTable.removeLine(table.rowAtPoint(e.getPoint()));
diff --git a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/UIProgressBorder.java b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/UIProgressBorder.java
index c4df50e82..30074f563 100644
--- a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/UIProgressBorder.java
+++ b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/UIProgressBorder.java
@@ -72,6 +72,7 @@ public class UIProgressBorder extends UIRoundedBorder {
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
}
+ @SuppressWarnings("squid:S2164")
private void paintBorderShadow(Graphics2D g2, int shadowWidth, int x, int y, int width, int height) {
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
shadowWidth = Math.max(shadowWidth, 2);
@@ -85,6 +86,7 @@ public class UIProgressBorder extends UIRoundedBorder {
}
}
+ @SuppressWarnings("squid:S2164")
private static Color getMixedColor(Color c1, float pct1, Color c2, float pct2) {
float[] clr1 = c1.getComponents(null);
float[] clr2 = c2.getComponents(null);
diff --git a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIBasicScrollBarUI.java b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIBasicScrollBarUI.java
index 851f90797..821ebbc33 100644
--- a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIBasicScrollBarUI.java
+++ b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIBasicScrollBarUI.java
@@ -165,50 +165,6 @@ public class UIBasicScrollBarUI extends BasicScrollBarUI {
// drawColorAndLength(g, t, x2, y2, color);
}
- private void drawColorAndLength(Graphics g, Rectangle t, int x2, int y2, Color color) {
-
- if (scrollbar.getOrientation() == JScrollBar.VERTICAL) {
- int y1 = t.y + (t.height) / 2 - 4;
- y2 = Math.min(y1 + 8, t.y + t.height - 5);
-
- int y = y1;
- // we take only saturation & brightness and apply them
- // to the background color (normal/rollover/pressed)
- g.setColor(UISBChooser.getAdjustedColor(color, 0, 71));
- while (y < y2) {
- g.drawLine(5, y, 11, y);
- y += 2;
- }
-
- y = y1 + 1;
- g.setColor(UISBChooser.getAdjustedColor(color, 0, -13));
- while (y < y2) {
- g.drawLine(6, y, 12, y);
- y += 2;
- }
- } else {
- int x1 = t.x + (t.width) / 2 - 4;
- x2 = Math.min(x1 + 8, t.x + t.width - 5);
-
- int x = x1 + 1;
- // we take only saturation & brightness and apply them
- // to the background color (normal/rollover/pressed)
- g.setColor(UISBChooser.getAdjustedColor(color, 0, 71));
- while (x < x2) {
- g.drawLine(x, 5, x, 11);
- x += 2;
- }
-
- x = x1;
- g.setColor(UISBChooser.getAdjustedColor(color, 0, -13));
- while (x < x2) {
- g.drawLine(x, 6, x, 12);
- x += 2;
- }
- }
- }
-
-
private void drawVertical(Graphics g, Rectangle t, int xs, int ys, int x2,
Color pressedColor, Color rolloverColor,
Color normalColor) {
diff --git a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java
index a6ba74283..c780eeb2d 100644
--- a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java
+++ b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java
@@ -90,6 +90,7 @@ public class UISBChooser extends JDialog {
(frame.getHeight() - getSize().height) / 2);
}
+ @SuppressWarnings("squid:S1226")
private void initP3(JPanel p3, JPanel p1) {
p3 = new JPanel(new FlowLayout(FlowLayout.LEFT, 3, 8));
p3.add(new JLabel("R:"));
@@ -198,6 +199,7 @@ public class UISBChooser extends JDialog {
twoColorField.setUpperColor(outColor);
}
+ @SuppressWarnings("squid:S2164")
public static Color getAdjustedColor(Color inColor, int sat, int bri) {
Color briColor = inColor;
@@ -219,9 +221,9 @@ public class UISBChooser extends JDialog {
int dg = briColor.getGreen() - satColor.getGreen();
int db = briColor.getBlue() - satColor.getBlue();
- r = briColor.getRed() - (int) Math.round(dr * sat / VALUE * 1.0);
- g = briColor.getGreen() - (int) Math.round(dg * sat / VALUE * 1.0);
- b = briColor.getBlue() - (int) Math.round(db * sat / VALUE * 1.0);
+ r = briColor.getRed() - (int) Math.round(dr * sat / (VALUE * 1.0));
+ g = briColor.getGreen() - (int) Math.round(dg * sat / (VALUE * 1.0));
+ b = briColor.getBlue() - (int) Math.round(db * sat / (VALUE * 1.0));
} else {
float d = ColorRoutines.getGreyValue(briColor);
float dr = briColor.getRed() - d;
diff --git a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIScrollBarUI.java b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIScrollBarUI.java
index d3393054a..949b3958a 100644
--- a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIScrollBarUI.java
+++ b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIScrollBarUI.java
@@ -2,6 +2,25 @@ package com.fr.design.gui.iscrollbar;
import com.fr.design.constants.UIConstants;
import com.fr.stable.StringUtils;
+import sun.swing.DefaultLookup;
+
+import javax.swing.BoundedRangeModel;
+import javax.swing.InputMap;
+import javax.swing.JComponent;
+import javax.swing.JList;
+import javax.swing.JScrollBar;
+import javax.swing.JScrollPane;
+import javax.swing.JViewport;
+import javax.swing.LookAndFeel;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+import javax.swing.UIManager;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.ScrollBarUI;
+import javax.swing.plaf.UIResource;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
@@ -22,24 +41,6 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import javax.swing.BoundedRangeModel;
-import javax.swing.InputMap;
-import javax.swing.JComponent;
-import javax.swing.JList;
-import javax.swing.JScrollBar;
-import javax.swing.JScrollPane;
-import javax.swing.JViewport;
-import javax.swing.LookAndFeel;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.Timer;
-import javax.swing.UIManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.ScrollBarUI;
-import javax.swing.plaf.UIResource;
-import sun.swing.DefaultLookup;
/**
* Like BasicScrollBarUI,but without two buttons
@@ -590,6 +591,7 @@ public class UIScrollBarUI extends ScrollBarUI implements LayoutManager, SwingCo
* will cause a repaint.
*/
+ @SuppressWarnings("squid:S2164")
protected void layoutVScrollbar(JScrollBar sb) {
Dimension sbSize = sb.getSize();
Insets sbInsets = sb.getInsets();
@@ -672,6 +674,7 @@ public class UIScrollBarUI extends ScrollBarUI implements LayoutManager, SwingCo
* Make sure the thumb fits between the buttons. Note that setting the
* thumbs bounds causes a repaint.
*/
+ @SuppressWarnings("squid:S2164")
protected void layoutHScrollbar(JScrollBar sb) {
Dimension sbSize = sb.getSize();
Insets sbInsets = sb.getInsets();
@@ -1080,7 +1083,7 @@ public class UIScrollBarUI extends ScrollBarUI implements LayoutManager, SwingCo
scrollbar.repaint();
}
-
+ @SuppressWarnings("squid:S2164")
private void setValueFrom(MouseEvent e) {
boolean active = isThumbRollover();
BoundedRangeModel model = scrollbar.getModel();
diff --git a/designer-base/src/main/java/com/fr/design/gui/itable/UITable.java b/designer-base/src/main/java/com/fr/design/gui/itable/UITable.java
index ca214c424..e5dcd7fd1 100644
--- a/designer-base/src/main/java/com/fr/design/gui/itable/UITable.java
+++ b/designer-base/src/main/java/com/fr/design/gui/itable/UITable.java
@@ -291,8 +291,7 @@ public class UITable extends JTable implements UIObserver {
*
*/
public TableCellEditor getDefaultEditor(Class columnClass) {
- columnClass = UITable.class;
- return super.getDefaultEditor(columnClass);
+ return super.getDefaultEditor(UITable.class);
}
@Override
@@ -300,8 +299,7 @@ public class UITable extends JTable implements UIObserver {
*
*/
public TableCellRenderer getDefaultRenderer(Class columnClass) {
- columnClass = UITable.class;
- return super.getDefaultRenderer(columnClass);
+ return super.getDefaultRenderer(UITable.class);
}
/**
diff --git a/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java b/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java
index 370ceacb8..71e80027c 100644
--- a/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java
+++ b/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java
@@ -19,6 +19,7 @@ import javax.swing.table.TableModel;
import com.fr.base.BaseUtils;
import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.mainframe.DesignerContext;
import com.fr.stable.Constants;
@@ -132,7 +133,7 @@ public class UITableUI extends BasicTableUI {
return;
}
if (!table.isEditing()) {
- int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
+ int val = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (val == JOptionPane.OK_OPTION) {
((UITable) table).removeLine(table.rowAtPoint(e.getPoint()));
diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java
index 0ec8fe90c..fc219a30b 100644
--- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java
+++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java
@@ -1,6 +1,7 @@
package com.fr.design.gui.itableeditorpane;
import com.fr.base.BaseUtils;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.mainframe.DesignerContext;
import com.fr.log.FineLoggerFactory;
@@ -207,7 +208,7 @@ public abstract class UITableModelAdapter extends AbstractTabl
public void actionPerformed(ActionEvent e) {
final int selectedRow = table.getSelectedRow();
if (selectedRow > table.getRowCount() - 1 || selectedRow < 0) {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No-Alternatives"));
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No-Alternatives"));
return;
}
stopCellEditing();
@@ -251,7 +252,7 @@ public abstract class UITableModelAdapter extends AbstractTabl
if(component == null){
component = DesignerContext.getDesignerFrame();
}
- int val = JOptionPane.showConfirmDialog(component,
+ int val = FineJOptionPane.showConfirmDialog(component,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"),
JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (val != JOptionPane.OK_OPTION) {
diff --git a/designer-base/src/main/java/com/fr/design/gui/itextfield/TextFieldUI.java b/designer-base/src/main/java/com/fr/design/gui/itextfield/TextFieldUI.java
deleted file mode 100644
index 2d0891181..000000000
--- a/designer-base/src/main/java/com/fr/design/gui/itextfield/TextFieldUI.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.fr.design.gui.itextfield;
-
-import java.awt.Graphics;
-
-import javax.swing.plaf.metal.MetalTextFieldUI;
-import javax.swing.text.JTextComponent;
-
-import de.muntjak.tinylookandfeel.Theme;
-
-public class TextFieldUI extends MetalTextFieldUI {
-
-
- protected void paintBackground(Graphics g) {
- JTextComponent editor = getComponent();
- // We will only be here if editor is opaque, so we don't have to test
-
- if(editor.isEnabled()) {
- if(editor.isEditable()) {
- g.setColor(editor.getBackground());
- }
- else {
- // not editable
- if(editor.getBackground().equals(Theme.textBgColor[Theme.style].getColor())) {
- // set default panel background
- g.setColor(Theme.backColor[Theme.style].getColor());
- }
- else {
- // color changed by user - set textfield background
- g.setColor(editor.getBackground());
- }
- }
-
- g.fillRect(0, 0, editor.getWidth(), editor.getHeight());
- }
- else {
- if(editor.getBackground().equals(Theme.textBgColor[Theme.style].getColor())) {
- g.setColor(Theme.textDisabledBgColor[Theme.style].getColor());
- }
- else {
- // color changed by user - set textfield background
- g.setColor(editor.getBackground());
- }
-
- g.fillRect(0, 0, editor.getWidth(), editor.getHeight());
-
- if(Theme.style != Theme.YQ_STYLE) return;
-
- g.setColor(Theme.backColor[Theme.style].getColor());
- g.drawRect(1, 1, editor.getWidth() - 3, editor.getHeight() - 3);
- g.drawRect(2, 2, editor.getWidth() - 5, editor.getHeight() - 5);
- }
- }
-}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java b/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java
index 9bbca6d2b..b188cb5aa 100644
--- a/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java
@@ -102,7 +102,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
{IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png")},
{IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png")}};
Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL};
- hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment);
+ hAlignmentPane = new UIButtonGroup<>(hAlignmentIconArray, hAlignment);
hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Right"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Distributed"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_DEFAULT")});
hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
@@ -112,7 +112,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
{IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png")},
{IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png")}};
Integer[] vAlignment = new Integer[]{Constants.TOP, Constants.CENTER, Constants.BOTTOM};
- vAlignmentPane = new UIButtonGroup(vAlignmentIconArray, vAlignment);
+ vAlignmentPane = new UIButtonGroup<>(vAlignmentIconArray, vAlignment);
vAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Bottom")});
initOtherComponent();
initAllNames();
@@ -174,7 +174,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
}
private void initTextRotationCombox() {
- ArrayList selectOption = new ArrayList();
+ ArrayList selectOption = new ArrayList<>();
selectOption.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Angle"));
VerticalTextProcessor processor = ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG, DefaultVerticalTextProcessor.class);
selectOption.addAll(Arrays.asList(processor.getComboxOption()));
@@ -343,8 +343,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
int rightPadding = indentationUnitProcessor.paddingUnitProcessor(style.getPaddingRight());
// alex:indent
- this.leftIndentSpinner.setValue(new Integer(leftPadding));
- this.rightIndentSpinner.setValue(new Integer(rightPadding));
+ this.leftIndentSpinner.setValue(leftPadding);
+ this.rightIndentSpinner.setValue(rightPadding);
this.spaceBeforeSpinner.setValue(style.getSpacingBefore());
this.spaceAfterSpinner.setValue(style.getSpacingAfter());
@@ -360,7 +360,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
public Style update(Style style) {
// peter:需要判断传递进来的值是否为null.
if (style == null) {
- return style;
+ return null;
}
if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal"))) {
@@ -463,7 +463,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
}
/**
- * @param name
+ * @param name 全局名
*/
public void setGlobalName(String name) {
}
diff --git a/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java b/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java
index 795c6d455..cf362f7f5 100644
--- a/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java
@@ -6,6 +6,7 @@ import com.fr.base.Style;
import com.fr.base.TextFormat;
import com.fr.data.core.FormatField;
import com.fr.data.core.FormatField.FormatContents;
+import com.fr.design.i18n.Toolkit;
import com.fr.design.border.UIRoundedBorder;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.constants.UIConstants;
@@ -36,20 +37,23 @@ import java.text.SimpleDateFormat;
* @author zhou
* @since 2012-5-24上午10:57:00
*/
-public class FormatPane extends AbstractBasicStylePane implements GlobalNameObserver {
+public class FormatPane extends AbstractBasicStylePane implements GlobalNameObserver {
private static final long serialVersionUID = 724330854437726751L;
- private static final int LABLE_X = 4;
- private static final int LABLE_Y = 18;
- private static final int LABLE_DELTA_WIDTH = 8;
- private static final int LABLE_HEIGHT = 15; //标签背景的范围
+ private static final int LABEL_X = 4;
+ private static final int LABEL_Y = 18;
+ private static final int LABEL_DELTA_WIDTH = 8;
+ private static final int LABEL_HEIGHT = 15; //标签背景的范围
private static final int CURRENCY_FLAG_POINT = 6;
- private static final Border LEFT_BORDER = BorderFactory.createEmptyBorder(0,30,0,0);
+ private static final Border LEFT_BORDER = BorderFactory.createEmptyBorder(0, 30, 0, 0);
- private static final Integer[] TYPES = new Integer[]{FormatContents.NULL, FormatContents.NUMBER, FormatContents.CURRENCY, FormatContents.PERCENT, FormatContents.SCIENTIFIC,
- FormatContents.DATE, FormatContents.TIME, FormatContents.TEXT};
+ private static final Integer[] TYPES = new Integer[]{
+ FormatContents.NULL, FormatContents.NUMBER,
+ FormatContents.CURRENCY, FormatContents.PERCENT,
+ FormatContents.SCIENTIFIC, FormatContents.DATE,
+ FormatContents.TIME, FormatContents.TEXT};
- private static final Integer[] DATETYPES = new Integer[]{FormatContents.NULL, FormatContents.DATE, FormatContents.TIME,};
+ private static final Integer[] DATE_TYPES = new Integer[]{FormatContents.NULL, FormatContents.DATE, FormatContents.TIME};
private Format format;
@@ -61,7 +65,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
private JPanel centerPane;
private JPanel formatFontPane;
private FRFontPane frFontPane;
- private boolean isRightFormate;
+ private boolean isRightFormat;
private boolean isDate = false;
private GlobalNameListener globalNameListener = null;
@@ -78,7 +82,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
protected void initComponents(Integer[] types) {
this.setLayout(new BorderLayout(0, 4));
- iniSampleLable();
+ initSampleLabel();
contentPane = new JPanel(new BorderLayout(0, 4)) {
@Override
public Dimension getPreferredSize() {
@@ -108,7 +112,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
frFontPane = new FRFontPane();
- UILabel font = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font"), SwingConstants.LEFT);
+ UILabel font = new UILabel(Toolkit.i18nText("Fine-Design_Form_FR_Font"), SwingConstants.LEFT);
JPanel fontPane = new JPanel(new BorderLayout());
fontPane.add(font, BorderLayout.NORTH);
@@ -136,7 +140,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) {
return new Component[][]{
new Component[]{null, null},
- new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format"), SwingConstants.LEFT), typePane},
+ new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format"), SwingConstants.LEFT), typePane},
new Component[]{centerPane, null},
new Component[]{fontPane, frFontPane},
};
@@ -155,24 +159,24 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
};
}
- private void iniSampleLable() {
- Border innterborder = new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 4);
- Font tmpFont = null;
- Border border = BorderFactory.createTitledBorder(innterborder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_StyleFormat_Sample"), TitledBorder.LEFT, 0, tmpFont, UIConstants.LINE_COLOR);
+ private void initSampleLabel() {
+ Border interBorder = new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 4);
+ String title = Toolkit.i18nText("Fine-Design_Report_Base_StyleFormat_Sample");
+ Border border = BorderFactory.createTitledBorder(interBorder, title, TitledBorder.LEFT, 0, null, UIConstants.LINE_COLOR);
sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()) {
@Override
public void paint(Graphics g) {
super.paint(g);
int width = getWidth();
- Color orignal = g.getColor();
+ Color original = g.getColor();
g.setColor(getBackground());
- g.fillRect(LABLE_X, LABLE_Y, width - LABLE_DELTA_WIDTH, LABLE_HEIGHT);
+ g.fillRect(LABEL_X, LABEL_Y, width - LABEL_DELTA_WIDTH, LABEL_HEIGHT);
g.setColor(UIConstants.LINE_COLOR);
FontMetrics cellFM = g.getFontMetrics();
int textWidth = cellFM.stringWidth(getText());
GraphHelper.drawString(g, getText(), (width - textWidth) / 2, 26);
- g.setColor(orignal);
+ g.setColor(original);
}
};
sampleLabel.setHorizontalAlignment(UILabel.CENTER);
@@ -197,7 +201,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
* @return 标题
*/
public String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text");
+ return Toolkit.i18nText("Fine-Design_Report_Text");
}
/**
@@ -212,13 +216,9 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
if (format instanceof CoreDecimalFormat) {
// check all value
String pattern = ((CoreDecimalFormat) format).toPattern();
- boolean isCurrency1 = (pattern.length() > 0 && pattern.charAt(0) == '¤');
- boolean isCurrency2 = (pattern.length() > 0 && pattern.charAt(0) == '$');
- boolean isCurrency = isCurrency1 || isCurrency2;
- boolean isCurrency4 = (pattern.length() > CURRENCY_FLAG_POINT && ComparatorUtils.equals(pattern.substring(0, CURRENCY_FLAG_POINT), "#,##0;"));
- if (isCurrency || isCurrency4) {
+ if (isCurrencyFormatStyle(pattern)) {
setPatternComboBoxAndList(FormatContents.CURRENCY, pattern);
- } else if (pattern.endsWith("%")) {
+ } else if (pattern.indexOf("%") > 0) {
setPatternComboBoxAndList(FormatContents.PERCENT, pattern);
} else if (pattern.indexOf("E") > 0) {
setPatternComboBoxAndList(FormatContents.SCIENTIFIC, pattern);
@@ -238,6 +238,17 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
}
}
+ private boolean isCurrencyFormatStyle(String pattern) {
+ if (pattern.length() == 0) {
+ return false;
+ }
+
+ if (pattern.charAt(0) == '¤' || pattern.charAt(0) == '$') {
+ return true;
+ }
+
+ return pattern.length() > CURRENCY_FLAG_POINT && pattern.startsWith("#,##0;");
+ }
/**
* 判断是否是数组有模式
@@ -273,7 +284,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
if (getFormatContents() == FormatContents.TEXT) {
return FormatField.getInstance().getFormat(getFormatContents(), patternString);
}
- if (isRightFormate) {
+ if (isRightFormat) {
if (StringUtils.isNotEmpty(patternString)) {
return FormatField.getInstance().getFormat(getFormatContents(), patternString);
}
@@ -292,7 +303,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
this.sampleLabel.setText(FormatField.getInstance().getFormatValue());
this.sampleLabel.setForeground(UIManager.getColor("Label.foreground"));
try {
- isRightFormate = true;
+ isRightFormat = true;
if (StringUtils.isEmpty(String.valueOf(textField.getSelectedItem()))) {
return;
}
@@ -300,7 +311,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
} catch (Exception e) {
this.sampleLabel.setForeground(Color.red);
this.sampleLabel.setText(e.getMessage());
- isRightFormate = false;
+ isRightFormat = false;
}
}
@@ -401,8 +412,8 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
this.isDate = isDate;
this.typeComboBox.setSelectedIndex(0);
if (isDate) {
- for (int i = 0; i < DATETYPES.length; i++) {
- this.typeComboBox.addItem(DATETYPES[i]);
+ for (int i = 0; i < DATE_TYPES.length; i++) {
+ this.typeComboBox.addItem(DATE_TYPES[i]);
}
for (int i = 0; i < TYPES.length; i++) {
this.typeComboBox.removeItemAt(1);
@@ -411,7 +422,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
for (int i = 0; i < TYPES.length; i++) {
this.typeComboBox.addItem(TYPES[i]);
}
- for (int i = 0; i < DATETYPES.length; i++) {
+ for (int i = 0; i < DATE_TYPES.length; i++) {
this.typeComboBox.removeItemAt(1);
}
}
diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/print/RPrintUtilities.java b/designer-base/src/main/java/com/fr/design/gui/syntax/print/RPrintUtilities.java
index 352676010..749bf4540 100644
--- a/designer-base/src/main/java/com/fr/design/gui/syntax/print/RPrintUtilities.java
+++ b/designer-base/src/main/java/com/fr/design/gui/syntax/print/RPrintUtilities.java
@@ -9,6 +9,8 @@
*/
package com.fr.design.gui.syntax.print;
+import com.fr.log.FineLoggerFactory;
+
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.Element;
@@ -62,8 +64,8 @@ public abstract class RPrintUtilities {
private static int getLineBreakPoint(String line, final int maxCharsPerLine) {
int breakPoint = -1;
- for (int i=0; i breakPoint)
breakPoint = breakCharPos;
}
@@ -147,11 +149,11 @@ public abstract class RPrintUtilities {
int tabIndex = curLineString.indexOf('\t');
while (tabIndex > -1) {
int spacesNeeded = tabSizeInSpaces - (tabIndex % tabSizeInSpaces);
- String replacementString = "";
+ StringBuilder replacementString = new StringBuilder();
for (int i=0; i-1 && pos>currentPos)
// currentPos = pos;
- if (pos>0 && pos>currentPos & pos!=currentLineString.length())
+ if (pos > 0 && pos > currentPos & pos != currentLineString.length())
currentPos = pos;
}
@@ -440,7 +442,7 @@ public abstract class RPrintUtilities {
try {
doc.getText(currentLineStart+startingOffset, currentPos, currentLineSeg);
} catch (BadLocationException ble) {
- System.err.println(ble);
+ FineLoggerFactory.getLogger().error(ble.getMessage());
return Printable.NO_SUCH_PAGE;
}
currentLineLengthInPixels = Utilities.
@@ -453,12 +455,11 @@ public abstract class RPrintUtilities {
try {
doc.getText((currentLineStart+startingOffset), currentPos, currentLineSeg);
} catch (BadLocationException ble) {
- System.err.println("BadLocationException in print (a):");
- System.err.println("==> currentLineStart: " + currentLineStart +
- "; startingOffset: " + startingOffset + "; currentPos: " + currentPos);
- System.err.println("==> Range: " + (currentLineStart+startingOffset) + " - " +
- (currentLineStart+startingOffset+currentPos));
- ble.printStackTrace();
+ FineLoggerFactory.getLogger().error("BadLocationException in print (a):" + "==> currentLineStart: " + currentLineStart +
+ "; startingOffset: " + startingOffset + "; currentPos: " + currentPos +
+ "==> Range: " + (currentLineStart+startingOffset) + " - " +
+ (currentLineStart+startingOffset+currentPos));
+ FineLoggerFactory.getLogger().error(ble.getMessage());
return Printable.NO_SUCH_PAGE;
}
@@ -521,7 +522,8 @@ public abstract class RPrintUtilities {
return x;
int tabSizeInPixels = tabSizeInSpaces * fm.charWidth(' ');
int ntabs = (((int) x) - xOffset) / tabSizeInPixels;
- return xOffset + ((ntabs + 1) * tabSizeInPixels);
+ double reFloat = (double) xOffset + (double) ((ntabs + 1) * tabSizeInPixels);
+ return (float) reFloat;
}
}
diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxUtilities.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxUtilities.java
index ddb3ddfa3..596c5d9bd 100644
--- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxUtilities.java
+++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxUtilities.java
@@ -518,6 +518,8 @@ public class RSyntaxUtilities implements SwingConstants {
}
numEmbedded--;
}
+ } else {
+ //do nothing
}
} // End of for (int i=segOffset; i {
token = null;
}
}
+ else {
+ throw new NoSuchElementException();
+ }
return t;
}
diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/WrappedSyntaxView.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/WrappedSyntaxView.java
index e99208afc..97e367ef0 100644
--- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/WrappedSyntaxView.java
+++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/WrappedSyntaxView.java
@@ -268,7 +268,7 @@ public class WrappedSyntaxView extends BoxView implements TabExpander,
if (host.getEOLMarkersVisible()) {
g.setColor(host.getForegroundForTokenType(Token.WHITESPACE));
g.setFont(host.getFontForTokenType(Token.WHITESPACE));
- g.drawString("\u00B6", x, y-fontHeight);
+ g.drawString("\u00B6", x, (float) (y-fontHeight));
}
}
@@ -458,7 +458,7 @@ public class WrappedSyntaxView extends BoxView implements TabExpander,
if (host.getEOLMarkersVisible()) {
g.setColor(host.getForegroundForTokenType(Token.WHITESPACE));
g.setFont(host.getFontForTokenType(Token.WHITESPACE));
- g.drawString("\u00B6", x, y-fontHeight);
+ g.drawString("\u00B6", x, (float) (y-fontHeight));
}
}
@@ -841,10 +841,11 @@ public class WrappedSyntaxView extends BoxView implements TabExpander,
* @return the tab stop, measured in points >= 0
*/
public float nextTabStop(float x, int tabOffset) {
- if (tabSize == 0)
+ if (tabSize == 0) {
return x;
+ }
int ntabs = ((int) x - tabBase) / tabSize;
- return tabBase + ((ntabs + 1) * tabSize);
+ return (float) (tabBase + ((ntabs + 1) * tabSize));
}
diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/folding/HtmlFoldParser.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/folding/HtmlFoldParser.java
index 79d8da0a3..41f51215c 100644
--- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/folding/HtmlFoldParser.java
+++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/folding/HtmlFoldParser.java
@@ -172,7 +172,7 @@ public class HtmlFoldParser implements FoldParser {
// Continuing an MLC from a previous line
if (inMLC) {
// Found the end of the MLC starting on a previous line...
- if (t.endsWith(MLC_END)) {
+ if (currentFold != null && t.endsWith(MLC_END)) {
int mlcEnd = t.getEndOffset() - 1;
currentFold.setEndOffset(mlcEnd);
Fold parentFold = currentFold.getParent();
diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.java
index aae721673..98b5265c3 100644
--- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.java
+++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.java
@@ -18,6 +18,7 @@ import java.io.IOException;
* on 9/18/19 6:12 PM from the specification file
* /Users/3dot141/Downloads/FolxDownload/App/jflex-1.4.1/bin/FormulaTokenMaker.flex
*/
+@SuppressWarnings("squid:S1192")
public class FormulaTokenMaker extends AbstractJFlexCTokenMaker {
/** This character denotes the end of file */
diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java
index 532fe467c..7147ef90e 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java
@@ -2,6 +2,7 @@ package com.fr.design.hyperlink;
import com.fr.base.BaseUtils;
import com.fr.base.Parameter;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.frpane.ReportletParameterViewPane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.itableeditorpane.ParameterTableModel;
@@ -122,7 +123,7 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane j ? i : j;
+ double x = Math.max(i,j);
if (AssistUtils.equals(x, i)) {
w = (int) (Math.round(m) * WIDTH_PARA_INT - WIDTH_OFFSET_M);
} else if (AssistUtils.equals(x, j)) {
diff --git a/designer-base/src/main/java/com/fr/design/layout/TableLayout.java b/designer-base/src/main/java/com/fr/design/layout/TableLayout.java
index f8134be1f..2cf288da6 100644
--- a/designer-base/src/main/java/com/fr/design/layout/TableLayout.java
+++ b/designer-base/src/main/java/com/fr/design/layout/TableLayout.java
@@ -1747,7 +1747,7 @@ public class TableLayout implements LayoutManager2, Serializable {
for (counter = 0; counter < numCr; counter++)
if ((crSpec[z][counter] > 0.0) && (crSpec[z][counter] < 1.0))
fillSizeRatio -= crSpec[z][counter];
- else if (crSpec[z][counter] == FILL)
+ else if (AssistUtils.equals(crSpec[z][counter], FILL))
numFillSize++;
// Adjust fill ratios to reflect number of fill rows/columns
@@ -1773,8 +1773,8 @@ public class TableLayout implements LayoutManager2, Serializable {
int crPrefMin[] = new int[numCr];
for (counter = 0; counter < numCr; counter++)
- if ((crSpec[z][counter] == PREFERRED) ||
- (crSpec[z][counter] == MINIMUM)) {
+ if ((AssistUtils.equals(crSpec[z][counter], PREFERRED)) ||
+ (AssistUtils.equals(crSpec[z][counter], MINIMUM))) {
crPrefMin[counter] = crSize[z][counter];
}
diff --git a/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java b/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java
index 1be77c849..d394f43ee 100644
--- a/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java
+++ b/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java
@@ -372,7 +372,8 @@ public class TableLayoutHelper {
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
JPanel jp1 = TableLayoutHelper.createTableLayoutPane(createTestComponents("jp1"), TableLayoutHelper.FILL_NONE);
- JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp2"), TableLayoutHelper.FILL_LASTCOL_AND_ROW, (double)2 * TEN, (double)2 * TEN);
+ JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp2"),
+ TableLayoutHelper.FILL_LASTCOL_AND_ROW, (double)2 * TEN, (double)2 * TEN);
JPanel jp3 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp3"),
new double[]{f, p, f, p}, new double[]{f, f}, 4, 4);
JPanel jp4 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp4"),
diff --git a/designer-base/src/main/java/com/fr/design/locale/impl/SplashMark.java b/designer-base/src/main/java/com/fr/design/locale/impl/SplashMark.java
index 790108978..8cf75c058 100644
--- a/designer-base/src/main/java/com/fr/design/locale/impl/SplashMark.java
+++ b/designer-base/src/main/java/com/fr/design/locale/impl/SplashMark.java
@@ -15,14 +15,13 @@ import java.util.Map;
public class SplashMark implements LocaleMark {
private Map map = new HashMap();
- private static final String SPLASH_PATH = "/com/fr/design/images/splash_10.gif";
- private static final String SPLASH_EN_PATH = "/com/fr/design/images/splash_10_en.gif";
- private static final String SPLASH_JP_PATH = "/com/fr/design/images/splash_10_jp.gif";
+ private static final String SPLASH_PATH = "/com/fr/design/images/splash_10.png";
+ private static final String SPLASH_EN_PATH = "/com/fr/design/images/splash_10_en.png";
public SplashMark() {
map.put(Locale.CHINA, SPLASH_PATH);
map.put(Locale.KOREA, SPLASH_EN_PATH);
- map.put(Locale.JAPAN, SPLASH_JP_PATH);
+ map.put(Locale.JAPAN, SPLASH_EN_PATH);
map.put(Locale.US, SPLASH_EN_PATH);
map.put(Locale.TAIWAN, SPLASH_EN_PATH);
}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
index 082775a62..2cf8d8c35 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@@ -13,6 +13,7 @@ import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.constants.UIConstants;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.data.datapane.TableDataTreePane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.env.DesignerWorkspaceInfo;
import com.fr.design.event.DesignerOpenedListener;
import com.fr.design.event.TargetModifiedEvent;
@@ -39,25 +40,29 @@ import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
import com.fr.design.mainframe.vcs.common.VcsHelper;
import com.fr.design.menu.MenuManager;
import com.fr.design.menu.ShortCut;
+import com.fr.design.os.impl.MacOsAddListenerAction;
import com.fr.design.os.impl.SupportOSImpl;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.event.EventDispatcher;
import com.fr.exception.DecryptTemplateException;
+import com.fr.exit.DesignerExiter;
import com.fr.file.FILE;
import com.fr.file.FILEFactory;
import com.fr.file.FileFILE;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext;
+import com.fr.general.IOUtils;
+import com.fr.invoke.Reflect;
import com.fr.log.FineLoggerFactory;
import com.fr.plugin.context.PluginContext;
import com.fr.plugin.injectable.PluginModule;
import com.fr.plugin.manage.PluginFilter;
import com.fr.plugin.observer.PluginEvent;
import com.fr.plugin.observer.PluginEventListener;
-import com.fr.stable.OperatingSystem;
import com.fr.stable.ProductConstants;
import com.fr.stable.StringUtils;
import com.fr.stable.image4j.codec.ico.ICODecoder;
+import com.fr.stable.os.OperatingSystem;
import com.fr.stable.os.support.OSBasedAction;
import com.fr.stable.os.support.OSSupportCenter;
import com.fr.stable.project.ProjectConstants;
@@ -180,7 +185,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
@Override
public void windowClosing(WindowEvent e) {
-
+ //关闭前当前模板 停止编辑
+ HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().stopEditing();
SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(true);
// 只有一个文件未保存时
if (HistoryTemplateListCache.getInstance().getHistoryCount() == 1) {
@@ -311,6 +317,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
// window close listener.
this.addWindowListeners(getFrameListeners());
+ addMacOsListener();
+
this.addComponentListener(new ComponentAdapter() {
@Override
@@ -463,7 +471,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
OSSupportCenter.buildAction(new OSBasedAction() {
@Override
public void execute(Object... objects) {
- bbsLoginPane[0] = ad.createBBSLoginPane();
+ bbsLoginPane[0] = ad.createBBSLoginPane();
}
}, SupportOSImpl.USERINFOPANE);
processor.hold(northEastPane, LogMessageBar.getInstance(), bbsLoginPane[0]);
@@ -475,7 +483,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
OSSupportCenter.buildAction(new OSBasedAction() {
@Override
public void execute(Object... objects) {
- northEastPane.add(ad.createBBSLoginPane());
+ northEastPane.add(ad.createBBSLoginPane());
}
}, SupportOSImpl.USERINFOPANE);
@@ -498,8 +506,14 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
image = ICODecoder.read(DesignerFrame.class
.getResourceAsStream("/com/fr/base/images/oem/logo.ico"));
}
- this.setIconImages(image);
- } catch (IOException e) {
+ if (OperatingSystem.isMacos()) {
+ Class clazz = Class.forName("com.apple.eawt.Application");
+ BufferedImage icon = image.isEmpty() ? IOUtils.readImage("/com/fr/base/images/oem/logo.png") : image.get(image.size() - 1);
+ Reflect.on(Reflect.on(clazz).call("getApplication").get()).call("setDockIconImage", icon);
+ } else {
+ this.setIconImages(image);
+ }
+ } catch (IOException | ClassNotFoundException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
this.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png"));
}
@@ -512,6 +526,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
}
}
+ private void addMacOsListener() {
+ OSSupportCenter.buildAction(new MacOsAddListenerAction(), SupportOSImpl.DOCK_QUIT);
+ }
+
protected ArrayList getFrameListeners() {
ArrayList arrayList = new ArrayList<>();
@@ -828,7 +846,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
}
defaultTitleSB.append(username).append("@").append(envName).append("[").append(workspace.getDescription()).append("]");
if (editingTemplate != null) {
- String path = editingTemplate.getEditingFILE().getPath();
+ String path = editingTemplate.getPath();
if (!editingTemplate.getEditingFILE().exists()) {
path = FILEFactory.MEM_PREFIX + path;
} else if (path.startsWith(ProjectConstants.REPORTLETS_NAME)) {
@@ -919,9 +937,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
} else {
editingTemplate.stopEditing();
if (!editingTemplate.getEditingFILE().exists()) {
- int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+ int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + editingTemplate.getEditingFILE()
- + "\" ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_OPTION,
+ + "\" ?", Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.YES_OPTION && editingTemplate.saveTemplate()) {
editingTemplate.saveTemplate();
@@ -1033,10 +1051,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
// p:判断一下，如何文件为空或者文件不存在，直接返回.
if (tplFile == null || !tplFile.exists()) {
- JOptionPane.showMessageDialog(
+ FineJOptionPane.showMessageDialog(
this,
Toolkit.i18nText("Fine-Design_Basic_Warning_Template_Do_Not_Exsit"),
- ProductConstants.PRODUCT_NAME,
+ Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.INFORMATION_MESSAGE
);
DesignerFrameFileDealerPane.getInstance().refresh();
@@ -1046,10 +1064,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
try {
openFile(tplFile);
} catch (DecryptTemplateException e) {
- JOptionPane.showMessageDialog(
+ FineJOptionPane.showMessageDialog(
this,
Toolkit.i18nText("Fine-Design_Encrypt_Decrypt_Exception"),
- UIManager.getString("OptionPane.messageDialogTitle"),
+ Toolkit.i18nText("Fine-Design_Basic_Alert"),
JOptionPane.WARNING_MESSAGE,
UIManager.getIcon("OptionPane.errorIcon")
);
@@ -1083,6 +1101,17 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
*/
private void openFile(FILE tplFile) {
+ if (tplFile != null) {
+ int index = HistoryTemplateListCache.getInstance().contains(tplFile);
+ if (index != -1) {
+ JTemplate jt = HistoryTemplateListCache.getInstance().getHistoryList().get(index);
+ if (!(jt instanceof JVirtualTemplate)) {
+ jt.activeOldJTemplate();
+ return;
+ }
+ }
+ }
+
JTemplate jt = JTemplateFactory.createJTemplate(tplFile);
if (jt == null) {
return;
@@ -1092,23 +1121,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
this.addAndActivateJTemplate();
MutilTempalteTabPane.getInstance().setTemTemplate(
HistoryTemplateListCache.getInstance().getCurrentEditingTemplate());
- } else {
- activeTemplate(jt);
- }
- }
-
- /**
- * 激活指定的模板
- *
- * @param jt 当前报表
- * @date 2014-10-14-下午6:31:23
- */
- private void activeTemplate(JTemplate jt) {
- // 如果该模板已经打开，则进行激活就可以了
- int index = HistoryTemplateListCache.getInstance().contains(jt);
- List> historyList = HistoryTemplateListCache.getInstance().getHistoryList();
- if (index != -1) {
- historyList.get(index).activeJTemplate(index, jt);
} else {
this.addAndActivateJTemplate(jt);
}
@@ -1132,8 +1144,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
Thread.currentThread().interrupt();
}
- DesignerEnvManager.getEnvManager().setLastOpenFile(
- HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());
+ JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+ if (jt != null) {
+ DesignerEnvManager.getEnvManager().setLastOpenFile(jt.getEditingFILE().getPath());
+ }
DesignerEnvManager.getEnvManager().setLastWestRegionToolPaneY(
WestRegionContainerPane.getInstance().getToolPaneY());
@@ -1159,8 +1173,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
this.dispose();
this.ad.shutDown();
-
- System.exit(0);
+ DesignerExiter.getInstance().execute();
}
// harry：添加程序外拖拽文件进来打开的功能
@@ -1267,4 +1280,13 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
progressDialog.dispose();
}
+
+ /**
+ * 设计器是否已经打开
+ *
+ * @return 设计器是否已经打开
+ */
+ public boolean isDesignerOpened() {
+ return designerOpened;
+ }
}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
index f24375da1..bcac7f946 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@@ -11,6 +11,7 @@ import com.fr.design.constants.UIConstants;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.data.datapane.TableDataTreePane;
import com.fr.design.data.tabledata.ResponseDataSourceChange;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.file.FileOperations;
import com.fr.design.file.FileToolbarStateChangeListener;
import com.fr.design.file.HistoryTemplateListCache;
@@ -217,7 +218,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
if (VcsHelper.getInstance().needInit()) {
vcsAction = new VcsAction();
- if (WorkContext.getCurrent().isLocal()) {
+ if (!WorkContext.getCurrent().isCluster()) {
vcsAction.setName(Toolkit.i18nText("Fine-Design_Vcs_Title"));
} else {
vcsAction.setName(Toolkit.i18nText("Fine-Design_Vcs_NotSupportRemote"));
@@ -324,9 +325,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
public void actionPerformed(ActionEvent evt) {
if (!selectedOperation.access()) {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied"),
- Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+ Toolkit.i18nText("Fine-Design_Basic_Alert"),
WARNING_MESSAGE);
return;
}
@@ -466,9 +467,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
@Override
public void actionPerformed(ActionEvent evt) {
if (!selectedOperation.access()) {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied"),
- Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+ Toolkit.i18nText("Fine-Design_Basic_Alert"),
WARNING_MESSAGE);
return;
}
@@ -477,9 +478,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
String lock = node.getLock();
if (lock != null && !lock.equals(node.getUserID())) {
// 提醒被锁定模板无法重命名
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Unable_Rename_Locked_File"),
- Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+ Toolkit.i18nText("Fine-Design_Basic_Alert"),
WARNING_MESSAGE);
return;
}
@@ -506,9 +507,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
public void actionPerformed(ActionEvent evt) {
if (!selectedOperation.access()) {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied"),
- Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+ Toolkit.i18nText("Fine-Design_Basic_Alert"),
WARNING_MESSAGE);
return;
}
@@ -683,21 +684,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
this.dispose();
//模版重命名
- boolean success = false;
-
- // 提醒保存文件
- SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(true);
- // 只有一个文件未保存时
- if (HistoryTemplateListCache.getInstance().getHistoryCount() == 1) {
- int choose = saveSomeTempaltePane.saveLastOneTemplate();
- if (choose != JOptionPane.CANCEL_OPTION) {
- success = selectedOperation.rename(fnf, path, newPath);
- }
- } else {
- if (saveSomeTempaltePane.showSavePane()) {
- success = selectedOperation.rename(fnf, path, newPath);
- }
- }
+ boolean success = selectedOperation.rename(fnf, path, newPath);
if (success) {
HistoryTemplateListCache.getInstance().rename(fnf, path, newPath);
@@ -705,9 +692,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
selectedOperation.refresh();
DesignerContext.getDesignerFrame().setTitle();
} else {
- JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+ FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Rename_Failure"),
- UIManager.getString("OptionPane.messageDialogTitle"),
+ Toolkit.i18nText("Fine-Design_Basic_Error"),
JOptionPane.DEFAULT_OPTION,
JOptionPane.ERROR_MESSAGE);
}
@@ -896,9 +883,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
selectedOperation.refresh();
this.dispose();
if (!success) {
- JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+ FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Make_Failure"),
- UIManager.getString("OptionPane.messageDialogTitle"),
+ Toolkit.i18nText("Fine-Design_Basic_Error"),
JOptionPane.DEFAULT_OPTION,
JOptionPane.ERROR_MESSAGE);
}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index 4ac020069..29c1dcb53 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@@ -21,6 +21,7 @@ import com.fr.design.actions.file.WebPreviewUtils;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.designer.DesignerProxy;
import com.fr.design.designer.TargetComponent;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.dialog.InformationWarnPane;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.file.TemplateTreePane;
@@ -35,6 +36,7 @@ import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.gui.itree.filetree.TemplateFileTree;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.chart.info.ChartInfoCollector;
import com.fr.design.mainframe.template.info.TemplateInfoCollector;
import com.fr.design.mainframe.template.info.TemplateProcessInfo;
import com.fr.design.mainframe.template.info.TimeConsumeTimer;
@@ -69,11 +71,11 @@ import javax.swing.JComponent;
import javax.swing.JOptionPane;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.undo.UndoManager;
-import java.awt.BorderLayout;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Set;
import java.util.regex.Pattern;
+import java.awt.BorderLayout;
/**
* 报表设计和表单设计的编辑区域(设计器编辑的IO文件)
@@ -91,6 +93,7 @@ public abstract class JTemplate>
protected U authorityUndoState = null;
protected T template; // 当前模板
protected TemplateProcessInfo processInfo; // 模板过程的相关信息
+ private JComponent centerPane;
private static short currentIndex = 0;// 此变量用于多次新建模板时，让名字不重复
private DesignModelAdapter designModel;
private PreviewProvider previewType;
@@ -121,13 +124,13 @@ public abstract class JTemplate>
this.editingFILE = file;
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(BorderFactory.createEmptyBorder());
- this.add(createCenterPane(), BorderLayout.CENTER);
+ addCenterPane();
this.undoState = createUndoState();
designModel = createDesignModel();
consumeTimer.setEnabled(shouldInitForCollectInfo(isNewFile));
}
-
+
void onGetFocus() {
consumeTimer.start();
}
@@ -163,6 +166,7 @@ public abstract class JTemplate>
}
private void collectInfo(String originID) { // 执行收集操作
+ ChartInfoCollector.getInstance().collectInfo(template.getTemplateID(), originID, getProcessInfo(), 0);
if (!consumeTimer.isEnabled()) {
return;
}
@@ -243,6 +247,47 @@ public abstract class JTemplate>
}
+ /**
+ * 模板关闭时
+ */
+ public void whenClose() {
+ // do nothing
+ }
+
+ /**
+ * 刷新内部资源
+ *
+ * 刷新资源的同时。
+ * CenterPane 负责监听改动。
+ * 所以需要同步处理
+ */
+ public void refreshResource() {
+
+ try {
+ this.template = JTemplateFactory.asIOFile(this.editingFILE);
+ setTarget(this.template);
+
+ // 先移除旧的。
+ removeCenterPane();
+ // 加入新的
+ addCenterPane();
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ }
+
+ private void addCenterPane() {
+
+ this.centerPane = createCenterPane();
+ this.add(centerPane, BorderLayout.CENTER);
+ }
+
+ private void removeCenterPane() {
+
+ JComponent centerPane = this.centerPane;
+ this.remove(centerPane);
+ }
+
/**
* 刷新容器
*/
@@ -540,7 +585,7 @@ public abstract class JTemplate>
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
if (!access) {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.WARNING_MESSAGE);
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
return false;
}
collectInfo();
@@ -594,10 +639,10 @@ public abstract class JTemplate>
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
if (!access) {
- JOptionPane.showMessageDialog(
+ FineJOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!",
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"),
JOptionPane.WARNING_MESSAGE);
return false;
}
@@ -618,10 +663,10 @@ public abstract class JTemplate>
}
return saved;
} else {
- JOptionPane.showMessageDialog(
+ FineJOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design-Basic_Save_Failure"),
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"),
JOptionPane.WARNING_MESSAGE);
return false;
}
@@ -1218,4 +1263,9 @@ public abstract class JTemplate>
}
public abstract String route();
+
+ public String getTemplateName() {
+ return getEditingFILE().getName();
+ }
+
}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java
index c6a6f4a0d..8019cc178 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java
@@ -1,5 +1,6 @@
package com.fr.design.mainframe;
+import com.fr.base.io.BaseBook;
import com.fr.file.FILE;
import com.fr.stable.CoreConstants;
import com.fr.third.javax.annotation.Nonnull;
@@ -42,6 +43,28 @@ public final class JTemplateFactory {
}
return null;
}
+
+ public static T asIOFile(@Nonnull FILE file) {
+
+ String fileName = file.getName();
+ int indexOfLastDot = fileName.lastIndexOf(CoreConstants.DOT);
+ if (indexOfLastDot < 0) {
+ return null;
+ }
+ String fileExtension = fileName.substring(indexOfLastDot + 1);
+ for (App app : ALL_APP) {
+ String[] defaultAppExtensions = app.defaultExtensions();
+ for (String defaultAppExtension : defaultAppExtensions) {
+ if (defaultAppExtension.equalsIgnoreCase(fileExtension)) {
+ BaseBook bb = app.asIOFile(file);
+ if (bb != null) {
+ return (T) bb;
+ }
+ }
+ }
+ }
+ return null;
+ }
/**
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/UndoStateEdit.java b/designer-base/src/main/java/com/fr/design/mainframe/UndoStateEdit.java
index 92de00dbc..a70795d40 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/UndoStateEdit.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/UndoStateEdit.java
@@ -2,6 +2,7 @@ package com.fr.design.mainframe;
import com.fr.base.vcs.DesignerMode;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
@@ -43,7 +44,7 @@ public class UndoStateEdit extends AbstractUndoableEdit {
public void undo() throws CannotUndoException {
super.undo();
if (cur.getAuthorityType() == BaseUndoState.AUTHORITY_STATE) {
- int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Undo_All_Authority_Operations") + "?",
+ int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Undo_All_Authority_Operations") + "?",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Undo"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.NO_OPTION) {
return;
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/burying/point/AbstractPointCollector.java b/designer-base/src/main/java/com/fr/design/mainframe/burying/point/AbstractPointCollector.java
new file mode 100644
index 000000000..a3665b77b
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/burying/point/AbstractPointCollector.java
@@ -0,0 +1,130 @@
+package com.fr.design.mainframe.burying.point;
+
+import com.fr.base.FRContext;
+import com.fr.base.io.XMLReadHelper;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.mainframe.template.info.SendHelper;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLTools;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.third.javax.xml.stream.XMLStreamException;
+import com.fr.third.org.apache.commons.io.FileUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-02-21
+ */
+public abstract class AbstractPointCollector implements BasePointCollector {
+
+ protected Map pointInfoMap;
+
+ private static final int MAX_SIZE = 512 * 1024 * 1024;
+
+ public AbstractPointCollector() {
+ pointInfoMap = new ConcurrentHashMap<>();
+ loadFromFile();
+ }
+
+ /**
+ * 获取是否满足触发埋点的要求
+ */
+ protected boolean shouldCollectInfo() {
+ return FileUtils.sizeOf(getInfoFile()) <= MAX_SIZE && DesignerEnvManager.getEnvManager().isJoinProductImprove() && FRContext.isChineseEnv();
+ }
+
+ @Override
+ public void sendPointInfo() {
+
+ addIdleDayCount();
+
+ List removeList = new ArrayList<>();
+ List sendList = new ArrayList<>();
+
+ for (String key : pointInfoMap.keySet()) {
+ AbstractPointInfo pointInfo = pointInfoMap.get(key);
+ pointInfo.selectPoint(removeList, sendList);
+ }
+
+ // 发送记录
+ for (String key : sendList) {
+ if(SendHelper.sendPointInfo(pointInfoMap.get(key))){
+ removeList.add(key);
+ }
+ }
+
+ // 清空记录
+ for (String key : removeList) {
+ pointInfoMap.remove(key);
+ }
+
+ saveInfo();
+ }
+
+ /**
+ * 从文件中读取埋点信息
+ */
+ protected void loadFromFile() {
+ if (!getInfoFile().exists()) {
+ return;
+ }
+
+ XMLableReader reader = null;
+ try (InputStream in = new FileInputStream(getInfoFile())) {
+ // XMLableReader 还是应该考虑实现 Closable 接口的，这样就能使用 try-with 语句了
+ reader = XMLReadHelper.createXMLableReader(in, XMLPrintWriter.XML_ENCODER);
+ if (reader == null) {
+ return;
+ }
+ reader.readXMLObject(this);
+ } catch (FileNotFoundException e) {
+ // do nothing
+ } catch (XMLStreamException | IOException e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ } finally {
+ try {
+ if (reader != null) {
+ reader.close();
+ }
+ } catch (XMLStreamException e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ }
+ }
+
+ /**
+ * 保存埋点信息到文件中
+ */
+ protected void saveInfo() {
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ XMLTools.writeOutputStreamXML(this, out);
+ out.flush();
+ out.close();
+ String fileContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
+ FileUtils.writeStringToFile(getInfoFile(), fileContent, StandardCharsets.UTF_8);
+ } catch (Exception ex) {
+ FineLoggerFactory.getLogger().error(ex.getMessage());
+ }
+ }
+
+ /**
+ * 获取缓存文件存放路径
+ */
+ protected abstract File getInfoFile();
+
+ protected abstract void addIdleDayCount();
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/burying/point/AbstractPointInfo.java b/designer-base/src/main/java/com/fr/design/mainframe/burying/point/AbstractPointInfo.java
new file mode 100644
index 000000000..6646bfd09
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/burying/point/AbstractPointInfo.java
@@ -0,0 +1,55 @@
+package com.fr.design.mainframe.burying.point;
+
+import java.util.List;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-02-21
+ */
+public abstract class AbstractPointInfo implements BasePointInfo {
+
+ protected int idleDayCount; // 到现在为止，埋点闲置的天数
+
+ @Override
+ public void resetIdleDayCount() {
+ this.idleDayCount = 0;
+ }
+
+ @Override
+ public void addIdleDayCountByOne() {
+ this.idleDayCount += 1;
+ }
+
+ /**
+ * 上传前判断该埋点，是否需要被上传，或者删除，或者什么都不做。
+ */
+ @Override
+ public void selectPoint(List removeList, List sendList) {
+ //埋点还未完成，直接返回
+ if (!isComplete()) {
+ return;
+ }
+ //属于测试模板，直接删除，否则发送信息
+ if (isTestTemplate()) {
+ removeList.add(key());
+ } else {
+ sendList.add(key());
+ }
+ }
+
+ /**
+ * 是否为测试模板
+ */
+ protected abstract boolean isTestTemplate();
+
+ /**
+ * 是否已经制作完成
+ */
+ protected abstract boolean isComplete();
+
+ /**
+ * 埋点记录的主键
+ */
+ protected abstract String key();
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/burying/point/BasePointCollector.java b/designer-base/src/main/java/com/fr/design/mainframe/burying/point/BasePointCollector.java
new file mode 100644
index 000000000..f10f1682e
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/burying/point/BasePointCollector.java
@@ -0,0 +1,23 @@
+package com.fr.design.mainframe.burying.point;
+
+import com.fr.design.mainframe.template.info.TemplateProcessInfo;
+import com.fr.stable.xml.XMLReadable;
+import com.fr.stable.xml.XMLWriter;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-02-21
+ */
+public interface BasePointCollector extends XMLReadable, XMLWriter {
+
+ /**
+ * 发送埋点信息到服务器
+ */
+ public void sendPointInfo();
+
+ /**
+ * 保存埋点的信息到本地
+ */
+ public void collectInfo(String templateID, String originID, TemplateProcessInfo processInfo, int timeConsume);
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/burying/point/BasePointInfo.java b/designer-base/src/main/java/com/fr/design/mainframe/burying/point/BasePointInfo.java
new file mode 100644
index 000000000..b45f1cb6a
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/burying/point/BasePointInfo.java
@@ -0,0 +1,35 @@
+package com.fr.design.mainframe.burying.point;
+
+import com.fr.stable.xml.XMLReadable;
+import com.fr.stable.xml.XMLWriter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-02-21
+ */
+public interface BasePointInfo extends XMLReadable, XMLWriter {
+
+ /**
+ * 重置埋点的未编辑天数
+ */
+ void resetIdleDayCount();
+
+ /**
+ * 增加一天埋点的未编辑天数
+ */
+ void addIdleDayCountByOne();
+
+ /**
+ * 上传前判断该埋点，是否需要被上传，或者删除，或者什么都不做。
+ */
+ void selectPoint(List removeList, List sendList);
+
+ /**
+ * 获取要上传的内容，key→上传路径，value→上传内容
+ */
+ Map getSendInfo();
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfo.java b/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfo.java
new file mode 100644
index 000000000..9d305ef1d
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfo.java
@@ -0,0 +1,250 @@
+package com.fr.design.mainframe.chart.info;
+
+import com.fr.base.io.BaseBook;
+import com.fr.config.MarketConfig;
+import com.fr.design.DesignModelAdapter;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.mainframe.burying.point.AbstractPointInfo;
+import com.fr.general.CloudCenter;
+import com.fr.general.GeneralUtils;
+import com.fr.json.JSONObject;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StringUtils;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.third.joda.time.DateTime;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-02-17
+ */
+public class ChartInfo extends AbstractPointInfo {
+ public static final String XML_TAG = "ChartInfo";
+ private static final String CHART_CONSUMING_URL = CloudCenter.getInstance().acquireUrlByKind("chartinfo.consuming") + "/single";
+
+
+ private static final String XML_CHART_CONSUMING_MAP = "chartConsumingMap";
+ private static final String ATTR_TEST_TEMPLATE = "testTemplate";
+ private static final String ATTR_DAY_COUNT = "day_count";
+ private static final String ATTR_USERNAME = "username";
+ private static final String ATTR_UUID = "uuid";
+ private static final String ATTR_ACTIVITYKEY = "activityKey";
+ private static final String ATTR_TEMPLATE_ID = "templateID";
+ private static final String ATTR_REPORT_TYPE = "type";
+ private static final String ATTR_CHART_ID = "chartId";
+ private static final String ATTR_CHART_TYPE = "chartType";
+ private static final String ATTR_CHART_CREATE_TIME = "chartCreateTime";
+ private static final String ATTR_CHART_TYPE_TIME = "chartTypeTime";
+ private static final String ATTR_CHART_PROPERTY_FIRST_TIME = "chartPropertyFirstTime";
+ private static final String ATTR_CHART_PROPERTY_END_TIME = "chartPropertyEndTime";
+ private static final String ATTR_JAR_TIME = "jarTime";
+ private static final String ATTR_VERSION = "version";
+
+ private static final int COMPLETE_DAY_COUNT = 3; // 判断图表是否可以上传的天数
+
+ private String chartId = StringUtils.EMPTY;
+
+ private String templateId = StringUtils.EMPTY;
+
+ private Map chartConsumingMap = new HashMap<>();
+
+ private BaseBook book;
+
+ private boolean testTemplate;
+
+ private ChartInfo() {
+ }
+
+ private ChartInfo(String chartId, String templateId, BaseBook book) {
+ this.chartId = chartId;
+ this.templateId = templateId;
+ this.book = book;
+ }
+
+ public String getChartId() {
+ return chartId;
+ }
+
+ @Override
+ protected String key() {
+ return chartId;
+ }
+
+ public String getTemplateId() {
+ return templateId;
+ }
+
+ public void setTemplateId(String templateId) {
+ this.templateId = templateId;
+ this.chartConsumingMap.put(ATTR_TEMPLATE_ID, templateId);
+ }
+
+
+ public BaseBook getBook() {
+ return book;
+ }
+
+ @Override
+ public boolean isTestTemplate() {
+ return testTemplate;
+ }
+
+ public void setTestTemplate(boolean testTemplate) {
+ this.testTemplate = testTemplate;
+ }
+
+ static ChartInfo newInstanceByRead(XMLableReader reader) {
+ ChartInfo chartInfo = new ChartInfo();
+ reader.readXMLObject(chartInfo);
+ return chartInfo;
+ }
+
+ public static ChartInfo newInstance(String chartId, String chartType) {
+ return newInstance(chartId, chartType, null);
+ }
+
+ public static ChartInfo newInstance(String chartId, String chartType, String createTime) {
+ HashMap chartConsumingMap = new HashMap<>();
+
+ String username = MarketConfig.getInstance().getBbsUsername();
+ String uuid = DesignerEnvManager.getEnvManager().getUUID();
+ String activityKey = DesignerEnvManager.getEnvManager().getActivationKey();
+
+ BaseBook book = DesignModelAdapter.getCurrentModelAdapter().getBook();
+ String templateId = book.getTemplateID();
+ int reportType = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getProcessInfo().getReportType();
+
+ String typeTime = DateTime.now().toString("yyyy-MM-dd HH:mm:ss");
+
+ createTime = createTime == null ? typeTime : createTime;
+
+ String jarTime = GeneralUtils.readBuildNO();
+ String version = ProductConstants.VERSION;
+ chartConsumingMap.put(ATTR_USERNAME, username);
+ chartConsumingMap.put(ATTR_UUID, uuid);
+ chartConsumingMap.put(ATTR_ACTIVITYKEY, activityKey);
+ chartConsumingMap.put(ATTR_TEMPLATE_ID, templateId);
+ chartConsumingMap.put(ATTR_REPORT_TYPE, String.valueOf(reportType));
+ chartConsumingMap.put(ATTR_CHART_ID, chartId);
+ chartConsumingMap.put(ATTR_CHART_TYPE, chartType);
+ chartConsumingMap.put(ATTR_CHART_CREATE_TIME, createTime);
+ chartConsumingMap.put(ATTR_CHART_TYPE_TIME, typeTime);
+ chartConsumingMap.put(ATTR_CHART_PROPERTY_FIRST_TIME, "");
+ chartConsumingMap.put(ATTR_CHART_PROPERTY_END_TIME, "");
+ chartConsumingMap.put(ATTR_JAR_TIME, jarTime);
+ chartConsumingMap.put(ATTR_VERSION, version);
+
+ ChartInfo chartInfo = new ChartInfo(chartId, templateId, book);
+ chartInfo.chartConsumingMap = chartConsumingMap;
+
+ return chartInfo;
+ }
+
+ @Override
+ public void writeXML(XMLPrintWriter writer) {
+ writer.startTAG(XML_TAG);
+ if (StringUtils.isNotEmpty(chartId)) {
+ writer.attr(ATTR_CHART_ID, this.chartId);
+ }
+ if (StringUtils.isNotEmpty(templateId)) {
+ writer.attr(ATTR_TEMPLATE_ID, this.templateId);
+ }
+ if (idleDayCount >= 0) {
+ writer.attr(ATTR_DAY_COUNT, this.idleDayCount);
+ }
+ writer.attr(ATTR_TEST_TEMPLATE, this.testTemplate);
+ writer.startTAG(XML_CHART_CONSUMING_MAP);
+ writer.attr(ATTR_USERNAME, chartConsumingMap.get(ATTR_USERNAME));
+ writer.attr(ATTR_UUID, chartConsumingMap.get(ATTR_UUID));
+ writer.attr(ATTR_ACTIVITYKEY, chartConsumingMap.get(ATTR_ACTIVITYKEY));
+ writer.attr(ATTR_REPORT_TYPE, chartConsumingMap.get(ATTR_REPORT_TYPE));
+ writer.attr(ATTR_CHART_TYPE, chartConsumingMap.get(ATTR_CHART_TYPE));
+ writer.attr(ATTR_CHART_CREATE_TIME, chartConsumingMap.get(ATTR_CHART_CREATE_TIME));
+ writer.attr(ATTR_CHART_TYPE_TIME, chartConsumingMap.get(ATTR_CHART_TYPE_TIME));
+ writer.attr(ATTR_CHART_PROPERTY_FIRST_TIME, chartConsumingMap.get(ATTR_CHART_PROPERTY_FIRST_TIME));
+ writer.attr(ATTR_CHART_PROPERTY_END_TIME, chartConsumingMap.get(ATTR_CHART_PROPERTY_END_TIME));
+ writer.attr(ATTR_JAR_TIME, chartConsumingMap.get(ATTR_JAR_TIME));
+ writer.attr(ATTR_VERSION, chartConsumingMap.get(ATTR_VERSION));
+ writer.end();
+ writer.end();
+ }
+
+ @Override
+ public void readXML(XMLableReader reader) {
+
+ if (!reader.isChildNode()) {
+ idleDayCount = reader.getAttrAsInt(ATTR_DAY_COUNT, 0);
+ chartId = reader.getAttrAsString(ATTR_CHART_ID, StringUtils.EMPTY);
+ templateId = reader.getAttrAsString(ATTR_TEMPLATE_ID, StringUtils.EMPTY);
+ testTemplate = reader.getAttrAsBoolean(ATTR_TEST_TEMPLATE, true);
+ } else {
+ String name = reader.getTagName();
+ if (XML_CHART_CONSUMING_MAP.equals(name)) {
+ chartConsumingMap.put(ATTR_USERNAME, reader.getAttrAsString(ATTR_USERNAME, StringUtils.EMPTY));
+ chartConsumingMap.put(ATTR_UUID, reader.getAttrAsString(ATTR_UUID, StringUtils.EMPTY));
+ chartConsumingMap.put(ATTR_ACTIVITYKEY, reader.getAttrAsString(ATTR_ACTIVITYKEY, StringUtils.EMPTY));
+ chartConsumingMap.put(ATTR_TEMPLATE_ID, templateId);
+ chartConsumingMap.put(ATTR_REPORT_TYPE, reader.getAttrAsString(ATTR_REPORT_TYPE, "0"));
+ chartConsumingMap.put(ATTR_CHART_ID, chartId);
+ chartConsumingMap.put(ATTR_CHART_TYPE, reader.getAttrAsString(ATTR_CHART_TYPE, StringUtils.EMPTY));
+ chartConsumingMap.put(ATTR_CHART_CREATE_TIME, reader.getAttrAsString(ATTR_CHART_CREATE_TIME, StringUtils.EMPTY));
+ chartConsumingMap.put(ATTR_CHART_TYPE_TIME, reader.getAttrAsString(ATTR_CHART_TYPE_TIME, StringUtils.EMPTY));
+ chartConsumingMap.put(ATTR_CHART_PROPERTY_FIRST_TIME, reader.getAttrAsString(ATTR_CHART_PROPERTY_FIRST_TIME, StringUtils.EMPTY));
+ chartConsumingMap.put(ATTR_CHART_PROPERTY_END_TIME, reader.getAttrAsString(ATTR_CHART_PROPERTY_END_TIME, StringUtils.EMPTY));
+ chartConsumingMap.put(ATTR_JAR_TIME, reader.getAttrAsString(ATTR_JAR_TIME, StringUtils.EMPTY));
+ chartConsumingMap.put(ATTR_VERSION, reader.getAttrAsString(ATTR_VERSION, "8.0"));
+ }
+ }
+ }
+
+ @Override
+ public boolean isComplete() {
+ // 连续3天打开了设计器但是没有编辑
+ return idleDayCount > COMPLETE_DAY_COUNT;
+ }
+
+ @Override
+ public Map getSendInfo() {
+ Map sendMap = new HashMap<>();
+ sendMap.put(CHART_CONSUMING_URL, new JSONObject(chartConsumingMap).toString());
+ return sendMap;
+ }
+
+ public void updatePropertyTime() {
+ String propertyTime = DateTime.now().toString("yyyy-MM-dd HH:mm:ss");
+
+ if (StringUtils.isEmpty(chartConsumingMap.get(ATTR_CHART_PROPERTY_FIRST_TIME))) {
+ chartConsumingMap.put(ATTR_CHART_PROPERTY_FIRST_TIME, propertyTime);
+ }
+ chartConsumingMap.put(ATTR_CHART_PROPERTY_END_TIME, propertyTime);
+ }
+
+ public void updateChartType(String chartType) {
+ String typeTime = DateTime.now().toString("yyyy-MM-dd HH:mm:ss");
+
+ chartConsumingMap.put(ATTR_CHART_TYPE_TIME, typeTime);
+ chartConsumingMap.put(ATTR_CHART_TYPE, chartType);
+ chartConsumingMap.put(ATTR_CHART_PROPERTY_FIRST_TIME, "");
+ chartConsumingMap.put(ATTR_CHART_PROPERTY_END_TIME, "");
+ }
+
+ @Override
+ public ChartInfo clone() {
+ ChartInfo chartInfo = new ChartInfo();
+ chartInfo.chartId = this.chartId;
+ chartInfo.idleDayCount = this.idleDayCount;
+ chartInfo.templateId = this.templateId;
+ chartInfo.testTemplate = this.testTemplate;
+ Map chartConsumingMap = new HashMap<>();
+ for (Map.Entry entry : this.chartConsumingMap.entrySet()) {
+ chartConsumingMap.put(entry.getKey(), entry.getValue());
+ }
+ chartInfo.chartConsumingMap = chartConsumingMap;
+ return chartInfo;
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfoCollector.java b/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfoCollector.java
new file mode 100644
index 000000000..d622c688a
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfoCollector.java
@@ -0,0 +1,248 @@
+package com.fr.design.mainframe.chart.info;
+
+import com.fr.base.io.BaseBook;
+import com.fr.chartx.attr.ChartProvider;
+import com.fr.design.mainframe.burying.point.AbstractPointCollector;
+import com.fr.design.mainframe.template.info.TemplateInfo;
+import com.fr.design.mainframe.template.info.TemplateProcessInfo;
+import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.vanchart.VanChart;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.third.joda.time.DateTime;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-02-18
+ */
+public class ChartInfoCollector extends AbstractPointCollector {
+ private static final String XML_TAG = "ChartInfoCollector";
+ private static final String XML_LAST_EDIT_DAY = "lastEditDay";
+
+ private static final String XML_CHART_INFO_LIST = "ChartInfoList";
+ private static final String XML_FILE_NAME = "chart.info";
+
+ private static ChartInfoCollector instance;
+
+ private Map chartInfoCacheMap;
+
+ private String lastEditDay;
+
+ private ChartInfoCollector() {
+ init();
+ }
+
+ private void init() {
+ chartInfoCacheMap = new HashMap<>();
+ }
+
+ public static ChartInfoCollector getInstance() {
+ if (instance == null) {
+ instance = new ChartInfoCollector();
+ }
+ return instance;
+ }
+
+ public void collection(ChartProvider chartProvider, String createTime) {
+ if (chartProvider instanceof VanChart) {
+ VanChart vanChart = (VanChart) chartProvider;
+ collection(vanChart.getUuid(), vanChart.getID(), createTime);
+ }
+ }
+
+ /**
+ * 新建图表，保存状态
+ */
+ public void collection(String chartId, String chartType, String createTime) {
+ if (!shouldCollectInfo()) {
+ return;
+ }
+
+ ChartInfo chartInfo = ChartInfo.newInstance(chartId, chartType, createTime);
+ chartInfoCacheMap.put(chartId, chartInfo);
+ }
+
+ public void updateChartPropertyTime(ChartProvider chartProvider) {
+ if (chartProvider instanceof VanChart) {
+ VanChart vanChart = (VanChart) chartProvider;
+ updateChartPropertyTime(vanChart.getUuid(), vanChart.getID());
+ }
+ }
+
+ /**
+ * 图表编辑，更新编辑时间
+ */
+ public void updateChartPropertyTime(String chartId, String chartType) {
+ if (!shouldCollectInfo()) {
+ return;
+ }
+ ChartInfo chartInfo = getOrCreateChartInfo(chartId, chartType);
+
+ //更新编辑时间
+ chartInfo.updatePropertyTime();
+
+ //重置计数
+ chartInfo.resetIdleDayCount();
+ }
+
+ public void updateChartTypeTime(ChartProvider chartProvider) {
+ if (chartProvider instanceof VanChart) {
+ VanChart vanChart = (VanChart) chartProvider;
+ updateChartTypeTime(vanChart.getUuid(), vanChart.getID());
+ }
+ }
+
+ /**
+ * 图表类型变化，更新类型和类型确认时间
+ */
+ public void updateChartTypeTime(String chartId, String chartType) {
+ if (!shouldCollectInfo()) {
+ return;
+ }
+
+ ChartInfo chartInfo = getOrCreateChartInfo(chartId, chartType);
+
+ //更新类型确认时间和类型
+ chartInfo.updateChartType(chartType);
+
+ //重置计数
+ chartInfo.resetIdleDayCount();
+ }
+
+ private ChartInfo getOrCreateChartInfo(String chartId, String chartType) {
+ //缓存中有从缓存中拿
+ if (chartInfoCacheMap.containsKey(chartId)) {
+ return chartInfoCacheMap.get(chartId);
+ }
+ //缓存中没有从文件中读取的信息中拷贝到缓存
+ if (pointInfoMap.containsKey(chartId)) {
+ ChartInfo chartInfo = pointInfoMap.get(chartId).clone();
+ chartInfoCacheMap.put(chartId, chartInfo);
+ return chartInfo;
+ }
+ //都有的话创建一个并加入到缓存中
+ ChartInfo chartInfo = ChartInfo.newInstance(chartId, chartType);
+ chartInfoCacheMap.put(chartId, chartInfo);
+ return chartInfo;
+ }
+
+ /**
+ * 保存模板的时候将该模板中的图表埋点信息保存
+ */
+ @Override
+ public void collectInfo(String templateId, String originID, TemplateProcessInfo processInfo, int timeConsume) {
+ if (!shouldCollectInfo()) {
+ return;
+ }
+ if (StringUtils.isEmpty(originID)) {
+ originID = templateId;
+ }
+ boolean testTemplate = isTestTemplate(processInfo);
+
+ for (ChartInfo chartInfo : pointInfoMap.values()) {
+ if (originID.equals(chartInfo.getTemplateId())) {
+ chartInfo.setTemplateId(templateId);
+ chartInfo.setTestTemplate(testTemplate);
+ }
+ }
+
+ for (ChartInfo chartInfo : chartInfoCacheMap.values()) {
+ BaseBook book = chartInfo.getBook();
+ if ((book != null && templateId.equals(book.getTemplateID())) ||
+ originID.equals(chartInfo.getTemplateId())) {
+ chartInfo.setTemplateId(templateId);
+ chartInfo.setTestTemplate(testTemplate);
+ pointInfoMap.put(chartInfo.getChartId(), chartInfo);
+ }
+ }
+
+ // 每次更新之后，都同步到暂存文件中
+ saveInfo();
+ }
+
+ private boolean isTestTemplate(TemplateProcessInfo processInfo) {
+ int reportType = processInfo.getReportType();
+ int cellCount = processInfo.getCellCount();
+ int floatCount = processInfo.getFloatCount();
+ int blockCount = processInfo.getBlockCount();
+ int widgetCount = processInfo.getWidgetCount();
+
+ return TemplateInfo.isTestTemplate(reportType, cellCount, floatCount, blockCount, widgetCount);
+ }
+
+ /**
+ * 更新 day_count：打开设计器却未编辑图表的连续日子
+ */
+ @Override
+ protected void addIdleDayCount() {
+ // 判断今天是否第一次打开设计器，为了防止同一天内，多次 addIdleDayCount
+ String today = DateTime.now().toString("yyyy-MM-dd");
+ if (ComparatorUtils.equals(today, lastEditDay)) {
+ return;
+ }
+ for (ChartInfo chartInfo : pointInfoMap.values()) {
+ chartInfo.addIdleDayCountByOne();
+ }
+ lastEditDay = today;
+ }
+
+
+ /**
+ * 获取缓存文件存放路径
+ */
+ @Override
+ protected File getInfoFile() {
+ File file = new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), XML_FILE_NAME));
+ try {
+ if (!file.exists()) {
+ file.createNewFile();
+ }
+ } catch (Exception ex) {
+ FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
+ }
+ return file;
+ }
+
+ @Override
+ public void readXML(XMLableReader reader) {
+ if (reader.isChildNode()) {
+ try {
+ String name = reader.getTagName();
+ if (ChartInfo.XML_TAG.equals(name)) {
+ ChartInfo chartInfo = ChartInfo.newInstanceByRead(reader);
+ pointInfoMap.put(chartInfo.getChartId(), chartInfo);
+ } else if (XML_LAST_EDIT_DAY.equals(name)) {
+ lastEditDay = reader.getElementValue();
+ }
+ } catch (Exception ex) {
+ // 什么也不做，使用默认值
+ }
+ }
+ }
+
+ @Override
+ public void writeXML(XMLPrintWriter writer) {
+ writer.startTAG(XML_TAG);
+
+ writer.startTAG(XML_LAST_EDIT_DAY);
+ writer.textNode(lastEditDay);
+ writer.end();
+
+ writer.startTAG(XML_CHART_INFO_LIST);
+ for (ChartInfo chartInfo : pointInfoMap.values()) {
+ chartInfo.writeXML(writer);
+ }
+ writer.end();
+
+ writer.end();
+ }
+}
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java b/designer-base/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java
similarity index 94%
rename from designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java
rename to designer-base/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java
index 9bfd729dd..99950edae 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java
@@ -21,6 +21,9 @@ import java.util.Date;
*/
public class ErrorInfo {
+ private static final String SUFFIX = ".json";
+ private static final String FOLDER_NAME = "errorInfo";
+
private String username;
private String uuid;
private String activekey;
@@ -128,8 +131,8 @@ public class ErrorInfo {
public void saveFileToCache(JSONObject jo) {
String content = jo.toString();
- String fileName = UUID.randomUUID() + ErrorInfoUploader.SUFFIX;
- File file = new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), ErrorInfoUploader.FOLDER_NAME, fileName));
+ String fileName = UUID.randomUUID() + SUFFIX;
+ File file = new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), FOLDER_NAME, fileName));
FileOutputStream out = null;
try (InputStream in = new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8))) {
StableUtils.makesureFileExist(file);
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
index 57d1d457f..5937770c4 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
@@ -53,6 +53,12 @@ public class DesignerLogHandler {
private static final int SERVER_GAP_Y = -20;
+ private static final String ERROR_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + ":";
+
+ private static final String WARN_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + ":";
+
+ private static final String NORMAL_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Normal") + ":";
+
public static DesignerLogHandler getInstance() {
return HOLDER.singleton;
@@ -310,11 +316,11 @@ public class DesignerLogHandler {
private String appendLocaleMark(String str, int style) {
if (style == DesignerLogger.ERROR_INT) {
- str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + ":" + str + "\n";
+ str = ERROR_MARK + str + "\n";
} else if (style == DesignerLogger.WARN_INT) {
- str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + ":" + str + "\n";
+ str = WARN_MARK + str + "\n";
} else {
- str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Normal") + ":" + str + "\n";
+ str = NORMAL_MARK + str + "\n";
}
return str;
}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogDetailPane.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogDetailPane.java
index 5ea260f46..0ed638616 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogDetailPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogDetailPane.java
@@ -6,6 +6,7 @@ import javax.swing.JFrame;
import javax.swing.JPanel;
import com.fr.base.BaseUtils;
+import com.fr.design.i18n.Toolkit;
import com.fr.design.utils.gui.GUICoreUtils;
public class LogDetailPane extends JPanel{
@@ -20,7 +21,7 @@ public class LogDetailPane extends JPanel{
fr.setSize(600, 400);
GUICoreUtils.centerWindow(fr);
fr.setResizable(false);
- fr.setTitle("日志");
+ fr.setTitle(Toolkit.i18nText("Fine-Design_Basic_Log"));
fr.setIconImage(BaseUtils.readImageWithCache("com/fr/design/images/buttonicon/history.png"));
fr.getContentPane().setLayout(new BorderLayout());
fr.getContentPane().add(this, BorderLayout.CENTER);
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java
index 5a4ba1eda..bbb9eed34 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java
@@ -69,7 +69,7 @@ public class LogHandlerBarUI extends ComponentUI implements MouseListener, Focus
int w = button.getWidth();
int h = button.getHeight();
Graphics2D g2d = (Graphics2D) g;
- GradientPaint gp = new GradientPaint(1, 1, darkColor, 1, h - 1, darkColor);
+ GradientPaint gp = new GradientPaint(1, 1, darkColor, 1, (float)(h - 1), darkColor);
g2d.setPaint(gp);
g2d.fillRect(0, 0, w, h);
}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java b/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java
new file mode 100644
index 000000000..ca3fd13cc
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java
@@ -0,0 +1,44 @@
+package com.fr.design.mainframe.messagecollect;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.mainframe.errorinfo.ErrorInfo;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
+
+/**
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/1/8
+ */
+public class StartErrorMessageCollector {
+
+ private static final StartErrorMessageCollector INSTANCE = new StartErrorMessageCollector();
+
+ private String uuid;
+ private String activeKey;
+
+
+ public static StartErrorMessageCollector getInstance() {
+ return INSTANCE;
+ }
+
+ private StartErrorMessageCollector() {
+ DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
+ this.uuid = envManager.getUUID();
+ this.activeKey = envManager.getActivationKey();
+ }
+
+ public void record(String id, String msg, String detail) {
+ FineLoggerFactory.getLogger().error(id + ": " + msg + ", detail: " + detail);
+ ErrorInfo errorInfo = new ErrorInfo(StringUtils.EMPTY, uuid, activeKey);
+ errorInfo.setLogid(id);
+ errorInfo.setLog(msg);
+ errorInfo.setStackTrace(detail);
+ errorInfo.saveAsJSON();
+ }
+
+ public void record(String id, String msg) {
+ record(id, msg, StringUtils.EMPTY);
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/entity/DesignerErrorMessage.java b/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/entity/DesignerErrorMessage.java
new file mode 100644
index 000000000..d2047336e
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/entity/DesignerErrorMessage.java
@@ -0,0 +1,37 @@
+package com.fr.design.mainframe.messagecollect.entity;
+
+import com.fr.design.i18n.Toolkit;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/1/8
+ */
+public enum DesignerErrorMessage {
+
+ DESIGNER_PROCESS_OCCUPIED("11300201", Toolkit.i18nText("Fine-Design_Error_Process_Occupied_Message")),
+ PORT_OCCUPIED("11300202", Toolkit.i18nText("Fine-Design_Error_Port_Occupied_Message")),
+ FINEDB_PROBLEM("11300203", Toolkit.i18nText("Fine-Design_Error_Finedb_Problem_Message")),
+ DESIGNER_OUT_OF_MEMORY("11300204", Toolkit.i18nText("Fine-Design_Error_Out_Of_Memory_Message")),
+ REMOTE_DESIGN_NO_RESPONSE("11300205", Toolkit.i18nText("Fine-Design_Error_Remote_No_Response_Message")),
+ UNEXCEPTED_START_FAILED("11300200", Toolkit.i18nText("Fine-Design_Error_UnExcepted_Start_Failed")),
+ UNEXCEPTED_FALL_BACK("11300400 ", Toolkit.i18nText("Fine-Design_Error_UnExcepted_Fall_Back"));
+
+
+
+ private String id;
+ private String message;
+
+ public String getId() {
+ return id;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ DesignerErrorMessage(String id, String message) {
+ this.id = id;
+ this.message = message;
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileBookMarkStyleCustomDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileBookMarkStyleCustomDefinePane.java
new file mode 100644
index 000000000..20a14ea22
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileBookMarkStyleCustomDefinePane.java
@@ -0,0 +1,27 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.form.ui.mobile.MobileBookMarkStyle;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/24
+ */
+public class DefaultMobileBookMarkStyleCustomDefinePane extends BasicBeanPane {
+
+ @Override
+ public void populateBean(MobileBookMarkStyle ob) {
+
+ }
+
+ @Override
+ public MobileBookMarkStyle updateBean() {
+ return null;
+ }
+
+ @Override
+ protected String title4PopupWindow() {
+ return null;
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileBookMarkStyleProvider.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileBookMarkStyleProvider.java
new file mode 100644
index 000000000..709afefe4
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileBookMarkStyleProvider.java
@@ -0,0 +1,29 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.fun.impl.AbstractMobileBookMarkStyleProvider;
+import com.fr.form.ui.mobile.impl.DefaultMobileBookMarkStyle;
+import com.fr.form.ui.mobile.MobileBookMarkStyle;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/24
+ */
+public class DefaultMobileBookMarkStyleProvider extends AbstractMobileBookMarkStyleProvider {
+
+ @Override
+ public Class classForMobileBookMarkStyle() {
+ return DefaultMobileBookMarkStyle.class;
+ }
+
+ @Override
+ public Class> classForMobileBookMarkStyleAppearance() {
+ return DefaultMobileBookMarkStyleCustomDefinePane.class;
+ }
+
+ @Override
+ public String displayName() {
+ return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_None_BookMark_Style");
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileBookMarkStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileBookMarkStyleDefinePane.java
new file mode 100644
index 000000000..7812e8f32
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileBookMarkStyleDefinePane.java
@@ -0,0 +1,61 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.fun.MobileBookMarkStyleProvider;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.form.ui.mobile.MobileBookMarkStyle;
+import com.fr.general.ComparatorUtils;
+import com.fr.invoke.Reflect;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/23
+ */
+public class MobileBookMarkStyleDefinePane extends BasicBeanPane {
+
+ private BasicBeanPane customDefinePane;
+ private String displayName;
+
+ MobileBookMarkStyleDefinePane(MobileBookMarkStyleProvider bookMarkStyleProvider) {
+ this.customDefinePane = Reflect.on(
+ bookMarkStyleProvider.classForMobileBookMarkStyleAppearance()).create().get();
+ this.displayName = bookMarkStyleProvider.displayName();
+ initComponent();
+ }
+
+ private void initComponent() {
+ this.setLayout(FRGUIPaneFactory.createBorderLayout());
+ this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+ JPanel settingPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ if (!ComparatorUtils.equals(displayName, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_None_BookMark_Style"))) {
+ JPanel hintLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ hintLabelPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
+ UILabel hintLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Hint"));
+ hintLabel.setForeground(Color.GRAY);
+ hintLabelPane.add(hintLabel);
+ settingPane.add(hintLabelPane, BorderLayout.NORTH);
+ }
+ settingPane.add(this.customDefinePane, BorderLayout.CENTER);
+ this.add(settingPane, BorderLayout.CENTER);
+ }
+
+ @Override
+ public void populateBean(MobileBookMarkStyle ob) {
+ this.customDefinePane.populateBean(ob);
+ }
+
+ @Override
+ public MobileBookMarkStyle updateBean() {
+ return this.customDefinePane.updateBean();
+ }
+
+ @Override
+ protected String title4PopupWindow() {
+ return "MobileBookMarkStyleDefinePane";
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileBookMarkStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileBookMarkStylePane.java
new file mode 100644
index 000000000..4828b2bc8
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileBookMarkStylePane.java
@@ -0,0 +1,148 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.fun.MobileBookMarkStyleProvider;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.form.ui.mobile.MobileBookMarkStyle;
+
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/23
+ */
+public class MobileBookMarkStylePane extends BasicBeanPane {
+ public static final int LEFT_PANEL_WIDTH = 140;
+ public static final int LEFT_PANEL_HEIGHT = 565;
+ public static final int RIGHT_PANEL_WIDTH = 510;
+ public static final int RIGHT_PANEL_HEIGHT = 565;
+
+
+ public static ListCellRenderer renderer = new DefaultListCellRenderer() {
+ @Override
+ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
+ boolean cellHasFocus) {
+ super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+ if (value instanceof MobileBookMarkStyle) {
+ this.setText((value.toString()));
+ }
+ return this;
+ }
+ };
+
+ private DefaultListModel listModel;
+ private JList bookMarkList;
+ private JPanel rightPane;
+ private CardLayout card;
+ private Map> map = new HashMap<>();
+
+ public MobileBookMarkStylePane() {
+ initComponent();
+ }
+
+ private void initComponent() {
+ this.setLayout(FRGUIPaneFactory.createBorderLayout());
+ this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+ this.listModel = new DefaultListModel<>();
+ this.card = new CardLayout();
+ this.rightPane = FRGUIPaneFactory.createCardLayout_S_Pane();
+ this.rightPane.setLayout(card);
+ initDefaultAndExtraPanel();
+ initLeftListPanel();
+ initRightPanel();
+ }
+
+ private void initDefaultAndExtraPanel() {
+ List list = getMobileBookMarkStyleProvider();
+ for (MobileBookMarkStyleProvider bookMarkStyleProvider : list) {
+ String displayName = bookMarkStyleProvider.displayName();
+ MobileBookMarkStyleDefinePane mobileBookMarkStyleDefinePane = new MobileBookMarkStyleDefinePane(
+ bookMarkStyleProvider);
+ listModel.addElement(displayName);
+ rightPane.add(displayName, mobileBookMarkStyleDefinePane);
+ map.put(displayName, mobileBookMarkStyleDefinePane);
+ }
+ }
+
+ private void initLeftListPanel() {
+ bookMarkList = new JList<>(listModel);
+ bookMarkList.setCellRenderer(renderer);
+ bookMarkList.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ card.show(rightPane, (String) bookMarkList.getSelectedValue());
+ }
+ });
+ JPanel leftPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ leftPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+ leftPanel.add(bookMarkList, BorderLayout.CENTER);
+ leftPanel.setPreferredSize(new Dimension(LEFT_PANEL_WIDTH, LEFT_PANEL_HEIGHT));
+ this.add(leftPanel, BorderLayout.WEST);
+ }
+
+ private void initRightPanel() {
+ JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ centerPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+ centerPane.setPreferredSize(new Dimension(RIGHT_PANEL_WIDTH, RIGHT_PANEL_HEIGHT));
+ centerPane.add(rightPane, BorderLayout.CENTER);
+ this.add(centerPane, BorderLayout.CENTER);
+ }
+
+
+ private List getMobileBookMarkStyleProvider() {
+ DefaultMobileBookMarkStyleProvider defaultMobileBookMarkStyleProvider = new DefaultMobileBookMarkStyleProvider();
+ SidebarMobileBookMarkStyleProvider sidebarMobileBookMarkStyleProvider = new SidebarMobileBookMarkStyleProvider();
+ Set mobileBookMarkStyleProviders = ExtraDesignClassManager.getInstance().getArray(
+ MobileBookMarkStyleProvider.XML_TAG);
+ List list = new ArrayList<>();
+ list.add(defaultMobileBookMarkStyleProvider);
+ list.add(sidebarMobileBookMarkStyleProvider);
+ list.addAll(mobileBookMarkStyleProviders);
+ return Collections.unmodifiableList(list);
+ }
+
+ @Override
+ protected String title4PopupWindow() {
+ return null;
+ }
+
+
+ @Override
+ public void populateBean(MobileBookMarkStyle mobileBookMarkStyle) {
+ if (mobileBookMarkStyle != null) {
+ List bookMarkStyleProviders = getMobileBookMarkStyleProvider();
+ int i = 0;
+ for (MobileBookMarkStyleProvider bookMarkStyleProvider : bookMarkStyleProviders) {
+ if (mobileBookMarkStyle.getClass() == bookMarkStyleProvider.classForMobileBookMarkStyle()) {
+ String displayName = bookMarkStyleProvider.displayName();
+ bookMarkList.setSelectedIndex(i);
+ map.get(displayName).populateBean(mobileBookMarkStyle);
+ card.show(rightPane, displayName);
+ return;
+ }
+ i++;
+ }
+ }
+ bookMarkList.setSelectedIndex(0);
+ }
+
+ @Override
+ public MobileBookMarkStyle updateBean() {
+ return map.get(bookMarkList.getSelectedValue()).updateBean();
+ }
+
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java
new file mode 100644
index 000000000..766f06d51
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java
@@ -0,0 +1,72 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.itextfield.UIIntNumberField;
+import com.fr.design.gui.itextfield.UINumberField;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.widget.UITitleSplitLine;
+import com.fr.form.ui.mobile.MobileCollapsedStyle;
+import com.fr.form.ui.mobile.MobileFormCollapsedStyle;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/2/13
+ */
+public class MobileCollapsedStyleExpandPane extends MobileCollapsedStylePane {
+
+ private static final Dimension DEFAULT_SPINNER_SIZE = new Dimension(60, 24);
+
+ private UISpinner rowSpinner;
+
+ public MobileCollapsedStyleExpandPane() {
+ }
+
+
+ @Override
+ protected JPanel createLinePane() {
+ UITitleSplitLine splitLine = new UITitleSplitLine(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Line_Number"), 520);
+ splitLine.setPreferredSize(new Dimension(520, 20));
+ this.rowSpinner = new UISpinner(1, Integer.MAX_VALUE, 1, 1) {
+ @Override
+ protected UINumberField initNumberField(){
+ return new UIIntNumberField();
+ }
+ };
+ rowSpinner.setPreferredSize(DEFAULT_SPINNER_SIZE);
+ JPanel panel = new JPanel();
+ panel.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
+ panel.add(new UILabel(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Start_From")));
+ panel.add(rowSpinner);
+ panel.add(new UILabel(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Row_To_Fold")));
+ JPanel linePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ linePane.add(splitLine, BorderLayout.NORTH);
+ linePane.add(panel, BorderLayout.CENTER);
+ return linePane;
+ }
+
+ @Override
+ public void populateBean(MobileCollapsedStyle ob) {
+ super.populateBean(ob);
+ rowSpinner.setValue(((MobileFormCollapsedStyle) ob).getLineAttr().getNumber());
+ }
+
+ @Override
+ public MobileCollapsedStyle updateBean() {
+ MobileCollapsedStyle style = super.updateBean();
+ ((MobileFormCollapsedStyle) style).getLineAttr().setNumber((int) rowSpinner.getValue());
+ return style;
+ }
+
+ @Override
+ protected MobileCollapsedStyle updateDiffBean() {
+ return new MobileFormCollapsedStyle();
+ }
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStylePane.java
new file mode 100644
index 000000000..74538e77c
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStylePane.java
@@ -0,0 +1,145 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.gui.ibutton.ModeButtonGroup;
+import com.fr.design.gui.ibutton.UIRadioButton;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.layout.VerticalFlowLayout;
+import com.fr.design.mainframe.widget.UITitleSplitLine;
+import com.fr.design.style.color.NewColorSelectBox;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.form.ui.mobile.CollapseState;
+import com.fr.form.ui.mobile.MobileChartCollapsedStyle;
+import com.fr.form.ui.mobile.MobileCollapsedStyle;
+
+import javax.swing.*;
+import javax.swing.border.TitledBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/2/13
+ */
+public class MobileCollapsedStylePane extends BasicBeanPane {
+
+ private UICheckBox showButtonCheck;
+ private NewColorSelectBox buttonColorBox;
+ private UITextField foldedTextFiled;
+ private UITextField unfoldedTextFiled;
+ private ModeButtonGroup buttonGroup;
+
+
+ public MobileCollapsedStylePane() {
+ TitledBorder titledBorder = GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"), null);
+ VerticalFlowLayout layout = new VerticalFlowLayout(FlowLayout.LEADING, 0, 10);
+ layout.setAlignLeft(true);
+ this.setBorder(titledBorder);
+ this.setLayout(layout);
+ this.add(createLinePane());
+ this.add(createSettingPane());
+ }
+
+ private JPanel createSettingPane() {
+ JPanel settingPane = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 0);
+ UITitleSplitLine splitLine = new UITitleSplitLine(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Button"), 520);
+ splitLine.setPreferredSize(new Dimension(520, 20));
+ UILabel showButtonLabel = new UILabel(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Show_Button"));
+ showButtonCheck = new UICheckBox(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Show_Button_On_Right"));
+ showButtonCheck.setPreferredSize(new Dimension(140, 24));
+ UILabel buttonColorLabel = new UILabel(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Button_Color"));
+ buttonColorBox = new NewColorSelectBox(137);
+ UILabel foldedLabel = new UILabel(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Folded_Hint"));
+ foldedTextFiled = new UITextField();
+ UILabel unfoldedLabel = new UILabel(Toolkit.i18nText("Fine-Design_Mobile_Collapse_UnFolded_Hint"));
+ unfoldedTextFiled = new UITextField();
+ UILabel defaultStateLabel = new UILabel(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Default_State"));
+ buttonGroup = new ModeButtonGroup<>();
+ UIRadioButton foldedButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Fold"));
+ foldedButton.setSelected(true);
+ UIRadioButton unfoldedButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Unfold"));
+ buttonGroup.put(CollapseState.FOLDED, foldedButton);
+ buttonGroup.put(CollapseState.UNFOLDED, unfoldedButton);
+ JPanel flowLeftPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
+ flowLeftPane.add(foldedButton);
+ flowLeftPane.add(unfoldedButton);
+ Component[][] northComponents = new Component[][] {
+ new Component[] {showButtonLabel, showButtonCheck}
+ };
+ Component[][] southComponents = new Component[][] {
+ new Component[] {defaultStateLabel, flowLeftPane}
+ };
+ double f = TableLayout.FILL;
+ double p = TableLayout.PREFERRED;
+ double[] rowSize = {p, p, p, p, p};
+ double[] colSize = {p, f};
+ int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
+ Component[][] centerComponents = new Component[][] {
+ new Component[] {buttonColorLabel, buttonColorBox},
+ new Component[] {foldedLabel, foldedTextFiled},
+ new Component[] {unfoldedLabel, unfoldedTextFiled},
+ };
+ JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(northComponents, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
+ JPanel southPane = TableLayoutHelper.createGapTableLayoutPane(southComponents, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+ final JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(centerComponents, rowSize, colSize, rowCount, LayoutConstants.HGAP_LARGE, LayoutConstants.VGAP_SMALL);
+ JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ panel.add(northPane, BorderLayout.NORTH);
+ panel.add(centerPane, BorderLayout.CENTER);
+ panel.add(southPane, BorderLayout.SOUTH);
+ settingPane.add(splitLine);
+ settingPane.add(panel);
+ showButtonCheck.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ centerPane.setVisible(showButtonCheck.isSelected());
+ }
+ });
+ return settingPane;
+ }
+
+ protected JPanel createLinePane() {
+ return FRGUIPaneFactory.createBorderLayout_S_Pane();
+ }
+
+ @Override
+ public void populateBean(MobileCollapsedStyle ob) {
+ showButtonCheck.setSelected(ob.getCollapseButton().isShowButton());
+ buttonColorBox.setSelectObject(ob.getCollapseButton().getButtonColor());
+ foldedTextFiled.setText(ob.getCollapseButton().getFoldedHint());
+ unfoldedTextFiled.setText(ob.getCollapseButton().getUnfoldedHint());
+ buttonGroup.setSelectButton(ob.getCollapseButton().getDefaultState());
+ }
+
+ @Override
+ public MobileCollapsedStyle updateBean() {
+ MobileCollapsedStyle style = updateDiffBean();
+ style.getCollapseButton().setShowButton(showButtonCheck.isSelected());
+ style.getCollapseButton().setButtonColor(buttonColorBox.getSelectObject());
+ style.getCollapseButton().setFoldedHint(foldedTextFiled.getText());
+ style.getCollapseButton().setUnfoldedHint(unfoldedTextFiled.getText());
+ style.getCollapseButton().setDefaultState(buttonGroup.getCurrentSelected());
+ return style;
+ }
+
+ protected MobileCollapsedStyle updateDiffBean() {
+ return new MobileChartCollapsedStyle();
+ }
+
+ @Override
+ protected String title4PopupWindow() {
+ return Toolkit.i18nText("Fine-Design_Mobile_Collapse_Expand");
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileComboBoxDialogEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileComboBoxDialogEditor.java
new file mode 100644
index 000000000..6e9b74a1d
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileComboBoxDialogEditor.java
@@ -0,0 +1,100 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.i18n.Toolkit;
+import com.fr.form.ui.mobile.MobileCollapsedStyle;
+import com.fr.general.ComparatorUtils;
+
+import javax.swing.SwingUtilities;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/2/13
+ */
+public class MobileComboBoxDialogEditor extends BasicPane {
+
+ private static final Dimension DEFAULT_DIMENSION = new Dimension(600, 400);
+ private static final Dimension COMBOX_DIMENSION = new Dimension(135,20);
+ private static final String NONE = Toolkit.i18nText("Fine-Design_Mobile_Collapse_None");
+ private static final String CUSTOM = Toolkit.i18nText("Fine-Design_Mobile_Collapse_Custom");
+
+
+ private MobileCollapsedStyle style;
+ private MobileCollapsedStylePane stylePane;
+ private UIComboBox comboBox;
+ private ActionListener listener;
+
+ public MobileComboBoxDialogEditor(MobileCollapsedStylePane stylePane) {
+ this.stylePane = stylePane;
+ this.comboBox = new UIComboBox(new Object[] {NONE, CUSTOM});
+ this.comboBox.setPreferredSize(COMBOX_DIMENSION);
+ this.comboBox.setSelectedItem(NONE);
+ listener = new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (ComparatorUtils.equals(MobileComboBoxDialogEditor.this.comboBox.getSelectedItem(), CUSTOM)) {
+ showEditorPane();
+ }
+ }
+ };
+ this.comboBox.addActionListener(listener);
+ this.add(comboBox);
+
+ }
+
+ public boolean isSelectedCustom() {
+ return ComparatorUtils.equals(CUSTOM, this.comboBox.getSelectedItem());
+ }
+
+ public void setSelected(boolean selectedCustom) {
+ this.comboBox.removeActionListener(listener);
+ this.comboBox.setSelectedItem(selectedCustom ? CUSTOM : NONE);
+ this.comboBox.addActionListener(listener);
+ }
+
+ private void showEditorPane() {
+ stylePane.setPreferredSize(DEFAULT_DIMENSION);
+ BasicDialog dialog = stylePane.showWindow(SwingUtilities.getWindowAncestor(this));
+ dialog.addDialogActionListener(new DialogActionAdapter() {
+ @Override
+ public void doOk() {
+ MobileCollapsedStyle style = stylePane.updateBean();
+ style.setCollapsedWork(true);
+ setStyle(style);
+ MobileComboBoxDialogEditor.this.firePropertyChanged();
+ }
+ });
+ stylePane.populateBean(getStyle());
+ dialog.setVisible(true);
+ }
+
+
+ protected void firePropertyChanged() {
+ HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified();
+ }
+
+ public MobileCollapsedStyle getStyle() {
+ return style;
+ }
+
+ public void setStyle(MobileCollapsedStyle style) {
+ this.style = style;
+ }
+
+ @Override
+ protected String title4PopupWindow() {
+ return null;
+ }
+
+
+
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java
index d0e949fa9..3573427ca 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java
@@ -13,9 +13,9 @@ import com.fr.log.FineLoggerFactory;
import com.fr.stable.ArrayUtils;
import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
import java.util.HashMap;
import java.util.Map;
@@ -79,8 +79,8 @@ public class MobileStylePane extends BasicPane {
private void addWestList() {
styleList = new JList<>(listModel);
styleList.setCellRenderer(render);
- styleList.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent e) {
+ styleList.addListSelectionListener(new ListSelectionListener() {
+ public void valueChanged(ListSelectionEvent e) {
String selectedValue = (String)styleList.getSelectedValue();
card.show(right, selectedValue);
}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java
new file mode 100644
index 000000000..79bab33df
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java
@@ -0,0 +1,387 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.base.BaseUtils;
+import com.fr.base.Utils;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.gui.ibutton.UIColorButton;
+import com.fr.design.gui.ibutton.UIToggleButton;
+import com.fr.design.gui.icombobox.LineComboBox;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ispinner.UnsignedIntUISpinner;
+import com.fr.design.gui.style.FRFontPane;
+import com.fr.design.gui.style.NumberDragBar;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.style.color.ColorSelectBox;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.form.ui.mobile.MobileBookMarkStyle;
+import com.fr.form.ui.mobile.impl.SidebarMobileBookMarkStyle;
+import com.fr.stable.CoreConstants;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+
+/**
+ * @author Starryi
+ * @version 10.0
+ * Created by Starryi on 2020/02/28
+ */
+public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane {
+ private static final long serialVersionUID = 1L;
+
+ private static final int COLUMN_WIDTH = 160;
+
+ private UnsignedIntUISpinner buttonWidthSpinner;
+ private UnsignedIntUISpinner buttonHeightSpinner;
+ private UnsignedIntUISpinner buttonGapSpinner;
+ private UnsignedIntUISpinner buttonBorderRadiusSpinner;
+
+ private ColorSelectBox normalBackgroundColorBox;
+ private NumberDragBar normalOpacityDragBar;
+ private UnsignedIntUISpinner normalOpacitySpinner;
+ private LineComboBox normalBorderWidthComBox;
+ private ColorSelectBox normalBorderColorBox;
+ private UIComboBox normalFontNameComboBox;
+ private UIComboBox normalFontSizeComboBox;
+ private UIColorButton normalFontColorButton;
+ private UIToggleButton normalFontItalicButton;
+ private UIToggleButton normalFontBoldButton;
+
+ private ColorSelectBox selectedBackgroundColorBox;
+ private NumberDragBar selectedOpacityDragBar;
+ private UnsignedIntUISpinner selectedOpacitySpinner;
+ private LineComboBox selectedBorderWidthComBox;
+ private ColorSelectBox selectedBorderColorBox;
+ private UIComboBox selectedFontNameComboBox;
+ private UIComboBox selectedFontSizeComboBox;
+ private UIColorButton selectedFontColorButton;
+ private UIToggleButton selectedFontItalicButton;
+ private UIToggleButton selectedFontBoldButton;
+
+ private SidebarMobileBookMarkStyle DEFAULT_STYLE = new SidebarMobileBookMarkStyle();
+
+ public SidebarMobileBookMarkStyleCustomDefinePane() {
+ this.initComponent();
+ }
+
+ private void initComponent() {
+ this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+ this.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+
+ this.add(this.createNavButtonStylePanel());
+ this.add(this.createNormalStateStylePanel());
+ this.add(this.createSelectedStateStylePanel());
+ }
+
+ private JPanel createNavButtonStylePanel() {
+
+ buttonWidthSpinner = new UnsignedIntUISpinner(20, 150, 1, DEFAULT_STYLE.getWidth());
+ buttonHeightSpinner = new UnsignedIntUISpinner(20, 100, 1, DEFAULT_STYLE.getHeight());
+ buttonGapSpinner = new UnsignedIntUISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_STYLE.getGap());
+ buttonBorderRadiusSpinner = new UnsignedIntUISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_STYLE.getBorderRadius());
+
+ UILabel sizeLabel = new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Button_Size") + ":",
+ SwingConstants.RIGHT);
+ JPanel sizePane = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 5, 0);
+ sizePane.add(buttonWidthSpinner);
+ sizePane.add(buttonHeightSpinner);
+
+ JPanel sizeTipsPane = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 5, 0);
+ sizeTipsPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Button_Width"),
+ SwingConstants.CENTER));
+ sizeTipsPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Button_Height"),
+ SwingConstants.CENTER));
+
+ UILabel gapLabel = new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Button_Gap") + ":",
+ SwingConstants.RIGHT);
+ UILabel borderRadiusLabel = new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Button_Border_Radius") + ":",
+ SwingConstants.RIGHT);
+
+ double p = TableLayout.PREFERRED;
+ double[] rowSize = {p, p, p, p};
+ double[] columnSize = {p, COLUMN_WIDTH};
+ double[] verticalGaps = {0, 10, 10};
+
+ JPanel navButtonSettingsPanel = TableLayoutHelper.createDiffVGapTableLayoutPane(new JComponent[][]{
+ {sizeLabel, sizePane},
+ {null, sizeTipsPane},
+ {gapLabel, buttonGapSpinner},
+ {borderRadiusLabel, buttonBorderRadiusSpinner},
+ }, rowSize, columnSize, 5, verticalGaps);
+
+ navButtonSettingsPanel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
+
+ JPanel containerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+ containerPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Button_Style"),
+ Color.decode("#2F8EF1")));
+ containerPane.add(navButtonSettingsPanel);
+
+ return containerPane;
+ }
+
+ private JPanel createNormalStateStylePanel() {
+ double p = TableLayout.PREFERRED;
+
+ normalBackgroundColorBox = new ColorSelectBox(COLUMN_WIDTH);
+ normalBackgroundColorBox.setSelectObject(DEFAULT_STYLE.getBackgroundColor());
+ normalOpacityDragBar = new NumberDragBar(0, 100);
+ normalOpacityDragBar.setValue(DEFAULT_STYLE.getOpacity());
+ normalOpacityDragBar.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ normalOpacitySpinner.setValue(normalOpacityDragBar.getValue());
+ }
+ });
+ normalOpacitySpinner = new UnsignedIntUISpinner(0, 100, 1, DEFAULT_STYLE.getOpacity());
+ normalOpacitySpinner.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ normalOpacityDragBar.setValue((int) normalOpacitySpinner.getValue());
+ }
+ });
+ normalBorderWidthComBox = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
+ normalBorderWidthComBox.setSelectedLineStyle(DEFAULT_STYLE.getBorderWidth());
+ normalBorderColorBox = new ColorSelectBox(COLUMN_WIDTH);
+ normalBorderColorBox.setSelectObject(DEFAULT_STYLE.getBorderColor());
+ normalFontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
+ normalFontNameComboBox.setSelectedItem(DEFAULT_STYLE.getSelectedFontFamily());
+ normalFontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
+ normalFontSizeComboBox.setSelectedItem(DEFAULT_STYLE.getFontSize());
+ normalFontColorButton = new UIColorButton();
+ normalFontColorButton.setColor(DEFAULT_STYLE.getFontColor());
+ normalFontItalicButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
+ normalFontItalicButton.setSelected(DEFAULT_STYLE.isFontItalic());
+ normalFontBoldButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
+ normalFontBoldButton.setSelected(DEFAULT_STYLE.isFontBold());
+
+ JPanel opacityPane = new JPanel(new BorderLayout(0, 0));
+ JPanel jp = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 5, 0);
+ jp.add(normalOpacityDragBar);
+ jp.add(normalOpacitySpinner);
+ opacityPane.add(jp, BorderLayout.CENTER);
+
+ JPanel fontExtraPane = TableLayoutHelper.createGapTableLayoutPane(
+ new JComponent[][]{{normalFontSizeComboBox, normalFontColorButton, normalFontItalicButton, normalFontBoldButton}},
+ new double[]{p},
+ new double[]{p, p, p, p},
+ 0, 5
+ );
+
+ double[] rowSize = {p, p, p, p, p};
+ double[] columnSize = {p, COLUMN_WIDTH, p};
+
+ JPanel normalStateStyleSettingsPanel = TableLayoutHelper.createGapTableLayoutPane(new JComponent[][]{
+ {
+ new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Background_Color") + ":", SwingConstants.RIGHT),
+ normalBackgroundColorBox
+ },
+ {
+ new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Opacity") + ":", SwingConstants.RIGHT),
+ opacityPane,
+ new UILabel("%")
+ },
+ {
+ new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Border_Width") + ":", SwingConstants.RIGHT),
+ normalBorderWidthComBox
+ },
+ {
+ new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Border_Color") + ":", SwingConstants.RIGHT),
+ normalBorderColorBox
+ },
+ {
+ new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Font") + ":", SwingConstants.RIGHT),
+ normalFontNameComboBox,
+ fontExtraPane
+ }
+ }, rowSize, columnSize, 5, 10);
+ normalStateStyleSettingsPanel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
+
+ JPanel containerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+ containerPane.setBorder(
+ GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Normal_Style"),
+ Color.decode("#2F8EF1"))
+ );
+ containerPane.add(normalStateStyleSettingsPanel);
+
+ return containerPane;
+ }
+
+ private JPanel createSelectedStateStylePanel() {
+ double p = TableLayout.PREFERRED;
+
+ selectedBackgroundColorBox = new ColorSelectBox(COLUMN_WIDTH);
+ selectedBackgroundColorBox.setSelectObject(DEFAULT_STYLE.getSelectedBackgroundColor());
+ selectedOpacityDragBar = new NumberDragBar(0, 100);
+ selectedOpacityDragBar.setValue(DEFAULT_STYLE.getSelectedOpacity());
+ selectedOpacityDragBar.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ selectedOpacitySpinner.setValue(selectedOpacityDragBar.getValue());
+ }
+ });
+ selectedOpacitySpinner = new UnsignedIntUISpinner(0, 100, 1, DEFAULT_STYLE.getSelectedOpacity());
+ selectedOpacitySpinner.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ selectedOpacityDragBar.setValue((int) selectedOpacitySpinner.getValue());
+ }
+ });
+ selectedBorderWidthComBox = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
+ selectedBorderWidthComBox.setSelectedLineStyle(DEFAULT_STYLE.getSelectedBorderWidth());
+ selectedBorderColorBox = new ColorSelectBox(COLUMN_WIDTH);
+ selectedBorderColorBox.setSelectObject(DEFAULT_STYLE.getSelectedBorderColor());
+ selectedFontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
+ selectedFontNameComboBox.setSelectedItem(DEFAULT_STYLE.getSelectedFontFamily());
+ selectedFontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
+ selectedFontSizeComboBox.setSelectedItem(DEFAULT_STYLE.getSelectedFontSize());
+ selectedFontColorButton = new UIColorButton();
+ selectedFontColorButton.setColor(DEFAULT_STYLE.getSelectedFontColor());
+ selectedFontItalicButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
+ selectedFontItalicButton.setSelected(DEFAULT_STYLE.isSelectedFontItalic());
+ selectedFontBoldButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
+ selectedFontBoldButton.setSelected(DEFAULT_STYLE.isSelectedFontBold());
+
+ JPanel opacityPane = new JPanel(new BorderLayout(0, 0));
+ JPanel jp = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 5, 0);
+ jp.add(selectedOpacityDragBar);
+ jp.add(selectedOpacitySpinner);
+ opacityPane.add(jp, BorderLayout.CENTER);
+
+ JPanel fontExtraPane = TableLayoutHelper.createGapTableLayoutPane(
+ new JComponent[][]{{selectedFontSizeComboBox, selectedFontColorButton, selectedFontItalicButton, selectedFontBoldButton}},
+ new double[]{p},
+ new double[]{p, p, p, p},
+ 0, 5
+ );
+
+ double[] rowSize = {p, p, p, p, p};
+ double[] columnSize = {p, COLUMN_WIDTH, p};
+
+ JPanel selectedStateStyleSettingsPanel = TableLayoutHelper.createGapTableLayoutPane(new JComponent[][]{
+ {
+ new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Background_Color") + ":", SwingConstants.RIGHT),
+ selectedBackgroundColorBox
+ },
+ {
+ new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Opacity") + ":", SwingConstants.RIGHT),
+ opacityPane,
+ new UILabel("%")
+ },
+ {
+ new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Border_Width") + ":", SwingConstants.RIGHT),
+ selectedBorderWidthComBox
+ },
+ {
+ new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Border_Color") + ":", SwingConstants.RIGHT),
+ selectedBorderColorBox
+ },
+ {
+ new UILabel(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Font") + ":", SwingConstants.RIGHT),
+ selectedFontNameComboBox,
+ fontExtraPane
+ }
+ }, rowSize, columnSize, 5, 10);
+ selectedStateStyleSettingsPanel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
+
+ JPanel containerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+ containerPane.setBorder(
+ GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar_Selected_Style"),
+ Color.decode("#2F8EF1"))
+ );
+ containerPane.add(selectedStateStyleSettingsPanel);
+
+ return containerPane;
+ }
+
+ @Override
+ public void populateBean(MobileBookMarkStyle ob) {
+ SidebarMobileBookMarkStyle style = null;
+ if (ob instanceof SidebarMobileBookMarkStyle) {
+ style = (SidebarMobileBookMarkStyle) ob;
+ }
+ if (style == null) {
+ return;
+ }
+
+ buttonWidthSpinner.setValue(style.getWidth());
+ buttonHeightSpinner.setValue(style.getHeight());
+ buttonGapSpinner.setValue(style.getGap());
+ buttonBorderRadiusSpinner.setValue(style.getBorderRadius());
+
+ normalBackgroundColorBox.setSelectObject(style.getBackgroundColor());
+ normalOpacityDragBar.setValue(style.getOpacity());
+ normalOpacitySpinner.setValue(style.getOpacity());
+ normalBorderWidthComBox.setSelectedLineStyle(style.getBorderWidth());
+ normalBorderColorBox.setSelectObject(style.getBorderColor());
+ normalFontNameComboBox.setSelectedItem(style.getFontFamily());
+ normalFontSizeComboBox.setSelectedItem(style.getFontSize());
+ normalFontColorButton.setColor(style.getFontColor());
+ normalFontItalicButton.setSelected(style.isFontItalic());
+ normalFontBoldButton.setSelected(style.isFontBold());
+
+ selectedBackgroundColorBox.setSelectObject(style.getSelectedBackgroundColor());
+ selectedOpacityDragBar.setValue(style.getSelectedOpacity());
+ selectedOpacitySpinner.setValue(style.getSelectedOpacity());
+ selectedBorderWidthComBox.setSelectedLineStyle(style.getSelectedBorderWidth());
+ selectedBorderColorBox.setSelectObject(style.getSelectedBorderColor());
+ selectedFontNameComboBox.setSelectedItem(style.getSelectedFontFamily());
+ selectedFontSizeComboBox.setSelectedItem(style.getSelectedFontSize());
+ selectedFontColorButton.setColor(style.getSelectedFontColor());
+ selectedFontItalicButton.setSelected(style.isSelectedFontItalic());
+ selectedFontBoldButton.setSelected(style.isSelectedFontBold());
+ }
+
+ @Override
+ public MobileBookMarkStyle updateBean() {
+ SidebarMobileBookMarkStyle style = new SidebarMobileBookMarkStyle();
+
+ style.setWidth((int) buttonWidthSpinner.getValue());
+ style.setHeight((int) buttonHeightSpinner.getValue());
+ style.setGap((int) buttonGapSpinner.getValue());
+ style.setBorderRadius((int) buttonBorderRadiusSpinner.getValue());
+
+ if (normalBackgroundColorBox.getSelectObject() != null) {
+ style.setBackgroundColor(normalBackgroundColorBox.getSelectObject());
+ }
+ style.setOpacity((int) normalOpacitySpinner.getValue());
+ style.setBorderWidth(normalBorderWidthComBox.getSelectedLineStyle());
+ style.setBorderColor(normalBorderColorBox.getSelectObject());
+ if (normalFontNameComboBox.getSelectedItem() != null) {
+ style.setFontFamily((String) normalFontNameComboBox.getSelectedItem());
+ }
+ if (normalFontSizeComboBox.getSelectedItem() != null) {
+ style.setFontSize((Integer) normalFontSizeComboBox.getSelectedItem());
+ }
+ style.setFontColor(normalFontColorButton.getColor());
+ style.setFontItalic(normalFontItalicButton.isSelected());
+ style.setFontBold(normalFontBoldButton.isSelected());
+
+ if (selectedBackgroundColorBox.getSelectObject() != null) {
+ style.setSelectedBackgroundColor(selectedBackgroundColorBox.getSelectObject());
+ }
+ style.setSelectedOpacity((int) selectedOpacitySpinner.getValue());
+ style.setSelectedBorderWidth(selectedBorderWidthComBox.getSelectedLineStyle());
+ style.setSelectedBorderColor(selectedBorderColorBox.getSelectObject());
+ if (selectedFontNameComboBox.getSelectedItem() != null) {
+ style.setSelectedFontFamily((String) selectedFontNameComboBox.getSelectedItem());
+ }
+ if (selectedFontSizeComboBox.getSelectedItem() != null) {
+ style.setSelectedFontSize((Integer) selectedFontSizeComboBox.getSelectedItem());
+ }
+ style.setSelectedFontColor(selectedFontColorButton.getColor());
+ style.setSelectedFontItalic(selectedFontItalicButton.isSelected());
+ style.setSelectedFontBold(selectedFontBoldButton.isSelected());
+
+ return style;
+ }
+
+ @Override
+ protected String title4PopupWindow() {
+ return null;
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleProvider.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleProvider.java
new file mode 100644
index 000000000..7c9202f3f
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleProvider.java
@@ -0,0 +1,30 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.fun.impl.AbstractMobileBookMarkStyleProvider;
+import com.fr.design.i18n.Toolkit;
+import com.fr.form.ui.mobile.MobileBookMarkStyle;
+import com.fr.form.ui.mobile.impl.SidebarMobileBookMarkStyle;
+
+/**
+ * @author Starryi
+ * @version 10.0
+ * Created by Starryi on 2020/02/28
+ */
+public class SidebarMobileBookMarkStyleProvider extends AbstractMobileBookMarkStyleProvider {
+
+ @Override
+ public Class classForMobileBookMarkStyle() {
+ return SidebarMobileBookMarkStyle.class;
+ }
+
+ @Override
+ public Class> classForMobileBookMarkStyleAppearance() {
+ return SidebarMobileBookMarkStyleCustomDefinePane.class;
+ }
+
+ @Override
+ public String displayName() {
+ return Toolkit.i18nText("Fine-Design_Mobile_BookMark_Style_Sidebar");
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/template/info/SendHelper.java b/designer-base/src/main/java/com/fr/design/mainframe/template/info/SendHelper.java
index db489fb3c..694389f30 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/template/info/SendHelper.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/template/info/SendHelper.java
@@ -1,7 +1,7 @@
package com.fr.design.mainframe.template.info;
import com.fr.design.mainframe.SiteCenterToken;
-import com.fr.general.CloudCenter;
+import com.fr.design.mainframe.burying.point.BasePointInfo;
import com.fr.general.ComparatorUtils;
import com.fr.general.http.HttpToolbox;
import com.fr.json.JSONObject;
@@ -14,23 +14,20 @@ import java.util.Map;
* 负责向服务器发送信息
* Created by plough on 2019/4/18.
*/
-class SendHelper {
- private static final String CONSUMING_URL = CloudCenter.getInstance().acquireUrlByKind("tempinfo.consuming") + "/single";
- private static final String PROCESS_URL = CloudCenter.getInstance().acquireUrlByKind("tempinfo.process") + "/single";
-
- private static boolean sendConsumingInfo(String content) {
- return sendSingleTemplateInfo(CONSUMING_URL, content);
- }
-
- private static boolean sendProcessInfo(String content) {
- return sendSingleTemplateInfo(PROCESS_URL, content);
- }
-
- static boolean sendTemplateInfo(TemplateInfo templateInfo) {
- return SendHelper.sendConsumingInfo(templateInfo.getConsumingMapJsonString()) && SendHelper.sendProcessInfo(templateInfo.getProcessMapJsonString());
+public class SendHelper {
+
+ public static boolean sendPointInfo(BasePointInfo pointInfo) {
+ boolean success = true;
+ Map sendInfo = pointInfo.getSendInfo();
+ for (Map.Entry entry : sendInfo.entrySet()) {
+ if (!sendSinglePointInfo(entry.getKey(), entry.getValue())) {
+ success = false;
+ }
+ }
+ return success;
}
- private static boolean sendSingleTemplateInfo(String url, String content) {
+ private static boolean sendSinglePointInfo(String url, String content) {
Map para = new HashMap<>();
para.put("token", SiteCenterToken.generateToken());
para.put("content", content);
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfo.java b/designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfo.java
index 900210bd0..e233bc6e5 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfo.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfo.java
@@ -2,13 +2,13 @@ package com.fr.design.mainframe.template.info;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
+import com.fr.design.mainframe.burying.point.AbstractPointInfo;
+import com.fr.general.CloudCenter;
import com.fr.general.GeneralUtils;
import com.fr.json.JSONObject;
import com.fr.stable.ProductConstants;
import com.fr.stable.StringUtils;
import com.fr.stable.xml.XMLPrintWriter;
-import com.fr.stable.xml.XMLReadable;
-import com.fr.stable.xml.XMLWriter;
import com.fr.stable.xml.XMLableReader;
import java.text.SimpleDateFormat;
@@ -20,9 +20,12 @@ import java.util.Map;
* 对应一张模版的记录
* Created by plough on 2019/4/18.
*/
-class TemplateInfo implements XMLReadable, XMLWriter {
+public class TemplateInfo extends AbstractPointInfo {
static final String XML_TAG = "TemplateInfo";
+ private static final String CONSUMING_URL = CloudCenter.getInstance().acquireUrlByKind("tempinfo.consuming") + "/single";
+ private static final String PROCESS_URL = CloudCenter.getInstance().acquireUrlByKind("tempinfo.process") + "/single";
+
private static final String XML_PROCESS_MAP = "processMap";
private static final String XML_CONSUMING_MAP = "consumingMap";
private static final String ATTR_DAY_COUNT = "day_count";
@@ -47,7 +50,6 @@ class TemplateInfo implements XMLReadable, XMLWriter {
private static final int VALID_WIDGET_COUNT = 5; // 有效报表模板的控件数
private static final int COMPLETE_DAY_COUNT = 15; // 判断模板是否完成的天数
- private int idleDayCount; // 到现在为止，模版闲置（上次保存后没有再编辑过）的天数
private String templateID = StringUtils.EMPTY;
private String originID = StringUtils.EMPTY;
// todo: processMap 和 consumingMap 还可以再拆解为小类，以后继续重构
@@ -62,17 +64,22 @@ class TemplateInfo implements XMLReadable, XMLWriter {
this.originID = originID;
}
- static TemplateInfo newInstanceByRead(XMLableReader reader) {
+ @Override
+ protected String key() {
+ return templateID;
+ }
+
+ public static TemplateInfo newInstanceByRead(XMLableReader reader) {
TemplateInfo templateInfo = new TemplateInfo();
reader.readXMLObject(templateInfo);
return templateInfo;
}
- static TemplateInfo newInstance(String templateID) {
+ public static TemplateInfo newInstance(String templateID) {
return newInstance(templateID, StringUtils.EMPTY, 0);
}
- static TemplateInfo newInstance(String templateID, String originID, int originTime) {
+ public static TemplateInfo newInstance(String templateID, String originID, int originTime) {
HashMap consumingMap = new HashMap<>();
String username = MarketConfig.getInstance().getBbsUsername();
@@ -107,9 +114,10 @@ class TemplateInfo implements XMLReadable, XMLWriter {
}
int getTimeConsume() {
- return (int)consumingMap.get(ATTR_TIME_CONSUME);
+ return (int) consumingMap.get(ATTR_TIME_CONSUME);
}
+ @Override
public void writeXML(XMLPrintWriter writer) {
writer.startTAG(XML_TAG);
if (StringUtils.isNotEmpty(templateID)) {
@@ -144,13 +152,14 @@ class TemplateInfo implements XMLReadable, XMLWriter {
writer.attr(ATTR_JAR_TIME, (String) consumingMap.get(ATTR_JAR_TIME));
writer.attr(ATTR_CREATE_TIME, (String) consumingMap.get(ATTR_CREATE_TIME));
writer.attr(ATTR_UUID, (String) consumingMap.get(ATTR_UUID));
- writer.attr(ATTR_TIME_CONSUME, (int)consumingMap.get(ATTR_TIME_CONSUME));
- writer.attr(ATTR_ORIGIN_TIME, (int)consumingMap.get(ATTR_ORIGIN_TIME));
+ writer.attr(ATTR_TIME_CONSUME, (int) consumingMap.get(ATTR_TIME_CONSUME));
+ writer.attr(ATTR_ORIGIN_TIME, (int) consumingMap.get(ATTR_ORIGIN_TIME));
writer.attr(ATTR_VERSION, (String) consumingMap.get(ATTR_VERSION));
writer.attr(ATTR_USERNAME, (String) consumingMap.get(ATTR_USERNAME));
writer.end();
}
+ @Override
public void readXML(XMLableReader reader) {
if (!reader.isChildNode()) {
idleDayCount = reader.getAttrAsInt(ATTR_DAY_COUNT, 0);
@@ -185,7 +194,8 @@ class TemplateInfo implements XMLReadable, XMLWriter {
}
}
- boolean isTestTemplate() {
+ @Override
+ protected boolean isTestTemplate() {
if (!isComplete()) {
return false;
}
@@ -195,6 +205,10 @@ class TemplateInfo implements XMLReadable, XMLWriter {
int floatCount = (int) processMap.get(ATTR_FLOAT_COUNT);
int blockCount = (int) processMap.get(ATTR_BLOCK_COUNT);
int widgetCount = (int) processMap.get(ATTR_WIDGET_COUNT);
+ return isTestTemplate(reportType, cellCount, floatCount, blockCount, widgetCount);
+ }
+
+ public static boolean isTestTemplate(int reportType, int cellCount, int floatCount, int blockCount, int widgetCount) {
boolean isTestTemplate;
if (reportType == 0) { // 普通报表
isTestTemplate = cellCount <= VALID_CELL_COUNT && floatCount <= 1 && widgetCount <= VALID_WIDGET_COUNT;
@@ -206,7 +220,8 @@ class TemplateInfo implements XMLReadable, XMLWriter {
return isTestTemplate;
}
- boolean isComplete() {
+ @Override
+ protected boolean isComplete() {
// 条件 1. 超过15天未编辑
// 条件 2. 设计器在这段未编辑的时间内启动超过 X 次（目前定的 X = 3）。即"设计器最近 X 次启动的时间跨度" < "未编辑时间"；
@@ -214,20 +229,16 @@ class TemplateInfo implements XMLReadable, XMLWriter {
&& DesignerOpenHistory.getInstance().isOpenEnoughTimesInPeriod(idleDayCount);
}
- String getConsumingMapJsonString() {
- return new JSONObject(consumingMap).toString();
- }
-
- String getProcessMapJsonString() {
- return new JSONObject(processMap).toString();
- }
-
- boolean isReadyForSend() {
- return isComplete() && !isTestTemplate();
+ @Override
+ public Map getSendInfo() {
+ Map sendMap = new HashMap<>();
+ sendMap.put(CONSUMING_URL, new JSONObject(consumingMap).toString());
+ sendMap.put(PROCESS_URL, new JSONObject(processMap).toString());
+ return sendMap;
}
void addTimeConsume(int timeConsume) {
- timeConsume += (int)consumingMap.get(ATTR_TIME_CONSUME); // 加上之前的累计编辑时间
+ timeConsume += (int) consumingMap.get(ATTR_TIME_CONSUME); // 加上之前的累计编辑时间
consumingMap.put(ATTR_TIME_CONSUME, timeConsume);
}
@@ -246,14 +257,6 @@ class TemplateInfo implements XMLReadable, XMLWriter {
this.processMap = processMap;
}
- void resetIdleDayCount() {
- this.idleDayCount = 0;
- }
-
- void addIdleDayCountByOne() {
- this.idleDayCount += 1;
- }
-
int getIdleDayCount() {
return this.idleDayCount;
}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfoCollector.java b/designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfoCollector.java
index 9a13ed9d7..8c4e7f18d 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfoCollector.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfoCollector.java
@@ -1,54 +1,26 @@
package com.fr.design.mainframe.template.info;
-import com.fr.base.FRContext;
-import com.fr.base.io.XMLReadHelper;
-import com.fr.design.DesignerEnvManager;
-import com.fr.log.FineLoggerFactory;
+import com.fr.design.mainframe.burying.point.AbstractPointCollector;
import com.fr.stable.ProductConstants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.xml.XMLPrintWriter;
-import com.fr.stable.xml.XMLReadable;
-import com.fr.stable.xml.XMLTools;
-import com.fr.stable.xml.XMLWriter;
import com.fr.stable.xml.XMLableReader;
-import com.fr.third.javax.xml.stream.XMLStreamException;
-import com.fr.third.org.apache.commons.io.FileUtils;
-import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* 做模板的过程和耗时收集，辅助类
* Created by plough on 2017/2/21.
*/
-public class TemplateInfoCollector implements XMLReadable, XMLWriter {
+public class TemplateInfoCollector extends AbstractPointCollector {
private static final String XML_TAG = "TplInfo";
private static final String XML_TEMPLATE_INFO_LIST = "TemplateInfoList";
private static final String XML_FILE_NAME = "tpl.info";
private static TemplateInfoCollector instance;
- private static final int MAX_SIZE = 512 * 1024 * 1024;
- private Map templateInfoMap;
private DesignerOpenHistory designerOpenHistory;
private TemplateInfoCollector() {
- init();
- }
-
- private void init() {
- templateInfoMap = new HashMap<>();
- designerOpenHistory = DesignerOpenHistory.getInstance();
-
- loadFromFile();
}
public static TemplateInfoCollector getInstance() {
@@ -62,17 +34,19 @@ public class TemplateInfoCollector implements XMLReadable, XMLWriter {
* 根据模板ID是否在收集列表中，判断是否需要收集当前模板的信息
*/
public boolean contains(String templateID) {
- return StringUtils.isNotEmpty(templateID) && templateInfoMap.containsKey(templateID);
+ return StringUtils.isNotEmpty(templateID) && pointInfoMap.containsKey(templateID);
}
/**
* 收集模板信息。如果之前没有记录，则新增；如果已有记录，则更新。
* 同时将最新数据保存到文件中。
- * @param templateID 模版id
- * @param originID 模版的原始id，仅对另存为的模版有效，对于非另存为的模版，值总是为空
+ *
+ * @param templateID 模版id
+ * @param originID 模版的原始id，仅对另存为的模版有效，对于非另存为的模版，值总是为空
* @param processInfo 包含模版的一些基本信息（如模版类型、包含控件数量等）
* @param timeConsume 本次制作耗时，单位为 s
*/
+ @Override
public void collectInfo(String templateID, String originID, TemplateProcessInfo processInfo, int timeConsume) {
if (!shouldCollectInfo()) {
return;
@@ -80,11 +54,11 @@ public class TemplateInfoCollector implements XMLReadable, XMLWriter {
TemplateInfo templateInfo;
if (this.contains(templateID)) {
- templateInfo = templateInfoMap.get(templateID);
+ templateInfo = pointInfoMap.get(templateID);
} else {
- int originTime = this.contains(originID) ? templateInfoMap.get(originID).getTimeConsume() : 0;
+ int originTime = this.contains(originID) ? pointInfoMap.get(originID).getTimeConsume() : 0;
templateInfo = TemplateInfo.newInstance(templateID, originID, originTime);
- templateInfoMap.put(templateID, templateInfo);
+ pointInfoMap.put(templateID, templateInfo);
}
// 收集制作耗时
@@ -98,137 +72,51 @@ public class TemplateInfoCollector implements XMLReadable, XMLWriter {
saveInfo();
}
- /**
- * 发送本地模板信息到服务器，并清空已发送模版的本地记录
- */
- public void sendTemplateInfo() {
- // 每次启动设计器后，都会执行这个函数（被 InformationCollector 的 collectStartTime 调用）
- addIdleDayCount();
-
- removeTestTemplates();
-
- List removeLaterList = new ArrayList<>();
-
- for (String key : templateInfoMap.keySet()) {
- TemplateInfo templateInfo = templateInfoMap.get(key);
- if (templateInfo.isReadyForSend()) {
- if (SendHelper.sendTemplateInfo(templateInfo)) {
- removeLaterList.add(key);
- }
- }
- }
-
- // 清空记录
- for (String key : removeLaterList) {
- removeFromTemplateInfoList(key);
- }
-
- saveInfo();
- }
-
/**
* 获取缓存文件存放路径
*/
- private static File getInfoFile() {
+ @Override
+ protected File getInfoFile() {
return new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), XML_FILE_NAME));
}
- void loadFromFile() {
- if (!getInfoFile().exists()) {
- return;
- }
-
- XMLableReader reader = null;
- try (InputStream in = new FileInputStream(getInfoFile())) {
- // XMLableReader 还是应该考虑实现 Closable 接口的，这样就能使用 try-with 语句了
- reader = XMLReadHelper.createXMLableReader(in, XMLPrintWriter.XML_ENCODER);
- reader.readXMLObject(this);
- } catch (FileNotFoundException e) {
- // do nothing
- } catch (XMLStreamException | IOException e) {
- FineLoggerFactory.getLogger().error(e.getMessage(), e);
- } finally {
- try {
- if (reader != null) {
- reader.close();
- }
- } catch (XMLStreamException e) {
- FineLoggerFactory.getLogger().error(e.getMessage(), e);
- }
- }
- }
-
TemplateInfo getOrCreateTemplateInfoByID(String templateID) {
- if (templateInfoMap.containsKey(templateID)) {
- return templateInfoMap.get(templateID);
+ if (pointInfoMap.containsKey(templateID)) {
+ return pointInfoMap.get(templateID);
}
TemplateInfo templateInfo = TemplateInfo.newInstance(templateID);
- templateInfoMap.put(templateID, templateInfo);
+ pointInfoMap.put(templateID, templateInfo);
return templateInfo;
}
- private boolean shouldCollectInfo() {
- return FileUtils.sizeOf(getInfoFile()) <= MAX_SIZE && DesignerEnvManager.getEnvManager().isJoinProductImprove() && FRContext.isChineseEnv();
- }
-
- /**
- * 将包含所有信息的对象保存到文件
- */
- private void saveInfo() {
- try {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- XMLTools.writeOutputStreamXML(this, out);
- out.flush();
- out.close();
- String fileContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
- FileUtils.writeStringToFile(getInfoFile(), fileContent, StandardCharsets.UTF_8);
- } catch (Exception ex) {
- FineLoggerFactory.getLogger().error(ex.getMessage());
- }
- }
-
/**
* 更新 day_count：打开设计器却未编辑模板的连续日子
*/
- private void addIdleDayCount() {
+ @Override
+ protected void addIdleDayCount() {
// 判断今天是否第一次打开设计器，为了防止同一天内，多次 addIdleDayCount
if (designerOpenHistory.hasOpenedToday()) {
return;
}
- for (TemplateInfo templateInfo : templateInfoMap.values()) {
+ for (TemplateInfo templateInfo : pointInfoMap.values()) {
templateInfo.addIdleDayCountByOne();
}
designerOpenHistory.update();
}
- // 删除所有已完成的测试模版
- private void removeTestTemplates() {
- ArrayList testTemplateKeys = new ArrayList<>(); // 保存测试模板的key
- for (String key : templateInfoMap.keySet()) {
- if (templateInfoMap.get(key).isTestTemplate()) {
- testTemplateKeys.add(key);
- }
- }
- // 删除测试模板
- for (String key : testTemplateKeys) {
- removeFromTemplateInfoList(key);
- }
- }
-
- private void removeFromTemplateInfoList(String key) {
- templateInfoMap.remove(key);
- }
-
@Override
public void readXML(XMLableReader reader) {
if (reader.isChildNode()) {
try {
String name = reader.getTagName();
if (DesignerOpenHistory.XML_TAG.equals(name)) {
+ if (designerOpenHistory == null) {
+ designerOpenHistory = DesignerOpenHistory.getInstance();
+ }
reader.readXMLObject(designerOpenHistory);
} else if (TemplateInfo.XML_TAG.equals(name)) {
TemplateInfo templateInfo = TemplateInfo.newInstanceByRead(reader);
- templateInfoMap.put(templateInfo.getTemplateID(), templateInfo);
+ pointInfoMap.put(templateInfo.getTemplateID(), templateInfo);
}
} catch (Exception ex) {
// 什么也不做，使用默认值
@@ -243,7 +131,7 @@ public class TemplateInfoCollector implements XMLReadable, XMLWriter {
designerOpenHistory.writeXML(writer);
writer.startTAG(XML_TEMPLATE_INFO_LIST);
- for (TemplateInfo templateInfo : templateInfoMap.values()) {
+ for (TemplateInfo templateInfo : pointInfoMap.values()) {
templateInfo.writeXML(writer);
}
writer.end();
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
index d916d967f..cdafa8c41 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -528,14 +528,14 @@ public abstract class ToolBarMenuDock {
*/
public ShortCut[] createHelpShortCuts() {
final java.util.List shortCuts = new ArrayList();
- shortCuts.add(new WebDemoAction());
// 英文，把 video 和帮助文档放到 Help 下面
if (GeneralContext.getLocale().equals(Locale.US)) {
shortCuts.add(new VideoAction());
shortCuts.add(new TutorialAction());
}
- //远程不使用更新升级
+ //远程不使用更新升级，产品演示
if (WorkContext.getCurrent().isLocal()) {
+ shortCuts.add(new WebDemoAction());
shortCuts.add(new SoftwareUpdateAction());
}
if (AlphaFineConfigManager.isALPHALicAvailable()) {
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionDialog.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionDialog.java
index 15d8bae63..8216ad573 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionDialog.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionDialog.java
@@ -31,7 +31,7 @@ import java.util.List;
public class FileVersionDialog extends UIDialog {
- public static final long DELAY = 24 * 60 * 60 * 1000;
+ public static final long DELAY = 24 * 60 * 60 * 1000L;
private UIButton okBtn;
private UIButton cancelBtn;
private DateEditor dateEditor;
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionRowPanel.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionRowPanel.java
index cd01d409c..2bd441c19 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionRowPanel.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionRowPanel.java
@@ -1,5 +1,6 @@
package com.fr.design.mainframe.vcs.ui;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.frpane.UITextPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel;
@@ -61,7 +62,7 @@ public class FileVersionRowPanel extends JPanel {
confirmBtn.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent evt) {
- if (JOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Vcs_Version_Revert_Confirm"), Toolkit.i18nText("Fine-Design_Vcs_Version_Revert_Title"),
+ if (FineJOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Vcs_Version_Revert_Confirm"), Toolkit.i18nText("Fine-Design_Vcs_Version_Revert_Title"),
JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
vcsEntity.setUsername(VcsHelper.getInstance().getCurrentUsername());
WorkContext.getCurrent().get(VcsOperator.class).rollbackTo(vcsEntity);
@@ -75,7 +76,7 @@ public class FileVersionRowPanel extends JPanel {
deleteBtn.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent evt) {
- if (JOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Vcs_Delete-Confirm"), Toolkit.i18nText("Fine-Design_Vcs_Remove"),
+ if (FineJOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Vcs_Delete-Confirm"), Toolkit.i18nText("Fine-Design_Vcs_Remove"),
JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
try {
WorkContext.getCurrent().get(VcsOperator.class).deleteVersion(vcsEntity.getFilename(), vcsEntity.getVersion());
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/MobileBookMarkStyleWrapper.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/MobileBookMarkStyleWrapper.java
new file mode 100644
index 000000000..85c98c103
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/MobileBookMarkStyleWrapper.java
@@ -0,0 +1,30 @@
+package com.fr.design.mainframe.widget.wrappers;
+
+import com.fr.design.Exception.ValidationException;
+import com.fr.design.designer.properties.Decoder;
+import com.fr.design.designer.properties.Encoder;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2019/12/24
+ */
+public class MobileBookMarkStyleWrapper implements Encoder, Decoder {
+ @Override
+ public Object decode(String txt) {
+ return null;
+ }
+
+ @Override
+ public void validate(String txt) throws ValidationException {
+
+ }
+
+ @Override
+ public String encode(Object v) {
+ if (v == null) {
+ return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_None_BookMark_Style");
+ }
+ return v.toString();
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/os/impl/MacOsAddListenerAction.java b/designer-base/src/main/java/com/fr/design/os/impl/MacOsAddListenerAction.java
new file mode 100644
index 000000000..bc09dbf6a
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/os/impl/MacOsAddListenerAction.java
@@ -0,0 +1,45 @@
+package com.fr.design.os.impl;
+
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.exit.DesignerExiter;
+import com.fr.invoke.Reflect;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.os.support.OSBasedAction;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/3/13
+ */
+public class MacOsAddListenerAction implements OSBasedAction {
+
+ @Override
+ public void execute(final Object... objects) {
+ try {
+ Class app = Class.forName("com.apple.eawt.Application");
+ Class handler = Class.forName("com.apple.eawt.QuitHandler");
+ Object instance = Proxy.newProxyInstance(handler.getClassLoader(), new Class[]{handler},
+ new InvocationHandler() {
+ @Override
+ public Object invoke(Object proxy, Method method,
+ Object[] args) throws Throwable {
+ if ("handleQuitRequestWith".equals(method.getName())) {
+ if (DesignerContext.getDesignerFrame() != null && DesignerContext.getDesignerFrame().isShowing()) {
+ DesignerContext.getDesignerFrame().exit();
+ } else {
+ DesignerExiter.getInstance().execute();
+ }
+ }
+ return null;
+ }
+ });
+ Reflect.on(Reflect.on(app).call("getApplication").get()).call("setQuitHandler", instance);
+ } catch (ClassNotFoundException e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java b/designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java
index 31aac9aa1..f6c0e3054 100644
--- a/designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java
+++ b/designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java
@@ -1,12 +1,19 @@
package com.fr.design.os.impl;
import com.fr.base.FRContext;
+import com.fr.general.CloudCenter;
import com.fr.general.GeneralContext;
+import com.fr.json.JSON;
+import com.fr.json.JSONFactory;
+import com.fr.json.JSONObject;
+import com.fr.stable.StringUtils;
import com.fr.stable.os.Arch;
import com.fr.stable.os.OperatingSystem;
import com.fr.stable.os.support.SupportOS;
import com.fr.workspace.WorkContext;
+import java.util.Locale;
+
/**
* @author pengda
* @date 2019/10/9
@@ -44,10 +51,18 @@ public enum SupportOSImpl implements SupportOS {
@Override
public boolean support() {
boolean isLocalEnv = WorkContext.getCurrent().isLocal();
- boolean isChineseEnv = GeneralContext.isChineseEnv();
boolean isLinux = OperatingSystem.isLinux();
// 远程设计和非中文环境以及Linux环境，都不生效
- return isLocalEnv && isChineseEnv && !isLinux;
+ return isLocalEnv && !isLinux && isPushByConf();
+ }
+
+ private boolean isPushByConf() {
+ String resp = CloudCenter.getInstance().acquireUrlByKind("update.push.conf");
+ if (StringUtils.isEmpty(resp)) {
+ return Locale.CHINA.equals(GeneralContext.getLocale());
+ }
+ JSONObject jo = JSONFactory.createJSON(JSON.OBJECT, resp);
+ return jo.getBoolean(GeneralContext.getLocale().toString());
}
},
/**
@@ -58,6 +73,30 @@ public enum SupportOSImpl implements SupportOS {
public boolean support() {
return FRContext.isChineseEnv() && !OperatingSystem.isMacos() && Arch.getArch() != Arch.ARM;
}
+ },
+
+ /**
+ * mac下dock栏右键退出
+ */
+ DOCK_QUIT {
+ @Override
+ public boolean support() {
+ return OperatingSystem.isMacos();
+ }
+ },
+
+ NON_GUARDIAN_START {
+ @Override
+ public boolean support() {
+ return OperatingSystem.isLinux() || Arch.getArch() == Arch.ARM;
+ }
+ },
+
+ DOCK_ICON {
+ @Override
+ public boolean support() {
+ return OperatingSystem.isMacos();
+ }
}
}
diff --git a/designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java b/designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java
index 14487ca5f..8e8819c67 100644
--- a/designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java
+++ b/designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java
@@ -17,6 +17,7 @@ import com.fr.design.editor.editor.Editor;
import com.fr.design.editor.editor.FloatEditor;
import com.fr.design.editor.editor.IntegerEditor;
import com.fr.design.editor.editor.TextEditor;
+import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
@@ -24,6 +25,8 @@ import com.fr.stable.ParameterProvider;
import com.fr.stable.StringUtils;
import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
import java.awt.*;
import java.util.ArrayList;
import java.util.Date;
@@ -103,6 +106,12 @@ public class ParameterInputPane extends BasicPane {
contentPane.add(flowTableLayoutHelper.createLabelFlowPane(parameterDisplayName + ":", editPane));
//add editor to parameter hashtable.
+ textF.getCurrentEditor().addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified();
+ }
+ });
this.editorNameMap.put(textF, parameter.getName());
nameAddedList.add(parameter.getName());
}
diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AbstractListControlPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AbstractListControlPane.java
index c41e4800a..bca0422ea 100644
--- a/designer-base/src/main/java/com/fr/design/remote/ui/AbstractListControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/remote/ui/AbstractListControlPane.java
@@ -6,6 +6,7 @@ import com.fr.design.beans.BasicBeanPane;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.controlpane.ShortCut4JControlPane;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
@@ -367,7 +368,7 @@ public abstract class AbstractListControlPane extends BasicPane {
checkValid();
} catch (Exception exp) {
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
- JOptionPane.showMessageDialog(AbstractListControlPane.this, exp.getMessage());
+ FineJOptionPane.showMessageDialog(AbstractListControlPane.this, exp.getMessage());
authorityList.setSelectedIndex(idx);
return true;
}
diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberList.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberList.java
index 5c2b39e6d..1fc67b285 100644
--- a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberList.java
+++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberList.java
@@ -1,5 +1,6 @@
package com.fr.design.remote.ui.list;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
import com.fr.report.constant.RoleType;
@@ -35,7 +36,7 @@ public class AddedMemberList extends MemberList {
"Fine-Design_Basic_Utils_Are_You_Sure_To_Delete_The_Role_And_Its_Design_Authorities" :
"Fine-Design_Basic_Utils_Are_You_Sure_To_Delete_The_User_And_Its_Design_Authorities";
if (member.isSelected() && member.hasAuthority()){
- int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText(keyTitle),
+ int val = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText(keyTitle),
Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (val == JOptionPane.OK_OPTION) {
member.setSelected(!member.isSelected());
diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberList.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberList.java
index ea748816f..5851ec48c 100644
--- a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberList.java
+++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberList.java
@@ -1,5 +1,6 @@
package com.fr.design.remote.ui.list;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
import com.fr.report.constant.RoleType;
@@ -37,7 +38,7 @@ public class AddingMemberList extends MemberList {
"Fine-Design_Basic_Utils_Are_You_Sure_To_Delete_The_Role_And_Its_Design_Authorities" :
"Fine-Design_Basic_Utils_Are_You_Sure_To_Delete_The_User_And_Its_Design_Authorities";
if (member.isSelected() && member.hasAuthority()){
- int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText(keyTitle),
+ int val = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText(keyTitle),
Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (val == JOptionPane.OK_OPTION) {
member.setSelected(!member.isSelected());
diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java b/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java
index d839461dd..65f66290e 100644
--- a/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java
+++ b/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java
@@ -6,6 +6,7 @@ import com.fr.design.actions.UpdateAction;
import com.fr.design.constants.UIConstants;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.data.tabledata.Prepare4DataSourceChange;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ibutton.UIHeadGroup;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.itoolbar.UIToolbar;
@@ -159,7 +160,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
*/
private void checkChanges() {
//如若有变化，则弹出下面的对话框
- int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Role_changed_Is_Refresh") + "?",
+ int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Role_changed_Is_Refresh") + "?",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
if (returnVal == JOptionPane.OK_OPTION) {
roleTree.refreshTreeNode();
diff --git a/designer-base/src/main/java/com/fr/design/scrollruler/VerticalRulerUI.java b/designer-base/src/main/java/com/fr/design/scrollruler/VerticalRulerUI.java
index 3e0a9eb06..2cd482e1e 100644
--- a/designer-base/src/main/java/com/fr/design/scrollruler/VerticalRulerUI.java
+++ b/designer-base/src/main/java/com/fr/design/scrollruler/VerticalRulerUI.java
@@ -20,7 +20,7 @@ public class VerticalRulerUI extends RulerUI{
@Override
protected void paintRuler(Graphics g, int showText, int extra, Dimension size, int ratio) {
int k = pxToLength(extra) * ratio;
- for (int i = k; i < (pxToLength(size.height + extra) + 1) * ratio; i++) {
+ for (int i = k; i < (pxToLength( (double)size.height + extra) + 1) * ratio; i++) {
g.setColor(BaseRuler.UNIT_SIGN_COLOR);
if (i % BaseRuler.SCALE_10 == 0) {
double times = (double) HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getJTemplateResolution() / ScreenResolution.getScreenResolution();
@@ -44,7 +44,7 @@ public class VerticalRulerUI extends RulerUI{
@Override
protected void paintPTRuler(Graphics g, int extra, Dimension size, int unit) {
int k = pxToLength(extra);
- for (int i = unit * (k/unit); i < pxToLength(size.height + extra); i += unit) {
+ for (int i = unit * (k/unit); i < pxToLength((double)size.height + extra); i += unit) {
g.setColor(BaseRuler.UNIT_SIGN_COLOR);
if (i % BaseRuler.SCALE_100 == 0) {
GraphHelper.drawLine(g, size.width, toPX(i) - extra, 0, toPX(i) - extra);
diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java
index ffb4e1eb0..886076ca0 100644
--- a/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java
@@ -159,15 +159,15 @@ public class PatternBackgroundPane extends BPane {
Dimension d = getSize();
this.patternBackground.paint(g2d, new Rectangle2D.Double(0, 0,
- d.width - 1, d.height - 1));
+ d.width - 1d, d.height - 1d));
if (this.pIndex == patternIndex) {// it's selected.
g2d.setPaint(new Color(255, 51, 0));
} else {
g2d.setPaint(Color.gray);
}
- GraphHelper.draw(g2d, new Rectangle2D.Double(0, 0, d.width - 1,
- d.height - 1));
+ GraphHelper.draw(g2d, new Rectangle2D.Double(0, 0, d.width - 1d,
+ d.height - 1d));
}
public Dimension getPreferredSize() {
diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java
index 8c99a89cd..3dd59bd5b 100644
--- a/designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java
@@ -152,8 +152,8 @@ public class TextureBackgroundPane extends BPane {
Dimension d = getSize();
g2d.setPaint(this.buttonTexturePaint);
- GraphHelper.fill(g2d, new Rectangle2D.Double(0, 0, d.width - 1,
- d.height - 1));
+ GraphHelper.fill(g2d, new Rectangle2D.Double(0, 0, d.width - 1d,
+ d.height - 1d));
if (ComparatorUtils.equals(texturePaint, this.buttonTexturePaint)) {// it's
// selected.
@@ -161,8 +161,8 @@ public class TextureBackgroundPane extends BPane {
} else {
g2d.setPaint(Color.gray);
}
- GraphHelper.draw(g2d, new Rectangle2D.Double(0, 0, d.width - 1,
- d.height - 1));
+ GraphHelper.draw(g2d, new Rectangle2D.Double(0, 0, d.width - 1d,
+ d.height - 1d));
}
public Dimension getPreferredSize() {
diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindow.java b/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindow.java
index 2099a1e8a..4ee3a119e 100644
--- a/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindow.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindow.java
@@ -1,40 +1,45 @@
package com.fr.design.style.color;
-import java.awt.BorderLayout;
-import java.awt.Color;
+import com.fr.design.gui.ipoppane.PopupHider;
+import com.fr.design.layout.FRGUIPaneFactory;
import javax.swing.JPopupMenu;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-
-import com.fr.design.gui.ipoppane.PopupHider;
-import com.fr.design.layout.FRGUIPaneFactory;
+import java.awt.BorderLayout;
+import java.awt.Color;
public abstract class ColorControlWindow extends JPopupMenu {
- private static final long serialVersionUID = 4317136753151221742L;
- private PopupHider popupHider;
- private ColorSelectionPopupPane selectionPopupPane;
- protected abstract void colorChanged();
+ private static final long serialVersionUID = 4317136753151221742L;
+ private PopupHider popupHider;
+ private ColorSelectionPopupPane selectionPopupPane;
+
+ protected abstract void colorChanged();
- /**
+ /**
* Constructor.
*/
public ColorControlWindow(PopupHider popupHider) {
- this(false,popupHider);
+ this(false, popupHider);
}
- /**
+
+ /**
* Constructor.
*/
public ColorControlWindow(boolean isSupportTransparent, PopupHider popupHider) {
this.initComponents(isSupportTransparent);
this.popupHider = popupHider;
}
-
+
public Color getColor() {
- if(selectionPopupPane == null) {
- return null;
- }
- return selectionPopupPane.getColor();
+ if (selectionPopupPane == null) {
+ return null;
+ }
+ return selectionPopupPane.getColor();
+ }
+
+ public PopupHider getPopupHider() {
+ return popupHider;
}
/**
@@ -48,34 +53,41 @@ public abstract class ColorControlWindow extends JPopupMenu {
setOpaque(false);
setDoubleBuffered(true);
setFocusable(false);
+ initSelectionPopupPane(isSupportTransparent);
+ this.pack();
+ }
+
+ protected void initSelectionPopupPane(boolean isSupportTransparent) {
selectionPopupPane = new ColorSelectionPopupPane(isSupportTransparent);
this.add(selectionPopupPane, BorderLayout.CENTER);
- this.pack();
}
-
+
class ColorSelectionPopupPane extends NewColorSelectPane {
- private static final long serialVersionUID = 7822856562329146354L;
- public ColorSelectionPopupPane(boolean isSupportTransparent) {
- super(isSupportTransparent);
- this.addChangeListener(new ChangeListener() {
-
- @Override
- public void stateChanged(ChangeEvent e) {
- colorChanged();
- }
- });
+ private static final long serialVersionUID = 7822856562329146354L;
+
+ public ColorSelectionPopupPane(boolean isSupportTransparent) {
+ super(isSupportTransparent);
+ this.addChangeListener(new ChangeListener() {
+
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ colorChanged();
+ }
+ });
}
+
@Override
protected void doTransparent() {
- popupHider.hidePopupMenu();
- super.doTransparent();
- }
- @Override
- public void customButtonPressed() {
- popupHider.hidePopupMenu();
- super.customButtonPressed();
- }
-
+ popupHider.hidePopupMenu();
+ super.doTransparent();
+ }
+
+ @Override
+ public void customButtonPressed() {
+ popupHider.hidePopupMenu();
+ super.customButtonPressed();
+ }
+
}
}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindowWithAuto.java b/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindowWithAuto.java
new file mode 100644
index 000000000..cbb0e97ea
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindowWithAuto.java
@@ -0,0 +1,126 @@
+package com.fr.design.style.color;
+
+import com.fr.chart.base.ChartConstants;
+import com.fr.design.border.UIRoundedBorder;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ipoppane.PopupHider;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public abstract class ColorControlWindowWithAuto extends ColorControlWindow {
+
+ private ColorSelectionPopupPaneWithAuto selectionPopupPaneWithAuto;
+
+ public ColorControlWindowWithAuto(PopupHider popupHider) {
+ this(false, popupHider);
+ }
+
+ public ColorControlWindowWithAuto(boolean isSupportTransparent, PopupHider popupHider) {
+ super(isSupportTransparent, popupHider);
+ }
+
+ public Color getColor() {
+ if (selectionPopupPaneWithAuto == null) {
+ return null;
+ }
+ return selectionPopupPaneWithAuto.getColor();
+ }
+
+ protected void initSelectionPopupPane(boolean isSupportTransparent) {
+ selectionPopupPaneWithAuto = new ColorSelectionPopupPaneWithAuto(isSupportTransparent);
+ this.add(selectionPopupPaneWithAuto, BorderLayout.CENTER);
+ }
+
+ class ColorSelectionPopupPaneWithAuto extends NewColorSelectPane {
+ private static final long serialVersionUID = 7822856562329146354L;
+
+ private final static int BUTTON_HEIGHT = 15;
+
+ public ColorSelectionPopupPaneWithAuto(boolean isSupportTransparent) {
+ super(isSupportTransparent);
+
+ this.addChangeListener(new ChangeListener() {
+
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ colorChanged();
+ }
+ });
+ }
+
+ protected void doTransparent() {
+ getPopupHider().hidePopupMenu();
+ setColor(null);
+ }
+
+ protected void doAuto() {
+ getPopupHider().hidePopupMenu();
+ setColor(ChartConstants.AUTO_FONT_COLOR);
+ }
+
+ public void customButtonPressed() {
+ getPopupHider().hidePopupMenu();
+ super.customButtonPressed();
+ }
+
+ protected void initSelectButton(boolean isSupportTransparent) {
+ setSupportTransparent(isSupportTransparent);
+ this.setLayout(FRGUIPaneFactory.createBorderLayout());
+ this.setBorder(new UIRoundedBorder(UIConstants.TOOLBAR_BORDER_COLOR, 1, 5));
+
+ UIButton transparentButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency"));
+ UIButton autoButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_ChartF_Auto"));
+
+ transparentButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ doTransparent();
+ }
+ });
+
+ autoButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ doAuto();
+ }
+ });
+
+ if (isSupportTransparent) {
+ double p = TableLayout.PREFERRED;
+ double f = TableLayout.FILL;
+ double[] columnSize = {f, 0};
+ double[] rowSize = {p, p};
+
+ Component[][] components = new Component[][]{
+ new Component[]{autoButton, null},
+ new Component[]{transparentButton, null}
+ };
+
+ JPanel buttonGroup = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+ this.add(buttonGroup, BorderLayout.NORTH);
+ } else {
+ this.add(autoButton, BorderLayout.NORTH);
+ }
+ }
+
+ public Dimension getPreferredSize() {
+ if (isSupportTransparent()) {
+ return new Dimension(super.getPreferredSize().width, TRANSPARENT_WINDOW_HEIGHT + BUTTON_HEIGHT);
+ }
+ return new Dimension(super.getPreferredSize().width, WINDOW_HEIGHT + BUTTON_HEIGHT);
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java
index 758c673fa..13d899822 100644
--- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java
@@ -11,6 +11,8 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
+import static com.fr.design.i18n.Toolkit.i18nText;
+
/**
* 颜色选择器更多颜色面板
*
@@ -56,7 +58,7 @@ public class ColorSelectDetailPane extends BasicPane {
@Override
protected String title4PopupWindow() {
- return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_Color");
+ return i18nText("Fine-Design_Basic_Select_Color");
}
protected void initComponents() {
@@ -65,20 +67,15 @@ public class ColorSelectDetailPane extends BasicPane {
// 颜色选择器面板
selectedPanel = new JColorChooser(this.color);
selectedPanel.setPreferredSize(new Dimension(selectedPanel.getWidth(), SELECT_PANEL_HEIGHT));
- AbstractColorChooserPanel[] choosers = selectedPanel.getChooserPanels();
- for (int i = 0; i < choosers.length; i++) {
- selectedPanel.removeChooserPanel(choosers[i]);
- }
selectedPanel.setPreviewPanel(new JPanel());
AbstractColorChooserPanel swatchChooserPanel = new SwatchChooserPanel();
AbstractColorChooserPanel customChooserPanel = new CustomChooserPanel();
- selectedPanel.addChooserPanel(swatchChooserPanel);
- selectedPanel.addChooserPanel(customChooserPanel);
+ selectedPanel.setChooserPanels(new AbstractColorChooserPanel[]{swatchChooserPanel, customChooserPanel});
this.add(selectedPanel, BorderLayout.NORTH);
// 最近使用面板
- recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Used"));
+ recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Used"));
RecentUseColorPane recent = new RecentUseColorPane(selectedPanel);
recentUsePanel.add(recent);
@@ -87,7 +84,7 @@ public class ColorSelectDetailPane extends BasicPane {
selectedPanel.setPreviewPanel(new JPanel());
// 预览
- previewPanel = FRGUIPaneFactory.createTitledBorderPaneCenter(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
+ previewPanel = FRGUIPaneFactory.createTitledBorderPaneCenter(i18nText("Fine-Design_Basic_Preview"));
final ColorChooserPreview colorChooserPreview = new ColorChooserPreview();
ColorSelectionModel model = selectedPanel.getSelectionModel();
model.addChangeListener(new ChangeListener() {
diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java
index d53232416..6c21c10cb 100644
--- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java
@@ -5,6 +5,7 @@ import com.fr.design.border.UIRoundedBorder;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.DesignerContext;
@@ -39,8 +40,8 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
// 是否支持透明
private boolean isSupportTransparent;
- private final static int TRANSPANENT_WINDOW_HEIGHT = 165;
- private final static int WINDWO_HEIGHT = 150;
+ public final static int TRANSPARENT_WINDOW_HEIGHT = 165;
+ public final static int WINDOW_HEIGHT = 150;
// 最近使用颜色
private UsedColorPane usedColorPane;
@@ -56,20 +57,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
* Constructor.
*/
NewColorSelectPane(boolean isSupportTransparent) {
- this.isSupportTransparent = isSupportTransparent;
- this.setLayout(FRGUIPaneFactory.createBorderLayout());
- this.setBorder(new UIRoundedBorder(UIConstants.TOOLBAR_BORDER_COLOR, 1, 5));
- if (isSupportTransparent) {
- UIButton transpanrentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency"));
- this.add(transpanrentButton, BorderLayout.NORTH);
- transpanrentButton.addActionListener(new ActionListener() {
-
- @Override
- public void actionPerformed(ActionEvent e) {
- doTransparent();
- }
- });
- }
+ initSelectButton(isSupportTransparent);
// center
JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
@@ -97,7 +85,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
centerPane.add(Box.createVerticalStrut(1));
// mod by anchore 16/11/16
- final UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_More_Color"));
+ final UIButton customButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_More_Color"));
// 不能使用 ActionListener，否则设计器工具栏中的"更多颜色"按钮会有问题（REPORT-13654）
customButton.addMouseListener(new MouseAdapter() {
@@ -117,6 +105,31 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
centerPane.add(centerPane1);
}
+ public boolean isSupportTransparent() {
+ return isSupportTransparent;
+ }
+
+ public void setSupportTransparent(boolean supportTransparent) {
+ isSupportTransparent = supportTransparent;
+ }
+
+ protected void initSelectButton(boolean isSupportTransparent){
+ this.isSupportTransparent = isSupportTransparent;
+ this.setLayout(FRGUIPaneFactory.createBorderLayout());
+ this.setBorder(new UIRoundedBorder(UIConstants.TOOLBAR_BORDER_COLOR, 1, 5));
+ if (isSupportTransparent) {
+ UIButton transparentButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency"));
+ this.add(transparentButton, BorderLayout.NORTH);
+ transparentButton.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ doTransparent();
+ }
+ });
+ }
+ }
+
/**
* 添加监听
@@ -199,9 +212,9 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
@Override
public Dimension getPreferredSize() {
if (isSupportTransparent) {
- return new Dimension(super.getPreferredSize().width, TRANSPANENT_WINDOW_HEIGHT);
+ return new Dimension(super.getPreferredSize().width, TRANSPARENT_WINDOW_HEIGHT);
}
- return new Dimension(super.getPreferredSize().width, WINDWO_HEIGHT);
+ return new Dimension(super.getPreferredSize().width, WINDOW_HEIGHT);
}
/**
diff --git a/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java b/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java
index dce7b6c30..9066b4a90 100644
--- a/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java
@@ -3,15 +3,6 @@
*/
package com.fr.design.style.color;
-import java.awt.Color;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-
-import javax.swing.Icon;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
-
import com.fr.base.BaseUtils;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
@@ -20,234 +11,237 @@ import com.fr.design.gui.ibutton.UIColorButton;
import com.fr.design.gui.ibutton.UICombinationButton;
import com.fr.design.gui.ipoppane.PopupHider;
import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.stable.os.OperatingSystem;
+
+import javax.swing.Icon;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
+import java.awt.Color;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
/**
* Color select pane2.
*/
public class UIToolbarColorButton extends UICombinationButton implements PopupHider, ColorSelectable, UIObserver {
- private static final long serialVersionUID = 3220957076370197935L;
- private Color color = null;
- private boolean isCanBeNull = false;
- private ColorControlWindow popupWin;
- //color setting action.
- private EventListenerList colorChangeListenerList = new EventListenerList();
- private UIObserverListener uiObserverListener;
-
-
- public UIToolbarColorButton(Icon icon) {
- super(new UIColorButton(icon), new UIButton(BaseUtils.readIcon("/com/fr/design/images/gui/popup.gif")));
- getLeftButton().setEventBanned(true);
- getRightButton().addFocusListener(new FocusListener() {
-
- @Override
- public void focusGained(FocusEvent e) {
- }
-
- @Override
- public void focusLost(FocusEvent e) {
- hidePopupMenu();
- }
- });
- iniListener();
- }
-
- private void iniListener() {
- if (shouldResponseChangeListener()) {
- this.addColorChangeListener(new ChangeListener() {
- @Override
- public void stateChanged(ChangeEvent e) {
- if (uiObserverListener == null) {
- return;
- }
- uiObserverListener.doChange();
- }
- });
- }
- }
-
- @Override
- /**
- *
- */
- public UIColorButton getLeftButton() {
- // TODO Auto-generated method stub
- return (UIColorButton) super.getLeftButton();
- }
-
- /**
- * @return
- */
- public Color getColor() {
- return this.color;
- }
-
- /**
- * @param color
- */
- public void setColor(Color color) {
- setColorWithoutchanged(color);
- fireColorStateChanged();
- }
-
- /**
- * 设置颜色
- * @param color 颜色
- */
- public void setColorWithoutchanged(Color color) {
- this.color = color;
- getLeftButton().setColor(color);
- }
-
- /**
- * 是否可为NULL值
- * @return 同上
- */
- public boolean isCanBeNull() {
- return this.isCanBeNull;
- }
-
- /**
- * @param isCanBeNull
- */
- public void setCanBeNull(boolean isCanBeNull) {
- this.isCanBeNull = isCanBeNull;
- }
-
- @Override
- /**
- *
- */
- public void setEnabled(boolean enabled) {
- super.setEnabled(enabled);
-
- if (!enabled) {
- color = null;
- }
-
- getLeftButton().setEnabled(enabled);
- getLeftButton().setEnabled(enabled);
- }
-
- @Override
- /**
- *
- */
- public void setToolTipText(String tooltipText) {
- getLeftButton().setToolTipText(tooltipText);
- getLeftButton().setToolTipText(tooltipText);
- }
-
- private void showPopupMenu() {
- if (popupWin != null && popupWin.isVisible()) {
- hidePopupMenu();
- return;
- }
-
- if (!this.isEnabled()) {
- return;
- }
-
- popupWin = this.getColorControlWindow();
-
- GUICoreUtils.showPopupMenu(popupWin, this, 0, this.getSize().height);
- }
-
- /**
- * 隐藏弹出框
- */
- public void hidePopupMenu() {
- if (popupWin != null) {
- popupWin.setVisible(false);
- }
-
- popupWin = null;
- }
-
- private ColorControlWindow getColorControlWindow() {
- //find parant.
- if (this.popupWin == null) {
- this.popupWin = new ColorControlWindow(this.isCanBeNull(), UIToolbarColorButton.this) {
- @Override
- protected void colorChanged() {
- UIToolbarColorButton.this.setColor(this.getColor());
- }
-
- };
- }
-
- return popupWin;
- }
-
- /**
- * Adds a new ColorChangeListener
- * 注册监听
- * @param changeListener 监听
- */
- public void addColorChangeListener(ChangeListener changeListener) {
- colorChangeListenerList.add(ChangeListener.class, changeListener);
- }
-
- /**
- * Removes an old ColorChangeListener.
- * 移除监听
- * @param changeListener 监听
- */
- public void removeColorChangeListener(ChangeListener changeListener) {
- colorChangeListenerList.remove(ChangeListener.class, changeListener);
- }
-
- /**
- * 触发颜色改变事件
- *
- */
- public void fireColorStateChanged() {
- Object[] listeners = colorChangeListenerList.getListenerList();
- ChangeEvent e = null;
-
- for (int i = listeners.length - 2; i >= 0; i -= 2) {
- if (listeners[i] == ChangeListener.class) {
- if (e == null) {
- e = new ChangeEvent(this);
- }
- ((ChangeListener) listeners[i + 1]).stateChanged(e);
- }
- }
- }
-
- protected void leftButtonClickEvent() {
- color = getLeftButton().getColor();
- fireColorStateChanged();
- }
-
- @Override
- protected void rightButtonClickEvent() {
- showPopupMenu();
- }
-
- @Override
- /**
- * 选中颜色
- * @param colorCell 颜色单元格
- */
- public void colorSetted(ColorCell colorCell) {
- hidePopupMenu();
- }
-
- @Override
- /**
- * 注册监听
- * @param listener 监听
- */
- public void registerChangeListener(UIObserverListener listener) {
- uiObserverListener = listener;
- }
-
- @Override
- /**
- * 是否响应监听
- * @return 同上
- */
- public boolean shouldResponseChangeListener() {
- return true;
- }
+ private static final long serialVersionUID = 3220957076370197935L;
+ private Color color = null;
+ private boolean isCanBeNull = false;
+ private ColorControlWindow popupWin;
+ //color setting action.
+ private EventListenerList colorChangeListenerList = new EventListenerList();
+ private UIObserverListener uiObserverListener;
+
+ public UIToolbarColorButton(Icon icon) {
+ super(new UIColorButton(icon), new UIButton(BaseUtils.readIcon("/com/fr/design/images/gui/popup.gif")));
+ getLeftButton().setEventBanned(true);
+ getRightButton().addFocusListener(new FocusListener() {
+
+ @Override
+ public void focusGained(FocusEvent e) {
+ }
+
+ @Override
+ public void focusLost(FocusEvent e) {
+ hidePopupMenu();
+ }
+ });
+ iniListener();
+ }
+
+ private void iniListener() {
+ if (shouldResponseChangeListener()) {
+ this.addColorChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ if (uiObserverListener == null) {
+ return;
+ }
+ uiObserverListener.doChange();
+ }
+ });
+ }
+ }
+
+ @Override
+ public UIColorButton getLeftButton() {
+ // TODO Auto-generated method stub
+ return (UIColorButton) super.getLeftButton();
+ }
+
+ @Override
+ public Color getColor() {
+ return this.color;
+ }
+
+ @Override
+ public void setColor(Color color) {
+ setColorWithoutchanged(color);
+ fireColorStateChanged();
+ }
+
+ /**
+ * 设置颜色
+ *
+ * @param color 颜色
+ */
+ public void setColorWithoutchanged(Color color) {
+ this.color = color;
+ getLeftButton().setColor(color);
+ }
+
+ /**
+ * 是否可为NULL值
+ *
+ * @return 同上
+ */
+ public boolean isCanBeNull() {
+ return this.isCanBeNull;
+ }
+
+ /**
+ * @param isCanBeNull
+ */
+ public void setCanBeNull(boolean isCanBeNull) {
+ this.isCanBeNull = isCanBeNull;
+ }
+
+ @Override
+ public void setEnabled(boolean enabled) {
+ super.setEnabled(enabled);
+
+ if (!enabled) {
+ color = null;
+ }
+
+ getLeftButton().setEnabled(enabled);
+ getLeftButton().setEnabled(enabled);
+ }
+
+ @Override
+ public void setToolTipText(String tooltipText) {
+ getLeftButton().setToolTipText(tooltipText);
+ getLeftButton().setToolTipText(tooltipText);
+ }
+
+ private void showPopupMenu() {
+ if (popupWin != null && popupWin.isVisible()) {
+ hidePopupMenu();
+ return;
+ }
+
+ if (!this.isEnabled()) {
+ return;
+ }
+
+ popupWin = this.getColorControlWindow();
+
+ GUICoreUtils.showPopupMenu(popupWin, this, 0, this.getSize().height);
+ }
+
+ /**
+ * 隐藏弹出框
+ */
+ @Override
+ public void hidePopupMenu() {
+ if (popupWin != null && !OperatingSystem.isMacos()) {
+ popupWin.setVisible(false);
+ }
+
+ popupWin = null;
+ }
+
+ private ColorControlWindow getColorControlWindow() {
+ //find parant.
+ if (this.popupWin == null) {
+ this.popupWin = new ColorControlWindow(this.isCanBeNull(), UIToolbarColorButton.this) {
+ @Override
+ protected void colorChanged() {
+ UIToolbarColorButton.this.setColor(this.getColor());
+ }
+
+ };
+ }
+
+ return popupWin;
+ }
+
+ /**
+ * Adds a new ColorChangeListener
+ * 注册监听
+ *
+ * @param changeListener 监听
+ */
+ public void addColorChangeListener(ChangeListener changeListener) {
+ colorChangeListenerList.add(ChangeListener.class, changeListener);
+ }
+
+ /**
+ * Removes an old ColorChangeListener.
+ * 移除监听
+ *
+ * @param changeListener 监听
+ */
+ public void removeColorChangeListener(ChangeListener changeListener) {
+ colorChangeListenerList.remove(ChangeListener.class, changeListener);
+ }
+
+ /**
+ * 触发颜色改变事件
+ */
+ public void fireColorStateChanged() {
+ Object[] listeners = colorChangeListenerList.getListenerList();
+ ChangeEvent e = null;
+
+ for (int i = listeners.length - 2; i >= 0; i -= 2) {
+ if (listeners[i] == ChangeListener.class) {
+ if (e == null) {
+ e = new ChangeEvent(this);
+ }
+ ((ChangeListener) listeners[i + 1]).stateChanged(e);
+ }
+ }
+ }
+
+ @Override
+ protected void leftButtonClickEvent() {
+ color = getLeftButton().getColor();
+ fireColorStateChanged();
+ }
+
+ @Override
+ protected void rightButtonClickEvent() {
+ showPopupMenu();
+ }
+
+ /**
+ * 选中颜色
+ *
+ * @param colorCell 颜色单元格
+ */
+ @Override
+ public void colorSetted(ColorCell colorCell) {
+ hidePopupMenu();
+ }
+
+ /**
+ * 注册监听
+ *
+ * @param listener 监听
+ */
+ @Override
+ public void registerChangeListener(UIObserverListener listener) {
+ uiObserverListener = listener;
+ }
+
+ /**
+ * 是否响应监听
+ *
+ * @return 同上
+ */
+ @Override
+ public boolean shouldResponseChangeListener() {
+ return true;
+ }
}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/update/actions/RecoverForDesigner.java b/designer-base/src/main/java/com/fr/design/update/actions/RecoverForDesigner.java
index eb25ccea3..827a39fd3 100644
--- a/designer-base/src/main/java/com/fr/design/update/actions/RecoverForDesigner.java
+++ b/designer-base/src/main/java/com/fr/design/update/actions/RecoverForDesigner.java
@@ -30,6 +30,7 @@ public class RecoverForDesigner implements Recover {
CommonIOUtils.copyFilesInDirByPath(StableUtils.pathJoin(installHome, ProjectConstants.LOGS_NAME,
UpdateConstants.INSTALL_LIB, UpdateConstants.DESIGNERBACKUPPATH),
StableUtils.pathJoin(StableUtils.getInstallHome(), ProjectConstants.LIB_NAME));
+ FineLoggerFactory.getLogger().error("Recover down for designer");
return true;
} catch (IOException e) {
FineLoggerFactory.getLogger().error("Recover error for designer", e);
@@ -54,6 +55,7 @@ public class RecoverForDesigner implements Recover {
CommonIOUtils.copyFilesInDirByPath(StableUtils.pathJoin(installHome,ProjectConstants.LIB_NAME),
StableUtils.pathJoin(installBackup,UpdateConstants.DESIGNERBACKUPPATH));
DesignerContext.getDesignerFrame().prepareForExit();
+ FineLoggerFactory.getLogger().error("Backup down for designer");
return true;
} catch (IOException e) {
UpdateException exception = new UpdateException("Backup Exception for designer" + e.getMessage());
diff --git a/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java
index dcc282c53..efd809e79 100644
--- a/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java
+++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java
@@ -7,16 +7,11 @@ import com.fr.design.mainframe.DesignerFrame;
import com.fr.design.os.impl.SupportOSImpl;
import com.fr.design.update.ui.dialog.UpdateMainDialog;
import com.fr.general.CloudCenter;
-import com.fr.general.GeneralContext;
import com.fr.general.GeneralUtils;
import com.fr.general.http.HttpToolbox;
import com.fr.json.JSONObject;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils;
-import com.fr.stable.os.OperatingSystem;
-import com.fr.stable.os.support.OSBasedAction;
-import com.fr.stable.os.support.OSSupportCenter;
-import com.fr.workspace.WorkContext;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -32,17 +27,6 @@ public class DesignerPushUpdateManager {
private DesignerUpdateInfo updateInfo;
- static {
- if (DesignerPushUpdateConfigManager.getInstance().isAutoPushUpdateEnabled()) {
- DesignerContext.getDesignerFrame().addDesignerOpenedListener(new DesignerOpenedListener() {
- @Override
- public void designerOpened() {
- getInstance().checkAndPop();
- }
- });
- }
- }
-
private DesignerPushUpdateManager() {
}
@@ -53,6 +37,17 @@ public class DesignerPushUpdateManager {
return singleton;
}
+ public void preparePushUpdate() {
+ if (DesignerPushUpdateConfigManager.getInstance().isAutoPushUpdateEnabled()) {
+ DesignerContext.getDesignerFrame().addDesignerOpenedListener(new DesignerOpenedListener() {
+ @Override
+ public void designerOpened() {
+ getInstance().checkAndPop();
+ }
+ });
+ }
+ }
+
private void initUpdateInfo(String currentVersion, String latestVersion) {
String lastIgnoredVersion = DesignerPushUpdateConfigManager.getInstance().getLastIgnoredVersion();
String updatePushInfo = CloudCenter.getInstance().acquireUrlByKind("update.push");
@@ -63,7 +58,14 @@ public class DesignerPushUpdateManager {
private String getFullLatestVersion() {
try {
- String res = HttpToolbox.get(CloudCenter.getInstance().acquireUrlByKind("jar10.update"));
+ String url = CloudCenter.getInstance().acquireUrlByKind("jar10.update");
+ if(StringUtils.isBlank(url)){
+ return StringUtils.EMPTY;
+ }
+ String res = HttpToolbox.get(url);
+ if(StringUtils.isBlank(res)){
+ return StringUtils.EMPTY;
+ }
return new JSONObject(res).optString("buildNO");
} catch (Throwable e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
diff --git a/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java b/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
index 1fb21d41c..78df599c5 100644
--- a/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
+++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
@@ -5,6 +5,7 @@ import com.fr.decision.update.info.UpdateCallBack;
import com.fr.decision.update.info.UpdateProgressCallBack;
import com.fr.design.RestartHelper;
import com.fr.design.constants.LayoutConstants;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.dialog.UIDialog;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icontainer.UIScrollPane;
@@ -29,6 +30,8 @@ import com.fr.general.http.HttpToolbox;
import com.fr.json.JSONArray;
import com.fr.json.JSONObject;
import com.fr.log.FineLoggerFactory;
+import com.fr.process.engine.core.FineProcessContext;
+import com.fr.process.engine.core.FineProcessEngineEvent;
import com.fr.stable.*;
import com.fr.stable.project.ProjectConstants;
import com.fr.third.org.apache.http.client.methods.CloseableHttpResponse;
@@ -597,6 +600,7 @@ public class UpdateMainDialog extends UIDialog {
final String installLib = StableUtils.pathJoin(StableUtils.getInstallHome(), ProjectConstants.LOGS_NAME, UpdateConstants.INSTALL_LIB);
final JFrame frame = DesignerContext.getDesignerFrame();
final RestartHelper helper = new RestartHelper();
+ FineProcessContext.getParentPipe().fire(FineProcessEngineEvent.DESTROY);
new FileProcess(callBack) {
@Override
public void onDownloadSuccess() {
@@ -608,7 +612,7 @@ public class UpdateMainDialog extends UIDialog {
public void onDownloadFailed() {
progressBar.setVisible(false);
deleteForDesignerUpdate(installLib);
- JOptionPane.showMessageDialog(getParent(), Toolkit.i18nText("Fine-Design_Update_Info_Failed_Message"));
+ FineJOptionPane.showMessageDialog(getParent(), Toolkit.i18nText("Fine-Design_Update_Info_Failed_Message"));
helper.restartForUpdate(frame);
}
}.execute();
diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java b/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java
index 5238b0c65..4febad3a9 100644
--- a/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java
+++ b/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java
@@ -2,6 +2,7 @@ package com.fr.design.upm;
import com.fr.base.FRContext;
import com.fr.decision.webservice.v10.plugin.helper.category.impl.UpmResourceLoader;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.dialog.UIDialog;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
@@ -64,18 +65,18 @@ public class UpmFinder {
if (flag) {
if (!checkUPMResourcesExist()){
// upm下载
- int val = JOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
- Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
+ int val = FineJOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
+ Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
if (val == JOptionPane.OK_OPTION){
try {
UpmResourceLoader.INSTANCE.download();
UpmResourceLoader.INSTANCE.install();
- JOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"),
- Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.INFORMATION_MESSAGE);
+ FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"),
+ Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.INFORMATION_MESSAGE);
} catch (Exception e){
FineLoggerFactory.getLogger().error(e.getMessage(), e);
- JOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Updater_Download_Failed"),
- Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.INFORMATION_MESSAGE);
+ FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Updater_Download_Failed"),
+ Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.INFORMATION_MESSAGE);
}
}
}
diff --git a/designer-base/src/main/java/com/fr/design/utils/BrowseUtils.java b/designer-base/src/main/java/com/fr/design/utils/BrowseUtils.java
index 8a68593ef..c8f98421c 100644
--- a/designer-base/src/main/java/com/fr/design/utils/BrowseUtils.java
+++ b/designer-base/src/main/java/com/fr/design/utils/BrowseUtils.java
@@ -1,5 +1,6 @@
package com.fr.design.utils;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.OperatingSystem;
import com.fr.stable.StringUtils;
@@ -27,7 +28,7 @@ public class BrowseUtils {
// win10 内存用到到80%左右的时候, Desktop.browser经常提示"存储空间不足, 无法处理改命令", 用rundll32可以打开.
Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + uri);
} catch (IOException ee) {
- JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser_Duplicate"));
+ FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser_Duplicate"));
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
} else {
diff --git a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
index 8d32e6e0e..09a5b683d 100644
--- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
+++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
@@ -5,9 +5,11 @@ import com.fr.base.ServerConfig;
import com.fr.concurrent.NamedThreadFactory;
import com.fr.design.DesignerEnvManager;
import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.fun.DesignerEnvProcessor;
import com.fr.design.gui.UILookAndFeel;
import com.fr.design.mainframe.DesignerContext;
+import com.fr.exit.DesignerExiter;
import com.fr.file.FileFILE;
import com.fr.general.ComparatorUtils;
import com.fr.general.FRFont;
@@ -29,7 +31,9 @@ import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.ServerSocket;
@@ -38,15 +42,21 @@ import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.Enumeration;
import java.util.Locale;
+import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
/**
* Some util method of Designer
*/
public class DesignUtils {
- private static int port = DesignerPort.MESSAGE_PORT;
+ private static int port = DesignerPort.getInstance().getMessagePort();
+
+ private static boolean started = false;
private DesignUtils() {
}
@@ -61,15 +71,54 @@ public class DesignUtils {
}
/**
- * 通过端口是否被占用判断设计器有没有启动
- * s
+ * 判断设计器有没有启动
*
* @return 启动了返回true
*/
public static boolean isStarted() {
- try (Socket socket = new Socket("localhost", port)) {
+ return started;
+ }
+
+
+ /**
+ * 判断设计器端口是否被其他程序占用
+ * 尝试去通信，无回应就是其他程序占用端口，否则需要继续判断是否为设计器进程未关闭
+ * @return
+ */
+ public static boolean isPortOccupied() {
+ ExecutorService executor = null;
+ Future future = null;
+ try (Socket socket = new Socket("localhost", port);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8));
+ PrintWriter writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.UTF_8)))) {
+ writer.println("check");
+ writer.flush();
+ executor = Executors.newSingleThreadExecutor();
+ future = executor.submit(new Callable() {
+ @Override
+ public String call() throws Exception {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ if ("response".equals(line)) {
+ // 正常通信 上一次设计器进程未关闭
+ started = true;
+ return line;
+ }
+ }
+ return StringUtils.EMPTY;
+ }
+ });
+ future.get(2, TimeUnit.SECONDS);
+ return false;
+ } catch (TimeoutException e) {
+ future.cancel(true);
return true;
- } catch (Exception ignored) {
+ } catch (Exception ignore) {
+
+ } finally {
+ if (executor != null) {
+ executor.shutdownNow();
+ }
}
return false;
}
@@ -79,15 +128,12 @@ public class DesignUtils {
*
* @param lines 命令行
*/
- public static void clientSend(String[] lines) {
+ public static void clientSend(String[] lines, Socket socket) {
if (lines == null || lines.length == 0) {
return;
}
- Socket socket = null;
PrintWriter writer = null;
try {
- socket = new Socket("localhost", port);
-
writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.UTF_8)));
for (int i = 0; i < lines.length; i++) {
writer.println(lines[i]);
@@ -96,19 +142,23 @@ public class DesignUtils {
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
} finally {
- try {
- if (writer != null) {
- writer.close();
- }
- if (socket != null) {
- socket.close();
- }
- } catch (IOException e) {
- FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ if (writer != null) {
+ writer.close();
}
}
}
+ public static void clientSend(String[] lines) {
+ if (lines == null || lines.length == 0) {
+ return;
+ }
+ try (Socket socket = new Socket("localhost", port)) {
+ clientSend(lines, socket);
+ } catch (Exception ignore) {
+
+ }
+ }
+
/**
* 建立监听端口
*
@@ -138,7 +188,11 @@ public class DesignUtils {
if (line.startsWith("demo")) {
DesignerEnvManager.getEnvManager().setCurrentEnv2Default();
ServerStarter.browserDemoURL();
- } else if (StringUtils.isNotEmpty(line)) {
+ } else if ("check".equals(line)) {
+ clientSend(new String[] {"response"}, socket);
+ } else if ("end".equals(line)) {
+ DesignerExiter.getInstance().execute(); }
+ else if (StringUtils.isNotEmpty(line)) {
File f = new File(line);
String path = f.getAbsolutePath();
@@ -165,6 +219,14 @@ public class DesignUtils {
}
+ public static void responseToClient(Socket socket) {
+ try (OutputStream outputStream = socket.getOutputStream()) {
+ outputStream.write("reponse".getBytes(StandardCharsets.UTF_8));
+ outputStream.flush();
+ } catch (IOException ignore) {
+ }
+ }
+
/**
* 弹出对话框,显示报错
*
@@ -176,7 +238,7 @@ public class DesignUtils {
@Override
public void run() {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), final_msg);
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), final_msg);
}
});
}
diff --git a/designer-base/src/main/java/com/fr/design/utils/DesignerPort.java b/designer-base/src/main/java/com/fr/design/utils/DesignerPort.java
index 7c082800e..55dc1f00d 100644
--- a/designer-base/src/main/java/com/fr/design/utils/DesignerPort.java
+++ b/designer-base/src/main/java/com/fr/design/utils/DesignerPort.java
@@ -1,26 +1,222 @@
package com.fr.design.utils;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.RestartHelper;
+import com.fr.design.dialog.TipDialog;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.exit.DesignerExiter;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
+import com.fr.stable.StringUtils;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLReadable;
+import com.fr.stable.xml.XMLWriter;
+import com.fr.stable.xml.XMLableReader;
+
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
/**
* 为的就是能替换 DesignPort.class 实现多开,因此避免编译器常量编译展开优化
*/
-public class DesignerPort {
+public class DesignerPort implements XMLReadable, XMLWriter {
+
+ public static final String XML_TAG = "DesignerPort";
+ private static final int MIN_PORT = 1024;
+ private static final int MAX_PORT = 65535;
+
+ public static final DesignerPort INSTANCE = new DesignerPort();
+
+ public static DesignerPort getInstance() {
+ return INSTANCE;
+ }
+
private DesignerPort() {
}
/**
- * 设计器端口，避免编译期常量优化展开
+ * 设计器端口
*/
- public static final int MESSAGE_PORT = getMessagePort();
+ private int messagePort = 51462;
+
/**
- * 设计器端口，避免编译期常量优化展开
+ * 设计器端口，debug模式下
*/
- public static final int DEBUG_MESSAGE_PORT = getDebugMessagePort();
+ private int debugMessagePort = 51463;
+
+ public int getMessagePort() {
+ return messagePort;
+ }
+
+ public int getDebugMessagePort() {
+ return debugMessagePort;
+ }
+
+ public void setMessagePort(int messagePort) {
+ this.messagePort = messagePort;
+ }
+
+ public void setDebugMessagePort(int debugMessagePort) {
+ this.debugMessagePort = debugMessagePort;
+ }
+
+ @Override
+ public void readXML(XMLableReader reader) {
+ if (reader.isAttr()) {
+ this.setMessagePort(reader.getAttrAsInt("messagePort", 51462));
+ this.setDebugMessagePort(reader.getAttrAsInt("debugMessagePort", 51463));
+ }
+ }
- private static int getMessagePort() {
- return 51462;
+ @Override
+ public void writeXML(XMLPrintWriter writer) {
+ writer.startTAG(XML_TAG);
+ writer.attr("messagePort", this.messagePort);
+ writer.attr("debugMessagePort", this.debugMessagePort);
+ writer.end();
}
- private static int getDebugMessagePort() {
- return 51463;
+ public void resetPort() {
+
+ TipDialog dialog = new TipDialog(null,
+ StringUtils.EMPTY,
+ Toolkit.i18nText("Fine-Design_Port_Found_Port_Conflict"),
+ Toolkit.i18nText("Fine-Design_End_Occupied_Process"),
+ Toolkit.i18nText("Fine-Design_Modify_Designer_Port")) {
+ @Override
+ protected void endEvent() {
+ dispose();
+ }
+
+ @Override
+ protected void cancelEvent() {
+ new ResetPortDialog();
+ }
+ };
+ dialog.setVisible(true);
+ DesignerExiter.getInstance().execute();
}
+
+ private class ResetPortDialog extends JDialog {
+ private UITextField portFiled;
+ private UILabel warnLabel;
+ private UIButton okButton;
+
+ private ResetPortDialog() {
+ this.setLayout(new BorderLayout());
+ this.setModal(true);
+ this.portFiled = new UITextField();
+ this.portFiled.setPreferredSize(new Dimension(180, 20));
+ this.portFiled.getDocument().addDocumentListener(new DocumentListener() {
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ checkValid();
+ }
+
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ checkValid();
+ }
+
+ @Override
+ public void changedUpdate(DocumentEvent e) {
+ checkValid();
+ }
+ });
+ JPanel iconPanel = new JPanel();
+ UILabel iconLabel = new UILabel();
+ iconLabel.setIcon(IOUtils.readIcon("com/fr/design/images/edit/edit_typing.png"));
+ iconPanel.add(iconLabel);
+ iconPanel.add(iconLabel);
+ JPanel textPane = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 10);
+ textPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Modify_Designer_Port_Tip")));
+ textPane.add(portFiled);
+ warnLabel = new UILabel();
+ warnLabel.setVisible(false);
+ warnLabel.setForeground(Color.RED);
+ okButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Button_OK"));
+ okButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ int value = Integer.parseInt(portFiled.getText().trim());
+ if (ComparatorUtils.equals("true", System.getProperty("debug"))) {
+ setDebugMessagePort(value);
+ } else {
+ setMessagePort(value);
+ }
+ dispose();
+ DesignerEnvManager.getEnvManager().saveXMLFile();
+ RestartHelper.restart();
+ }
+ });
+ UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Button_Cancel"));
+ cancelButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ dispose();
+ }
+ });
+ JPanel buttonPane = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+ buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 15));
+ buttonPane.add(okButton);
+ buttonPane.add(cancelButton);
+ JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ controlPane.add(buttonPane, BorderLayout.EAST);
+ JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ northPane.add(iconPanel, BorderLayout.WEST);
+ northPane.add(textPane, BorderLayout.CENTER);
+ JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ centerPane.add(warnLabel);
+ JPanel southPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ southPane.add(controlPane);
+ this.add(northPane, BorderLayout.NORTH);
+ this.add(centerPane, BorderLayout.CENTER);
+ this.add(southPane, BorderLayout.SOUTH);
+ this.setSize(300, 150);
+ this.setTitle(Toolkit.i18nText("Fine-Design_Modify_Designer_Port"));
+ this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+ this.setResizable(false);
+ this.setAlwaysOnTop(true);
+ GUICoreUtils.centerWindow(this);
+ this.setVisible(true);
+ }
+
+ private void checkValid() {
+ String port = this.portFiled.getText().trim();
+ if (StringUtils.isEmpty(port)) {
+ okButton.setEnabled(false);
+ return;
+ }
+
+ int value;
+ try {
+ value = Integer.parseInt(port);
+ } catch (NumberFormatException ignore) {
+ warnLabel.setText(Toolkit.i18nText("Fine-Design_Modify_Designer_Port_Not_Number_Tip"));
+ warnLabel.setVisible(true);
+ okButton.setEnabled(false);
+ return;
+ }
+
+ if (value < MIN_PORT || value > MAX_PORT) {
+ warnLabel.setText(Toolkit.i18nText("Fine-Design_Modify_Designer_Port_Out_Of_Range_Tip"));
+ warnLabel.setVisible(true);
+ okButton.setEnabled(false);
+ return;
+ }
+
+ warnLabel.setVisible(false);
+ okButton.setEnabled(true);
+ }
+ }
+
}
diff --git a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java
index f0412a948..5a9396da6 100644
--- a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java
+++ b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java
@@ -16,6 +16,7 @@ import com.fr.data.util.function.SumFunction;
import com.fr.design.actions.UpdateAction;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.border.UITitledBorder;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIToggleButton;
import com.fr.design.gui.icheckbox.UICheckBox;
@@ -324,7 +325,7 @@ public final class GUICoreUtils {
/**
* Gets window/frame to screen center.
- * @param 窗口
+ * @param win 窗口
*/
public static void setWindowFullScreen(Window win) {
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
@@ -341,7 +342,7 @@ public final class GUICoreUtils {
* Shows down component.
* 显示弹出关闭菜单
* @param popup 弹出菜单
- * @param 父组件
+ * @param parentComponent 父组件
*/
public static void showPopupCloseMenu(JPopupMenu popup, Component parentComponent) {
if (popup == null) {// check null.
@@ -537,7 +538,7 @@ public final class GUICoreUtils {
/**
* 产生一个Flow Pane, flowAligment是FlowLayout.LEFT, CENTER, RIGHT.
* @param comps 组件
- * @param flowAlignement 对齐方式
+ * @param flowAlignment 对齐方式
* @param hSpace 水平间隔
* @return 面板
*/
@@ -660,7 +661,7 @@ public final class GUICoreUtils {
/**
* it's a very good method, user can get treePath from treeNode.
- * @param 节点
+ * @param treeNode 节点
* @return 路径
*/
public static TreePath getTreePath(TreeNode treeNode) {
@@ -740,7 +741,7 @@ public final class GUICoreUtils {
return false;
}
- int returnVal = JOptionPane.showConfirmDialog(ancestorWindow, com.fr.design.i18n.Toolkit.i18nText(key), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"),
+ int returnVal = FineJOptionPane.showConfirmDialog(ancestorWindow, com.fr.design.i18n.Toolkit.i18nText(key), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"),
JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.OK_OPTION) {
int minSelectedIndex = nodeList.getMinSelectionIndex();
diff --git a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java
index e4aedd421..12c72c5cd 100644
--- a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java
+++ b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java
@@ -6,6 +6,7 @@ import com.fr.base.Icon;
import com.fr.base.IconManager;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
@@ -150,7 +151,7 @@ public class CustomIconPane extends BasicPane {
} else {
// add failed
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE);
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
}
}
}).setVisible(true);
@@ -179,9 +180,9 @@ public class CustomIconPane extends BasicPane {
CustomIconPane.this.repaint();
} else {
// remove failed
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"),
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"),
JOptionPane.WARNING_MESSAGE);
}
}
@@ -204,9 +205,9 @@ public class CustomIconPane extends BasicPane {
// do nothing
}
if (oldIcon == null) {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
- "Error",
- "Error",
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"),
JOptionPane.ERROR_MESSAGE);
}
@@ -228,7 +229,7 @@ public class CustomIconPane extends BasicPane {
// 失败了再弄回去
iconManager.addIcon(oldIcon, true);
// edit failed
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE);
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
}
}
}).setVisible(true);
@@ -425,9 +426,9 @@ public class CustomIconPane extends BasicPane {
return;
}
if (WidgetInfoConfig.getInstance().getIconManager().contains(nameTextField.getText())) {
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message3"),
- com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"),
JOptionPane.WARNING_MESSAGE);
}
}
diff --git a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
index fcb272dd5..d07d42b3e 100644
--- a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
+++ b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
@@ -29,7 +29,7 @@ import java.awt.event.ActionListener;
public abstract class CustomJobPane extends BasicBeanPane {
protected UITextField classNameTextField;
protected ObjectProperiesPane objectProperiesPane;
- public static final int DEFAULT_LENGTH = 30;
+ private static final int DEFAULT_LENGTH = 25;
public CustomJobPane() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
index c28f70e5f..9df5d7916 100644
--- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
+++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
@@ -17,6 +17,7 @@ import com.fr.design.data.tabledata.tabledatapane.FormatExplanationPane;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory;
import com.fr.design.editor.editor.Editor;
@@ -584,7 +585,7 @@ public class DBManipulationPane extends BasicBeanPane {
return;
}
- int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(DBManipulationPane.this),
+ int returnVal = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(DBManipulationPane.this),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_sure_remove_item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Remove"), JOptionPane.OK_CANCEL_OPTION,
JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.OK_OPTION) {
@@ -700,7 +701,7 @@ public class DBManipulationPane extends BasicBeanPane {
}
jobs = new NameSubmitJob[dmlConfig.getSubmitJobCount()];
for (int i = 0; i < jobs.length; i++) {
- jobs[i] = dmlConfig.getSubmitJob(i);
+ jobs[i] = dmlConfig.getNameSubmitJob(i);
}
condition = dmlConfig.getCondition();
UpdateCheckBox.setSelected(dmlConfig.isUpdateSelected());
diff --git a/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java b/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java
new file mode 100644
index 000000000..9134d6429
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java
@@ -0,0 +1,135 @@
+package com.fr.env;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.env.RemoteDesignerWorkspaceInfo;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.env.utils.DisplayUtils;
+import com.fr.general.FRFont;
+import com.fr.general.GeneralContext;
+import com.fr.general.IOUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.JTextPane;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * @author: Maksim
+ * @Date: Created in 2020/2/3
+ * @Description: 远程连接时，服务检测提醒对话框
+ */
+public class CheckServiceDialog extends JDialog implements ActionListener {
+ private JPanel topPanel;
+ private JPanel centerPanel;
+ private JPanel bottomPanel;
+ private UICheckBox remindBox;
+
+ public CheckServiceDialog(Frame parent, String areaText, String localBranch, String remoteBranch){
+ super(parent,true);
+ //上面的标签面板
+ topPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ JPanel imagePanel = new JPanel();
+ Icon icon = IOUtils.readIcon("com/fr/design/images/warnings/warning5.png");
+
+ JLabel imageLabel = new JLabel();
+ imageLabel.setIcon(icon);
+ imagePanel.add(imageLabel);
+ imagePanel.setPreferredSize(new Dimension(110,100));
+
+ JPanel verticalPanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
+ FRFont font = FRFont.getInstance();
+ font = font.applySize(15).applyStyle(1);
+ JLabel label = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Branch_Inconsistency"));
+ label.setFont(font);
+ label.setPreferredSize(new Dimension(650,30));
+
+ String text = Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Local_Designer") + localBranch
+ + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Remote_Server") + remoteBranch;
+ String delimiter = DisplayUtils.getDisplayLength(text) > 70? "
":"/";
+ JLabel label2 = new JLabel(""+Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Local_Designer")
+ + localBranch + delimiter + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Remote_Server") + remoteBranch+"");
+ label2.setPreferredSize(new Dimension(600,30));
+
+ JTextPane tipsPane = new JTextPane();
+ tipsPane.setEditable(false);
+ tipsPane.setBackground(verticalPanel.getBackground());
+ tipsPane.setPreferredSize(new Dimension(500,40));
+ tipsPane.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Branch_Need_Update"));
+
+ verticalPanel.add(label);
+ verticalPanel.add(label2);
+ verticalPanel.add(tipsPane);
+
+ topPanel.add(imagePanel,BorderLayout.WEST);
+ topPanel.add(verticalPanel,BorderLayout.CENTER);
+ topPanel.setBorder(BorderFactory.createEmptyBorder(10,10,0,10));
+
+ //中间的文本域面板
+ centerPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ centerPanel.setBorder(BorderFactory.createEmptyBorder(0,10,10,10));
+ centerPanel.setPreferredSize(new Dimension(480,320));
+
+ JLabel titleLabel = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Affected_Function"));
+ titleLabel.setPreferredSize(new Dimension(400,40));
+ JTextArea checkArea = new JTextArea(areaText);
+ checkArea.setEnabled(false);
+ centerPanel.add(titleLabel,BorderLayout.NORTH);
+ centerPanel.add(checkArea,BorderLayout.CENTER);
+
+ //下面的按钮面板
+ remindBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Remind_Show"));
+ remindBox.addActionListener(remindCheckboxListener);
+ UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Button_Confirm"));
+ JPanel buttonPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ buttonPanel.setBorder(BorderFactory.createEmptyBorder(0,10,10,10));
+ buttonPanel.add(remindBox, BorderLayout.WEST);
+ buttonPanel.add(okButton,BorderLayout.EAST);
+ okButton.addActionListener(this );
+ bottomPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
+ bottomPanel.add(buttonPanel);
+
+ this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Title_Hint"));
+ this.setResizable(false);
+
+ this.add(topPanel,BorderLayout.NORTH);
+ this.add(centerPanel, BorderLayout.CENTER);
+ this.add(buttonPanel,BorderLayout.SOUTH);
+ this.setSize(new Dimension(GeneralContext.getLocale().equals(Locale.US)? 750:600, 500));
+
+ GUICoreUtils.centerWindow(this);
+ }
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ this.dispose();
+ }
+
+
+ private ActionListener remindCheckboxListener = new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ String remindTime = format.format(new Date());
+ //环境已切换，通过当前环境获取，一定是远程环境
+ String currentEnvName = DesignerEnvManager.getEnvManager().getCurEnvName();
+ RemoteDesignerWorkspaceInfo currentEnv = (RemoteDesignerWorkspaceInfo)DesignerEnvManager.getEnvManager().getWorkspaceInfo(currentEnvName);
+ currentEnv.setRemindTime(remindBox.isSelected()? remindTime : "");
+ }
+ };
+
+}
diff --git a/designer-base/src/main/java/com/fr/env/EnvListPane.java b/designer-base/src/main/java/com/fr/env/EnvListPane.java
index 30b4b76f1..911a7b22f 100644
--- a/designer-base/src/main/java/com/fr/env/EnvListPane.java
+++ b/designer-base/src/main/java/com/fr/env/EnvListPane.java
@@ -1,6 +1,7 @@
package com.fr.env;
import com.fr.design.DesignerEnvManager;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.env.DesignerWorkspaceInfo;
import com.fr.design.env.LocalDesignerWorkspaceInfo;
import com.fr.design.env.RemoteDesignerWorkspaceInfo;
@@ -33,13 +34,13 @@ public class EnvListPane extends JListControlPane {
allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY;
if (StringUtils.isEmpty(tempName)) {
nameableList.stopEditing();
- JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Empty_Name_Warn_Text"));
+ FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Empty_Name_Warn_Text"));
setIllegalIndex(editingIndex);
return;
}
if (!ComparatorUtils.equals(tempName, selectedName) && isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) {
nameableList.stopEditing();
- JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Duplicate_Name_Warn_Text", tempName));
+ FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Duplicate_Name_Warn_Text", tempName));
setIllegalIndex(editingIndex);
}
}
@@ -95,8 +96,9 @@ public class EnvListPane extends JListControlPane {
*/
public String updateEnvManager() {
DesignerEnvManager mgr = DesignerEnvManager.getEnvManager();
- mgr.clearAllEnv();
+ //这里代码时序换一下，因为update中需要借助mgr来获取提醒时间，已确认mgr对res无依赖
Nameable[] res = this.update();
+ mgr.clearAllEnv();
for (Nameable re : res) {
NameObject nameObject = (NameObject) re;
mgr.putEnv(nameObject.getName(), (DesignerWorkspaceInfo) nameObject.getObject());
diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
index 20f698a3f..9ea2f7019 100644
--- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
+++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
@@ -10,6 +10,7 @@ import com.fr.design.env.RemoteDesignerWorkspaceInfo;
import com.fr.design.fun.DesignerEnvProcessor;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ipasswordfield.UIPassWordField;
import com.fr.design.gui.itextfield.UITextField;
@@ -17,6 +18,7 @@ import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.scrollruler.ModLineBorder;
+import com.fr.license.exception.RegistEditionException;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils;
import com.fr.third.guava.base.Strings;
@@ -24,17 +26,7 @@ import com.fr.workspace.WorkContext;
import com.fr.workspace.connect.WorkspaceConnectionInfo;
import com.fr.workspace.engine.exception.WorkspaceAuthException;
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.JDialog;
-import javax.swing.JFileChooser;
-import javax.swing.JPanel;
-import javax.swing.JTextPane;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.SwingWorker;
-import javax.swing.ToolTipManager;
-import javax.swing.UIManager;
+import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
@@ -220,6 +212,9 @@ public class RemoteEnvPane extends BasicBeanPane {
updateHttpsConfigPanel();
remoteWorkspaceURL.setHttps(isHttps);
+ // reset下url，将勾选状态是否htpps加到url里
+ remoteWorkspaceURL.resetUrl();
+
fillRemoteEnvURLField();
fillIndividualField();
}
@@ -291,10 +286,13 @@ public class RemoteEnvPane extends BasicBeanPane {
contentPanel.add(configPanel, BorderLayout.NORTH);
contentPanel.add(accountPanel, BorderLayout.CENTER);
-
+ JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+ panel.add(contentPanel, BorderLayout.NORTH);
+ panel.add(testPanel, BorderLayout.CENTER);
+ panel.setPreferredSize(new Dimension(440, 600));
+ UIScrollPane scrollPane = new UIScrollPane(panel);
this.setLayout(new BorderLayout());
- this.add(contentPanel, BorderLayout.NORTH);
- this.add(testPanel, BorderLayout.CENTER);
+ this.add(scrollPane);
}
@Override
@@ -561,6 +559,9 @@ public class RemoteEnvPane extends BasicBeanPane {
return TestConnectionResult.parse(WorkContext.getConnector().testConnection(connection), connection);
} catch (WorkspaceAuthException ignored) {
return AUTH_FAILED;
+ } catch (RegistEditionException e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ throw e;
}
}
diff --git a/designer-base/src/main/java/com/fr/env/TestConnectionResult.java b/designer-base/src/main/java/com/fr/env/TestConnectionResult.java
index 5362dbbd8..4524254f4 100644
--- a/designer-base/src/main/java/com/fr/env/TestConnectionResult.java
+++ b/designer-base/src/main/java/com/fr/env/TestConnectionResult.java
@@ -34,7 +34,7 @@ public enum TestConnectionResult {
},
/**
- * 不完全成功，版本不匹配，但测试连接成功。
+ * 不完全成功，版本不匹配，但测试连接成功。该状态先保留
*/
PARTLY_SUCCESS {
@Override
@@ -89,16 +89,7 @@ public enum TestConnectionResult {
if (!value) {
return FULLY_FAILED;
}
- try {
- String serverVersion = new FunctionalHttpRequest(info).getServerVersion();
- if (AssistUtils.equals(serverVersion, WorkContext.getVersion())) {
- return FULLY_SUCCESS;
- }
- return PARTLY_SUCCESS;
- } catch (Exception e) {
- // 发生异常，说明没连接上。返回完全失败。
- FineLoggerFactory.getLogger().error(e.getMessage());
- return FULLY_FAILED;
- }
+ //去掉测试连接时所做的检测
+ return FULLY_SUCCESS;
}
}
diff --git a/designer-base/src/main/java/com/fr/env/utils/DisplayUtils.java b/designer-base/src/main/java/com/fr/env/utils/DisplayUtils.java
new file mode 100644
index 000000000..1795c5fb1
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/env/utils/DisplayUtils.java
@@ -0,0 +1,39 @@
+package com.fr.env.utils;
+
+/**
+ * @author: Maksim
+ * @Date: Created in 2020/3/16
+ * @Description:
+ */
+public class DisplayUtils {
+
+ /**
+ * 获取字符串显示时的计算长度
+ * @param text 被计算的字符串
+ * @return 计算长度
+ */
+ public static int getDisplayLength(String text){
+ if (text == null) {
+ return 0;
+ }
+ char[] c = text.toCharArray();
+ int len = 0;
+ for (int i = 0; i < c.length; i++) {
+ len++;
+ if(!isLetter(c[i])){
+ len++;
+ };
+ }
+ return len;
+ }
+
+ /**
+ * 判断字符是否为字母、数字、英文符号
+ * @param c 传入的字符
+ * @return 如果符合上述条件，返回true
+ */
+ public static boolean isLetter(char c) {
+ int k = 0x80;
+ return c / k == 0;
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/exit/DesignerExiter.java b/designer-base/src/main/java/com/fr/exit/DesignerExiter.java
new file mode 100644
index 000000000..e7189511a
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/exit/DesignerExiter.java
@@ -0,0 +1,33 @@
+package com.fr.exit;
+
+import com.fr.design.env.DesignerWorkspaceGenerator;
+import com.fr.process.engine.core.FineProcessContext;
+import com.fr.process.engine.core.FineProcessEngineEvent;
+import com.fr.stable.StableUtils;
+
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/2/12
+ */
+public class DesignerExiter {
+
+ public static final DesignerExiter INSTANCE = new DesignerExiter();
+
+ public static DesignerExiter getInstance() {
+ return INSTANCE;
+ }
+
+ public void execute() {
+ beforeExit();
+ if (FineProcessContext.getParentPipe() != null) {
+ FineProcessContext.getParentPipe().fire(FineProcessEngineEvent.DESTROY);
+ }
+ System.exit(0);
+ }
+
+ private void beforeExit() {
+ DesignerWorkspaceGenerator.stop();
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
index 52e63c9bf..0ca481b09 100644
--- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
+++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
@@ -7,6 +7,7 @@ import com.fr.design.DesignerEnvManager;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.actions.UpdateAction;
import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.dialog.UIDialog;
import com.fr.design.env.DesignerWorkspaceInfo;
import com.fr.design.env.DesignerWorkspaceType;
@@ -504,6 +505,9 @@ public class FILEChooserPane extends BasicPane {
if (StringUtils.isEmpty(fileName) || StringUtils.isEmpty(filterExtension) || fileFilter.containsExtension(fileExtension.getExtension())) {
return fileName;
}
+ if (!ComparatorUtils.equals(fileNameExtension, filterExtension)) {
+ return fileName + filterExtension;
+ }
return fileNameWithOutExtension + filterExtension;
}
@@ -733,6 +737,7 @@ public class FILEChooserPane extends BasicPane {
fileNameTextField.setText("");
fileNameTextField.addDocumentListener();
}
+ dialog.setAlwaysOnTop(true);
dialog.setVisible(true);
return option;
}
@@ -846,7 +851,7 @@ public class FILEChooserPane extends BasicPane {
saveDictionary();
dialogExit();
} else {
- JOptionPane.showMessageDialog(this, Toolkit.i18nText("Fine-Design_Basic_App_Template_Report_Not_Exist"));
+ FineJOptionPane.showMessageDialog(this, Toolkit.i18nText("Fine-Design_Basic_App_Template_Report_Not_Exist"));
return;
}
}
@@ -876,8 +881,8 @@ public class FILEChooserPane extends BasicPane {
if (access(selectedFile) && access(currentDirectory)) {
if (selectedFile.exists()) {
- int selVal = JOptionPane.showConfirmDialog(dialog, Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Cover_The_Current_File") + " ?",
- ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE);
+ int selVal = FineJOptionPane.showConfirmDialog(dialog, Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Cover_The_Current_File") + " ?",
+ Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
if (selVal == JOptionPane.YES_OPTION) {
option = JOPTIONPANE_OK_OPTION;
saveDictionary();
@@ -891,7 +896,7 @@ public class FILEChooserPane extends BasicPane {
saveDictionary();
}
} else {
- JOptionPane.showMessageDialog(FILEChooserPane.this, Toolkit.i18nText("Fine-Design_Basic_App_Privilege_No") + "!", Toolkit.i18nText("Fine-Design_Basic_App_File_Message"), JOptionPane.WARNING_MESSAGE);
+ FineJOptionPane.showMessageDialog(FILEChooserPane.this, Toolkit.i18nText("Fine-Design_Basic_App_Privilege_No") + "!", Toolkit.i18nText("Fine-Design_Basic_App_File_Message"), JOptionPane.WARNING_MESSAGE);
}
}
@@ -1553,7 +1558,7 @@ public class FILEChooserPane extends BasicPane {
if (access(currentDirectory)) {
new MkdirDialog();
} else {
- JOptionPane.showMessageDialog(
+ FineJOptionPane.showMessageDialog(
FILEChooserPane.this,
Toolkit.i18nText("Fine-Design_Basic_App_Privilege_No") + "!",
Toolkit.i18nText("Fine-Design_Basic_App_File_Message"),
@@ -1715,9 +1720,9 @@ public class FILEChooserPane extends BasicPane {
scrollPane.getVerticalScrollBar().setValue(value);
} else {
- JOptionPane.showConfirmDialog(FILEChooserPane.this,
+ FineJOptionPane.showConfirmDialog(FILEChooserPane.this,
Toolkit.i18nText("Fine-Design_Basic_Make_Failure"),
- UIManager.getString("OptionPane.messageDialogTitle"),
+ Toolkit.i18nText("Fine-Design_Basic_Error"),
JOptionPane.DEFAULT_OPTION,
JOptionPane.ERROR_MESSAGE);
}
diff --git a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java
index dce2c38e0..138cfe345 100644
--- a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java
+++ b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java
@@ -23,7 +23,7 @@ import com.fr.workspace.WorkspaceEvent;
import com.fr.workspace.resource.WorkResourceTempRenameStream;
import com.fr.workspace.server.lock.TplOperator;
-import javax.swing.Icon;
+import javax.swing.*;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.OutputStream;
@@ -68,14 +68,14 @@ public class FileNodeFILE implements FILE {
this.node = new FileNode(StableUtils.pathJoin(parentDir, name), isDir);
this.envPath = WorkContext.getCurrent().getPath();
- this.hasFullAuth = NodeAuthProcessor.getInstance().fixFileNodeAuth(node);
+ this.hasFullAuth = NodeAuthProcessor.getInstance().checkFileNodeAuth(node);
}
public FileNodeFILE(FileNode node) {
this.node = node;
this.envPath = WorkContext.getCurrent().getPath();
- this.hasFullAuth = NodeAuthProcessor.getInstance().fixFileNodeAuth(node);
+ this.hasFullAuth = NodeAuthProcessor.getInstance().checkFileNodeAuth(node);
}
public FileNodeFILE(FileNode node, boolean hasFullAuth) {
@@ -91,7 +91,7 @@ public class FileNodeFILE implements FILE {
public FileNodeFILE(FileNode node, String envPath) {
this.node = node;
this.envPath = envPath;
- this.hasFullAuth = NodeAuthProcessor.getInstance().fixFileNodeAuth(node);
+ this.hasFullAuth = NodeAuthProcessor.getInstance().checkFileNodeAuth(node);
}
public FileNodeFILE(FileNode node, String envPath, boolean hasFullAuth) {
diff --git a/designer-base/src/main/java/com/fr/file/filter/ChooseFileFilter.java b/designer-base/src/main/java/com/fr/file/filter/ChooseFileFilter.java
index a25ebe7b6..147e1946d 100644
--- a/designer-base/src/main/java/com/fr/file/filter/ChooseFileFilter.java
+++ b/designer-base/src/main/java/com/fr/file/filter/ChooseFileFilter.java
@@ -4,6 +4,8 @@ import com.fr.base.extension.FileExtension;
import com.fr.file.FILE;
import com.fr.file.FileFILE;
import com.fr.general.ComparatorUtils;
+import com.fr.stable.CoreConstants;
+import com.fr.stable.StringUtils;
import javax.swing.filechooser.FileFilter;
import java.io.File;
@@ -275,25 +277,25 @@ public class ChooseFileFilter extends FileFilter implements FILEFilter, java.io.
}
/**
+ * 默认情况下 返回首位的后缀名
* get extention.
*/
public String getExtensionString() {
- if (filters == null) {
- return "";
- }
-
- StringBuffer extsb = new StringBuffer(".");
-
-// Enumeration keys = filters.keys();
-// while (keys.hasMoreElements()) {
-// extsb.append((String) keys.nextElement());
-// }
+ return getExtensionString(0);
+ }
- for (int i = 0; i < filters.size(); i++) {
- extsb.append(filters.get(i));
+ public String getExtensionString(int index) {
+ if (filters == null || filters.isEmpty() || index >= filters.size()) {
+ return StringUtils.EMPTY;
}
+ return CoreConstants.DOT + filters.get(index);
+ }
- return extsb.toString();
+ public int getExtensionCount() {
+ if (filters == null || filters.isEmpty()) {
+ return 0;
+ }
+ return filters.size();
}
/**
diff --git a/designer-base/src/main/java/com/fr/start/BaseDesigner.java b/designer-base/src/main/java/com/fr/start/BaseDesigner.java
index 833faaef7..90ac634ce 100644
--- a/designer-base/src/main/java/com/fr/start/BaseDesigner.java
+++ b/designer-base/src/main/java/com/fr/start/BaseDesigner.java
@@ -14,11 +14,11 @@ import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.DesignerFrame;
import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
import com.fr.design.ui.util.UIUtil;
-import com.fr.design.utils.DesignUtils;
import com.fr.event.Event;
import com.fr.event.EventDispatcher;
import com.fr.event.Listener;
import com.fr.event.Null;
+import com.fr.exit.DesignerExiter;
import com.fr.file.FILE;
import com.fr.file.FILEFactory;
import com.fr.file.FileFILE;
@@ -26,7 +26,7 @@ import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.OperatingSystem;
-import java.awt.*;
+import java.awt.Window;
import java.io.File;
import java.lang.reflect.Method;
@@ -47,8 +47,6 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
private void init() {
prepare();
- // 初始化look and feel.这个在预加载之前执行是因为lookAndFeel里的东西，预加载时也要用到
- DesignUtils.initLookAndFeel();
// 初始化Log Handler
DesignerEnvManager.loadLogSetting();
createDesignerFrame();
@@ -137,7 +135,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
if (!isException) {
showDesignerFrame(true);
} else {
- System.exit(0);
+ DesignerExiter.getInstance().execute();
}
}
}
diff --git a/designer-base/src/main/java/com/fr/start/ServerStarter.java b/designer-base/src/main/java/com/fr/start/ServerStarter.java
index d4e1143c6..d2b8498bb 100644
--- a/designer-base/src/main/java/com/fr/start/ServerStarter.java
+++ b/designer-base/src/main/java/com/fr/start/ServerStarter.java
@@ -3,10 +3,9 @@ package com.fr.start;
import com.fr.base.ServerConfig;
import com.fr.concurrent.NamedThreadFactory;
import com.fr.design.DesignerEnvManager;
+import com.fr.design.mainframe.DesignerContext;
import com.fr.design.utils.BrowseUtils;
-import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext;
-import com.fr.stable.StableUtils;
import com.fr.start.server.FineEmbedServer;
import com.fr.start.server.FineEmbedServerMonitor;
import com.fr.workspace.WorkContext;
@@ -25,23 +24,11 @@ public class ServerStarter {
if (!WorkContext.getCurrent().isLocal()) {
//有问题，这里拿不到远程的http端口
BrowseUtils.browser(WorkContext.getCurrent().getPath());
- } else if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用
- String web = GeneralContext.getCurrentAppNameOfEnv();
- browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getEmbedServerPort() + "/" + web + "/" + ServerConfig.getInstance().getServletName());
} else {
- initDemoServerAndBrowser();
- }
-
- }
-
-
- private static void initDemoServerAndBrowser() {
-
- try {
- FineEmbedServer.start();
- } finally {
- //先访问Demo, 后访问报表, 不需要重置服务器.
- BrowseUtils.browser("http://localhost:" + DesignerEnvManager.getEnvManager().getEmbedServerPort() + "/" + GeneralContext.getCurrentAppNameOfEnv() + "/" + ServerConfig.getInstance().getServletName());
+ browserURLWithLocalEnv("http://localhost:"
+ + DesignerEnvManager.getEnvManager().getEmbedServerPort()
+ + "/" + GeneralContext.getCurrentAppNameOfEnv()
+ + "/" + ServerConfig.getInstance().getServletName());
}
}
@@ -51,8 +38,8 @@ public class ServerStarter {
* @param url 指定路径
*/
public static void browserURLWithLocalEnv(final String url) {
-
- if (!FineEmbedServerMonitor.getInstance().isComplete()) {
+ // 内置服务器没有启动并且设计器已经打开，可以使用带进度条的启动方式
+ if (!FineEmbedServer.isRunning() && DesignerContext.getDesignerFrame().isDesignerOpened()) {
FineEmbedServerMonitor.getInstance().monitor();
ExecutorService service = Executors.newSingleThreadExecutor(new NamedThreadFactory("ServerStarter"));
service.submit(new Runnable() {
@@ -68,8 +55,15 @@ public class ServerStarter {
}
});
service.shutdown();
+ } else if (!FineEmbedServer.isRunning()) {
+ // 普通方式启动内置服务器
+ try {
+ FineEmbedServer.start();
+ } finally {
+ BrowseUtils.browser(url);
+ }
} else {
- FineEmbedServer.start();
+ // 已经启动内置服务器只需打开链接
BrowseUtils.browser(url);
}
}
diff --git a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
index 12aebd231..a67b7e55a 100644
--- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
+++ b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
@@ -1,6 +1,5 @@
package com.fr.start.server;
-import com.fr.base.FRContext;
import com.fr.design.DesignerEnvManager;
import com.fr.log.FineLoggerFactory;
import com.fr.module.Activator;
@@ -15,6 +14,7 @@ import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.webresources.StandardRoot;
import java.io.File;
import java.util.HashSet;
@@ -63,10 +63,11 @@ public class FineEmbedServerActivator extends Activator {
// 设置解码uri使用的字符编码
tomcat.getConnector().setURIEncoding(EncodeConstants.ENCODING_UTF_8);
String docBase = new File(WorkContext.getCurrent().getPath()).getParent();
- //内置的上下文是自己定的，这里把WEB_APP_NAME一并设置了，否则下面appName是/null
- ProductConstants.setWebAppName(ProductConstants.getAppFolderName());
- String appName = "/" + FRContext.getCommonOperator().getAppName();
- Context context = tomcat.addContext(appName, docBase);
+
+ //内置的上下文使用工程目录比如webroot
+ String contextPath = "/" + ProductConstants.getAppFolderName();
+ final Context context = tomcat.addContext(contextPath, docBase);
+ context.setResources(new StandardRoot(context));
Tomcat.initWebappDefaults(context);
//覆盖tomcat的WebAppClassLoader
context.setLoader(new FRTomcatLoader());
diff --git a/designer-base/src/main/resources/com/fr/design/icon/logo.png b/designer-base/src/main/resources/com/fr/design/icon/logo.png
new file mode 100644
index 000000000..d4c7d8b24
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/icon/logo.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/edit/edit_typing.png b/designer-base/src/main/resources/com/fr/design/images/edit/edit_typing.png
new file mode 100644
index 000000000..929f14137
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/edit/edit_typing.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/error/error.png b/designer-base/src/main/resources/com/fr/design/images/error/error.png
new file mode 100644
index 000000000..fd4a46509
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/error/error.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/error/error2.png b/designer-base/src/main/resources/com/fr/design/images/error/error2.png
new file mode 100644
index 000000000..ff0450a5a
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/error/error2.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/gui/color/autoForeground.png b/designer-base/src/main/resources/com/fr/design/images/gui/color/autoForeground.png
new file mode 100755
index 000000000..4186fea2c
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/gui/color/autoForeground.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/warnings/warning4.png b/designer-base/src/main/resources/com/fr/design/images/warnings/warning4.png
new file mode 100644
index 000000000..a982ee864
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/warnings/warning4.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/warnings/warning5.png b/designer-base/src/main/resources/com/fr/design/images/warnings/warning5.png
new file mode 100644
index 000000000..059206e0c
Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/warnings/warning5.png differ
diff --git a/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js b/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js
index f42fb1ac7..d1c46cee2 100644
--- a/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js
+++ b/designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js
@@ -104,8 +104,7 @@ function getMoreInfo() {
function getCloseButton() {
return BI.createWidget({
type: "bi.button",
- text: "",
- iconCls: "close-font",
+ text: String.fromCharCode(10005),
cls: "close-btn",
clear: true,
handler: function () {
diff --git a/designer-base/src/test/java/com/fr/common/detect/CommonPortDetectorTest.java b/designer-base/src/test/java/com/fr/common/detect/CommonPortDetectorTest.java
new file mode 100644
index 000000000..fa9915b31
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/common/detect/CommonPortDetectorTest.java
@@ -0,0 +1,45 @@
+package com.fr.common.detect;
+
+import com.fr.invoke.Reflect;
+import com.fr.log.FineLoggerFactory;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/3/10
+ */
+public class CommonPortDetectorTest extends TestCase {
+
+ private ServerSocket serverSocket;
+
+ @Override
+ public void setUp() throws Exception {
+ serverSocket = new ServerSocket(55555);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ serverSocket.accept();
+ } catch (IOException e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ }
+ }).start();
+ }
+
+ public void testCheckPort() {
+ CommonPortDetector detector = CommonPortDetector.getInstance();
+ boolean access = Reflect.on(detector).call("checkPort", 55555).get();
+ Assert.assertTrue(access);
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ serverSocket.close();
+ }
+}
\ No newline at end of file
diff --git a/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java b/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java
new file mode 100644
index 000000000..f37c6e73d
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java
@@ -0,0 +1,58 @@
+package com.fr.design;
+
+import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.env.DesignerWorkspaceType;
+import com.fr.env.CheckServiceDialog;
+import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import com.fr.workspace.engine.channel.http.FunctionalHttpRequest;
+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: Maksim
+ * @Date: Created in 2020/3/5
+ * @Description:
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({FunctionalHttpRequest.class,EnvChangeEntrance.class,CheckServiceDialog.class})
+public class EnvChangeEntranceTest {
+
+ @Test
+ public void showServiceDialog() throws Exception {
+ try {
+ EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
+ DesignerWorkspaceInfo selectedEnv = EasyMock.mock(DesignerWorkspaceInfo.class);
+ WorkspaceConnectionInfo connectionInfo = EasyMock.mock(WorkspaceConnectionInfo.class);
+
+ String remoteBranch = "Build#persist-2020.02.15.01.01.12.12";
+ EasyMock.expect(selectedEnv.getConnection()).andReturn(connectionInfo);
+ EasyMock.expect(selectedEnv.getType()).andReturn(DesignerWorkspaceType.Remote);
+ EasyMock.expect(selectedEnv.getRemindTime()).andReturn(null);
+
+ FunctionalHttpRequest request = EasyMock.mock(FunctionalHttpRequest.class);
+ EasyMock.expect(request.getServiceList()).andReturn(null);
+
+ PowerMock.expectNew(FunctionalHttpRequest.class, connectionInfo).andReturn(request).anyTimes();
+ EasyMock.expect(request.getServerBranch()).andReturn(remoteBranch);
+
+ CheckServiceDialog dialog = EasyMock.mock(CheckServiceDialog.class);
+ PowerMock.expectNew(CheckServiceDialog.class, EasyMock.anyObject(), EasyMock.anyObject(), EasyMock.anyObject(), EasyMock.anyObject()).andReturn(dialog);
+
+ EasyMock.replay(request);
+ EasyMock.replay(selectedEnv);
+ EasyMock.replay(connectionInfo);
+ PowerMock.replayAll();
+
+ entrance.showServiceDialog(selectedEnv);
+ Assert.assertTrue(true);
+ }catch (Exception e){
+ Assert.assertTrue(false);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java b/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java
index 8d2f522c0..9a5ce7b8c 100644
--- a/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java
+++ b/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java
@@ -1,11 +1,15 @@
package com.fr.design.data;
import com.fr.base.TableData;
+import com.fr.data.TableDataSource;
import com.fr.data.impl.storeproc.StoreProcedure;
import com.fr.design.data.tabledata.wrapper.TableDataFactory;
import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
+import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
import com.fr.file.ProcedureConfig;
import com.fr.file.TableDataConfig;
+import com.fr.invoke.Reflect;
+import com.fr.stable.ArrayUtils;
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
@@ -23,6 +27,7 @@ import java.util.Map;
@SuppressStaticInitializationFor({"com.fr.design.data.tabledata.wrapper.TableDataFactory"})
public class DesignTableDataManagerTest {
+
@Test
public void testFireDataChange() {
@@ -99,4 +104,55 @@ public class DesignTableDataManagerTest {
}
+
+ @Test
+ public void testGetSelectedColumnNames() throws Exception {
+ PowerMock.mockStatic(TableDataConfig.class);
+ PowerMock.mockStatic(TemplateTableDataWrapper.class);
+ TableDataConfig config = EasyMock.mock(TableDataConfig.class);
+ TableData td1 = EasyMock.mock(TableData.class);
+ TableData td2 = EasyMock.mock(TableData.class);
+ TableDataSource dataSource = EasyMock.mock(TableDataSource.class);
+ EasyMock.expect(config.getTableData("ds1")).andReturn(td1).anyTimes();
+ EasyMock.expect(config.getTableData("ds2")).andReturn(td2).anyTimes();
+ EasyMock.expect(dataSource.getTableData("ds1")).andReturn(td1).anyTimes();
+ EasyMock.expect(dataSource.getTableData("ds2")).andReturn(td2).anyTimes();
+ EasyMock.expect(TableDataConfig.getInstance()).andReturn(config).anyTimes();
+ PowerMock.mockStatic(TableDataFactory.class);
+ EasyMock.expect(TableDataFactory.getSortOfChineseNameOfServerData(config))
+ .andReturn(new String[]{"ds1", "ds2"}).anyTimes();
+ EasyMock.expect(TableDataFactory.getSortOfChineseNameOfTemplateData(dataSource))
+ .andReturn(new String[]{"ds1", "ds2"});
+ Map> cache = Reflect.on(DesignTableDataManager.class).field(
+ "columnCache").get();
+ Map map = new HashMap<>();
+ map.put("ds1", new String[]{"a", "b", "c"});
+ cache.put(dataSource, map);
+ ProcedureConfig proConfig = EasyMock.mock(ProcedureConfig.class);
+ Map procedureMap = new HashMap<>();
+ EasyMock.expect(proConfig.getProcedures()).andReturn(procedureMap).anyTimes();
+ PowerMock.mockStatic(ProcedureConfig.class);
+ EasyMock.expect(ProcedureConfig.getInstance()).andReturn(proConfig).anyTimes();
+ EasyMock.replay(config, proConfig, dataSource);
+ PowerMock.replay(TableDataFactory.class, TableDataConfig.class, ProcedureConfig.class,
+ TemplateTableDataWrapper.class);
+ Assert.assertEquals(new String[]{"a", "b", "c"},
+ DesignTableDataManager.getSelectedColumnNames(dataSource, "ds1"));
+ }
+
+ @Test
+ public void testAddDsColumnNames() {
+ DesignTableDataManager.addDsColumnNames("ds1", new String[]{"a", "b", "c"});
+ Map> map = Reflect.on(DesignTableDataManager.class).field(
+ "columnCache").get();
+ Assert.assertEquals(new String[]{"a", "b", "c"}, map.get(null).get("ds1"));
+ }
+
+ @Test
+ public void testGetDsColumnNames() {
+ Assert.assertTrue(ArrayUtils.isEmpty(DesignTableDataManager.getDsColumnNames("ds1")));
+ String[] columnNames = new String[]{"a", "b", "c"};
+ DesignTableDataManager.addDsColumnNames("ds1", new String[]{"a", "b", "c"});
+ Assert.assertEquals(columnNames, DesignTableDataManager.getDsColumnNames("ds1"));
+ }
}
diff --git a/designer-base/src/test/java/com/fr/design/env/RemoteWorkspaceTest.java b/designer-base/src/test/java/com/fr/design/env/RemoteWorkspaceTest.java
new file mode 100644
index 000000000..fe7f365e6
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/env/RemoteWorkspaceTest.java
@@ -0,0 +1,54 @@
+package com.fr.design.env;
+
+import com.fr.base.operator.common.CommonOperator;
+import com.fr.invoke.ReflectException;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.Workspace;
+import com.fr.workspace.connect.WorkspaceConnectionInfo;
+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 2020/1/2
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({WorkContext.class})
+public class RemoteWorkspaceTest {
+ @Test
+ public void testIsWarDeploy() {
+
+ Workspace workspace = EasyMock.mock(Workspace.class);
+ PowerMock.mockStatic(WorkContext.class);
+ EasyMock.expect(WorkContext.getCurrent()).andReturn(workspace).anyTimes();
+
+ CommonOperator operator = EasyMock.createMock(CommonOperator.class);
+ EasyMock.expect(workspace.get(CommonOperator.class)).andReturn(operator).anyTimes();
+
+ EasyMock.expect(operator.isWarDeploy()).andReturn(true).once();
+ EasyMock.expect(operator.isWarDeploy()).andReturn(false).once();
+ EasyMock.expect(operator.isWarDeploy()).andThrow(new ReflectException()).once();
+
+ EasyMock.replay(workspace, operator);
+ PowerMock.replayAll();
+
+ WorkspaceConnectionInfo info = new WorkspaceConnectionInfo("url", "username", "password", "certPath", "certSecretKey");
+
+ RemoteWorkspace remoteWorkspace= new RemoteWorkspace(null, info);
+
+ Assert.assertTrue(remoteWorkspace.isWarDeploy());
+ Assert.assertFalse(remoteWorkspace.isWarDeploy());
+ Assert.assertFalse(remoteWorkspace.isWarDeploy());
+
+ EasyMock.verify(workspace, operator);
+ PowerMock.verifyAll();
+
+
+ }
+}
\ No newline at end of file
diff --git a/designer-base/src/test/java/com/fr/design/file/HistoryTemplateListCacheTest.java b/designer-base/src/test/java/com/fr/design/file/HistoryTemplateListCacheTest.java
new file mode 100644
index 000000000..bd9f8484d
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/file/HistoryTemplateListCacheTest.java
@@ -0,0 +1,33 @@
+package com.fr.design.file;
+
+import com.fr.design.mainframe.JTemplate;
+import com.fr.file.FILE;
+import com.fr.invoke.Reflect;
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/3/23
+ */
+public class HistoryTemplateListCacheTest extends TestCase {
+
+ public void testContains() {
+ JTemplate jTemplate = EasyMock.mock(JTemplate.class);
+ FILE file = EasyMock.mock(FILE.class);
+ EasyMock.expect(jTemplate.getEditingFILE()).andReturn(file).anyTimes();
+ EasyMock.replay(file);
+ EasyMock.replay(jTemplate);
+ Assert.assertEquals(-1, HistoryTemplateListCache.getInstance().contains(file));
+ Assert.assertEquals(-1, HistoryTemplateListCache.getInstance().contains(jTemplate));
+ Reflect.on(HistoryTemplateListCache.getInstance()).set("historyList", new ArrayList<>(Arrays.asList(jTemplate)));
+ Assert.assertEquals(0, HistoryTemplateListCache.getInstance().contains(file));
+ Assert.assertEquals(0, HistoryTemplateListCache.getInstance().contains(jTemplate));
+ }
+
+}
\ No newline at end of file
diff --git a/designer-base/src/test/java/com/fr/design/mainfarme/toolbar/ToolBarMenuDockTest.java b/designer-base/src/test/java/com/fr/design/mainfarme/toolbar/ToolBarMenuDockTest.java
new file mode 100644
index 000000000..c5f9f0a70
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/mainfarme/toolbar/ToolBarMenuDockTest.java
@@ -0,0 +1,129 @@
+package com.fr.design.mainfarme.toolbar;
+
+import java.util.Locale;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.community.VideoAction;
+import com.fr.design.actions.help.AboutAction;
+import com.fr.design.actions.help.FineUIAction;
+import com.fr.design.actions.help.TutorialAction;
+import com.fr.design.actions.help.WebDemoAction;
+import com.fr.design.actions.help.alphafine.AlphaFineAction;
+import com.fr.design.actions.help.alphafine.AlphaFineConfigManager;
+import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
+import com.fr.design.menu.SeparatorDef;
+import com.fr.design.menu.ShortCut;
+import com.fr.design.os.impl.SupportOSImpl;
+import com.fr.design.update.actions.SoftwareUpdateAction;
+import com.fr.general.GeneralContext;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.Workspace;
+import org.easymock.EasyMock;
+import org.easymock.Mock;
+import org.junit.Assert;
+import org.junit.Before;
+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;
+import org.powermock.reflect.Whitebox;
+
+
+/**
+ * @author Lucian.Chen
+ * @version 10.0
+ * Created by Lucian.Chen on 2019/12/11
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({
+ ToolBarMenuDock.class,
+ GeneralContext.class,
+ Locale.class,
+ WorkContext.class,
+ DesignerEnvManager.class,
+ AlphaFineConfigManager.class})
+public class ToolBarMenuDockTest {
+
+ @Mock
+ VideoAction videoAction;
+ @Mock
+ TutorialAction tutorialAction;
+ @Mock
+ WebDemoAction webDemoAction;
+ @Mock
+ SoftwareUpdateAction softwareUpdateAction;
+ @Mock
+ AlphaFineAction alphaFineAction;
+ @Mock
+ FineUIAction fineUIAction;
+ @Mock
+ AboutAction aboutAction;
+
+ @Before
+ public void testCreateHelpShortCutsBefore() {
+ try {
+ PowerMock.expectNew(VideoAction.class).andReturn(videoAction).anyTimes();
+ PowerMock.expectNew(TutorialAction.class).andReturn(tutorialAction).anyTimes();
+ PowerMock.expectNew(WebDemoAction.class).andReturn(webDemoAction).anyTimes();
+ PowerMock.expectNew(SoftwareUpdateAction.class).andReturn(softwareUpdateAction).anyTimes();
+ PowerMock.expectNew(AlphaFineAction.class).andReturn(alphaFineAction).anyTimes();
+ PowerMock.expectNew(FineUIAction.class).andReturn(fineUIAction).anyTimes();
+ PowerMock.expectNew(AboutAction.class).andReturn(aboutAction).anyTimes();
+ } catch (Exception e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testCreateHelpShortCuts() {
+
+ // 处理判断条件
+ GeneralContext context = EasyMock.createMock(GeneralContext.class);
+ PowerMock.mockStatic(GeneralContext.class);
+ EasyMock.expect(GeneralContext.getLocale()).andReturn(Locale.CHINA).once();
+ EasyMock.expect(GeneralContext.getLocale()).andReturn(Locale.US).once();
+
+ Workspace workspace = EasyMock.createMock(Workspace.class);
+ PowerMock.mockStatic(WorkContext.class);
+ EasyMock.expect(WorkContext.getCurrent()).andReturn(workspace).anyTimes();
+
+ EasyMock.expect(workspace.isLocal()).andReturn(false).once();
+ EasyMock.expect(workspace.isLocal()).andReturn(true).once();
+
+ DesignerEnvManager envManager = EasyMock.createMock(DesignerEnvManager.class);
+ PowerMock.mockStatic(DesignerEnvManager.class);
+ EasyMock.expect(DesignerEnvManager.getEnvManager()).andReturn(envManager).anyTimes();
+
+ EasyMock.expect(envManager.isOpenDebug()).andReturn(false).once();
+ EasyMock.expect(envManager.isOpenDebug()).andReturn(true).once();
+
+ AlphaFineConfigManager configManager = EasyMock.createMock(AlphaFineConfigManager.class);
+ PowerMock.mockStatic(AlphaFineConfigManager.class);
+ EasyMock.expect(AlphaFineConfigManager.isALPHALicAvailable()).andReturn(false).once();
+ EasyMock.expect(AlphaFineConfigManager.isALPHALicAvailable()).andReturn(true).once();
+
+ SupportOSImpl osImpl = EasyMock.createMock(SupportOSImpl.class);
+ Whitebox.setInternalState(SupportOSImpl.class, "FINEUI", osImpl);
+ EasyMock.expect(osImpl.support()).andReturn(false).anyTimes();
+
+ EasyMock.replay(context, workspace, envManager, configManager, osImpl);
+ PowerMock.replayAll();
+
+
+ ToolBarMenuDock menuDock = new ToolBarMenuDock() {
+ @Override
+ public ShortCut[] createNewFileShortCuts() {
+ return new ShortCut[0];
+ }
+ };
+
+ ShortCut[] shortCuts1 = new ShortCut[] {SeparatorDef.DEFAULT, aboutAction};
+ ShortCut[] shortCuts2 = new ShortCut[] {videoAction, tutorialAction, webDemoAction,
+ softwareUpdateAction, alphaFineAction, SeparatorDef.DEFAULT, aboutAction};
+
+ Assert.assertEquals(menuDock.createHelpShortCuts(), shortCuts1);
+ Assert.assertEquals(menuDock.createHelpShortCuts(), shortCuts2);
+
+ }
+}
diff --git a/designer-base/src/test/java/com/fr/design/mainframe/template/info/SendHelperTest.java b/designer-base/src/test/java/com/fr/design/mainframe/template/info/SendHelperTest.java
index fb89143d8..8da46557c 100644
--- a/designer-base/src/test/java/com/fr/design/mainframe/template/info/SendHelperTest.java
+++ b/designer-base/src/test/java/com/fr/design/mainframe/template/info/SendHelperTest.java
@@ -1,10 +1,12 @@
package com.fr.design.mainframe.template.info;
import com.fr.invoke.Reflect;
+import com.fr.json.JSONObject;
import com.fr.stable.xml.XMLableReader;
import com.fr.third.javax.xml.stream.XMLStreamException;
import java.io.StringReader;
+import java.util.Map;
import static org.junit.Assert.assertTrue;
@@ -25,11 +27,12 @@ public class SendHelperTest {
StringReader sr = new StringReader(NORMAL_INFO);
XMLableReader xmlReader = XMLableReader.createXMLableReader(sr);
TemplateInfo templateInfo = TemplateInfo.newInstanceByRead(xmlReader);
-
- boolean res = Reflect.on(SendHelper.class).call("sendSingleTemplateInfo", CONSUMING_URL, templateInfo.getConsumingMapJsonString()).get();
+ Map consumingMap = Reflect.on(templateInfo).field("consumingMap").get();
+ Map processMap = Reflect.on(templateInfo).field("processMap").get();
+ boolean res = Reflect.on(SendHelper.class).call("sendSinglePointInfo", CONSUMING_URL, new JSONObject(consumingMap).toString()).get();
assertTrue(res);
- boolean res2 = Reflect.on(SendHelper.class).call("sendSingleTemplateInfo", PROCESS_URL, templateInfo.getProcessMapJsonString()).get();
+ boolean res2 = Reflect.on(SendHelper.class).call("sendSinglePointInfo", PROCESS_URL, new JSONObject(processMap).toString()).get();
assertTrue(res2);
}
}
diff --git a/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoCollectorTest.java b/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoCollectorTest.java
index d93a7476a..3235473c6 100644
--- a/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoCollectorTest.java
+++ b/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoCollectorTest.java
@@ -3,6 +3,7 @@ package com.fr.design.mainframe.template.info;
import com.fr.config.MarketConfig;
import com.fr.general.GeneralUtils;
import com.fr.invoke.Reflect;
+import com.fr.json.JSONObject;
import com.fr.stable.ProductConstants;
import com.fr.stable.StringUtils;
import com.fr.third.org.apache.commons.io.FileUtils;
@@ -71,7 +72,7 @@ public class TemplateInfoCollectorTest {
assertEquals(",,", DesignerOpenHistory.getInstance().toString());
TemplateInfoCollector collector = TemplateInfoCollector.getInstance();
- assertEquals(7, ((Map) Reflect.on(collector).field("templateInfoMap").get()).size());
+ assertEquals(7, ((Map) Reflect.on(collector).field("pointInfoMap").get()).size());
assertEquals("2019-04-08,2019-04-03,2019-03-29", DesignerOpenHistory.getInstance().toString());
}
@@ -86,18 +87,21 @@ public class TemplateInfoCollectorTest {
collector.collectInfo(templateID, StringUtils.EMPTY, mockProcessInfo, timeConsume);
// 检查是否写入成功
- collector.loadFromFile();
+ Reflect.on(collector).call("loadFromFile");
TemplateInfo templateInfo = collector.getOrCreateTemplateInfoByID(templateID);
+ Map consumingMap = Reflect.on(templateInfo).field("consumingMap").get();
+ Map processMap = Reflect.on(templateInfo).field("processMap").get();
+
assertJsonStringEquals("{\"process\":\"\",\"float_count\":1,\"widget_count\":0," +
"\"cell_count\":13,\"block_count\":3,\"report_type\":0," +
- "\"templateID\":\"16a988ce-8529-42f5-b17c-2ee849355071\"}", templateInfo.getProcessMapJsonString());
+ "\"templateID\":\"16a988ce-8529-42f5-b17c-2ee849355071\"}", new JSONObject(processMap).toString());
assertJsonStringEquals("{\"activitykey\":\"2e0ea413-fa9c241e0-9723-4354fce51e81\"," +
"\"jar_time\":\"不是安装版本\",\"create_time\":\"2019-03-26 16:13\"," +
"\"templateID\":\"16a988ce-8529-42f5-b17c-2ee849355071\",\"originID\":\"\"," +
"\"uuid\":\"476ca2cc-f789-4c5d-8e89-ef146580775c\",\"time_consume\":329,\"originTime\":0," +
- "\"version\":\"10.0\",\"username\":\"plough\"}", templateInfo.getConsumingMapJsonString());
+ "\"version\":\"10.0\",\"username\":\"plough\"}", new JSONObject(consumingMap).toString());
}
@Test
@@ -112,15 +116,17 @@ public class TemplateInfoCollectorTest {
collector.collectInfo(templateID, StringUtils.EMPTY, mockProcessInfo, timeConsume);
// 检查是否写入成功
- collector.loadFromFile();
+ Reflect.on(collector).call("loadFromFile");
assertTrue(collector.contains(templateID));
TemplateInfo templateInfo = collector.getOrCreateTemplateInfoByID(templateID);
+ Map processMap = Reflect.on(templateInfo).field("processMap").get();
+
assertEquals(templateID, templateInfo.getTemplateID());
assertJsonStringEquals("{\"process\":\"\",\"float_count\":1,\"widget_count\":0," +
"\"cell_count\":13,\"block_count\":3,\"report_type\":0," +
- "\"templateID\":\"73a97777-8jnk-47cd-b57c-2ee89991279796\"}", templateInfo.getProcessMapJsonString());
+ "\"templateID\":\"73a97777-8jnk-47cd-b57c-2ee89991279796\"}", new JSONObject(processMap).toString());
Map consumingMap = Reflect.on(templateInfo).field("consumingMap").get();
assertEquals(templateID, consumingMap.get("templateID"));
@@ -142,12 +148,13 @@ public class TemplateInfoCollectorTest {
collector.collectInfo(templateID, originID, mockProcessInfo, timeConsume);
// 检查是否写入成功
- collector.loadFromFile();
+ Reflect.on(collector).call("loadFromFile");
TemplateInfo templateInfo = collector.getOrCreateTemplateInfoByID(templateID);
+ Map processMap = Reflect.on(templateInfo).field("processMap").get();
assertJsonStringEquals("{\"process\":\"\",\"float_count\":1,\"widget_count\":0," +
"\"cell_count\":13,\"block_count\":3,\"report_type\":0," +
- "\"templateID\":\"423238d4-5223-22vj-vlsj-42jc49245iw3\"}", templateInfo.getProcessMapJsonString());
+ "\"templateID\":\"423238d4-5223-22vj-vlsj-42jc49245iw3\"}", new JSONObject(processMap).toString());
Map consumingMap = Reflect.on(templateInfo).field("consumingMap").get();
assertEquals(templateID, consumingMap.get("templateID"));
diff --git a/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoTest.java b/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoTest.java
index 426dba3b1..7f0ddd0bc 100644
--- a/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoTest.java
+++ b/designer-base/src/test/java/com/fr/design/mainframe/template/info/TemplateInfoTest.java
@@ -3,6 +3,7 @@ package com.fr.design.mainframe.template.info;
import com.fr.config.MarketConfig;
import com.fr.general.GeneralUtils;
import com.fr.invoke.Reflect;
+import com.fr.json.JSONObject;
import com.fr.stable.ProductConstants;
import com.fr.stable.StringUtils;
import com.fr.stable.xml.XMLableReader;
@@ -55,7 +56,6 @@ public class TemplateInfoTest {
assertEquals(templateID, templateInfo.getTemplateID());
assertEquals(StringUtils.EMPTY, Reflect.on(templateInfo).field("originID").get());
assertEquals(0, (int) Reflect.on(templateInfo).field("idleDayCount").get());
- assertEquals("{}", templateInfo.getProcessMapJsonString());
Map consumingMap = Reflect.on(templateInfo).field("consumingMap").get();
assertEquals(templateID, consumingMap.get("templateID"));
@@ -78,7 +78,6 @@ public class TemplateInfoTest {
assertEquals(templateID, templateInfo.getTemplateID());
assertEquals(originID, Reflect.on(templateInfo).field("originID").get());
assertEquals(0, (int) Reflect.on(templateInfo).field("idleDayCount").get());
- assertEquals("{}", templateInfo.getProcessMapJsonString());
Map consumingMap = Reflect.on(templateInfo).field("consumingMap").get();
assertEquals(templateID, consumingMap.get("templateID"));
@@ -97,24 +96,25 @@ public class TemplateInfoTest {
}
@Test
- public void testGetConsumingMapJsonString() {
+ public void testGetSendInfo() {
+
+ Map consumingMap = Reflect.on(templateInfo).field("consumingMap").get();
+ Map processMap = Reflect.on(templateInfo).field("processMap").get();
+ Map consumingMap1 = Reflect.on(templateInfoSaveAs).field("consumingMap").get();
+ Map processMap1 = Reflect.on(templateInfoSaveAs).field("processMap").get();
assertJsonStringEquals("{\"activitykey\":\"2e0ea413-fa9c241e0-9723-4354fce51e81\",\"jar_time\":\"不是安装版本\"," +
"\"create_time\":\"2019-03-26 16:13\",\"templateID\":\"16a988ce-8529-42f5-b17c-2ee849355071\",\"originID\":\"\"," +
"\"uuid\":\"476ca2cc-f789-4c5d-8e89-ef146580775c\",\"time_consume\":129,\"originTime\":0,\"version\":\"10.0\"," +
- "\"username\":\"plough\"}", templateInfo.getConsumingMapJsonString());
+ "\"username\":\"plough\"}", new JSONObject(consumingMap).toString());
assertJsonStringEquals("{\"activitykey\":\"2e0ea413-fa9c241e0-9723-4354fce51e81\",\"jar_time\":\"不是安装版本\"," +
"\"create_time\":\"2019-03-26 16:13\",\"templateID\":\"49avd2c4-1104-92j2-wx24-3dd0k2136080\",\"originID\":\"16a988ce-8529-42f5-b17c-2ee849355071\"," +
"\"uuid\":\"476ca2cc-f789-4c5d-8e89-ef146580775c\",\"time_consume\":429,\"originTime\":129,\"version\":\"10.0\"," +
- "\"username\":\"plough\"}", templateInfoSaveAs.getConsumingMapJsonString());
- }
-
- @Test
- public void testGetProcessMapJsonString() {
+ "\"username\":\"plough\"}", new JSONObject(consumingMap1).toString());
assertJsonStringEquals("{\"process\":\"\",\"float_count\":0,\"widget_count\":0,\"cell_count\":1," +
- "\"block_count\":0,\"report_type\":0,\"templateID\":\"16a988ce-8529-42f5-b17c-2ee849355071\"}", templateInfo.getProcessMapJsonString());
+ "\"block_count\":0,\"report_type\":0,\"templateID\":\"16a988ce-8529-42f5-b17c-2ee849355071\"}", new JSONObject(processMap).toString());
assertJsonStringEquals("{\"process\":\"\",\"float_count\":0,\"widget_count\":0,\"cell_count\":1," +
- "\"block_count\":0,\"report_type\":0,\"templateID\":\"49avd2c4-1104-92j2-wx24-3dd0k2136080\"}", templateInfoSaveAs.getProcessMapJsonString());
+ "\"block_count\":0,\"report_type\":0,\"templateID\":\"49avd2c4-1104-92j2-wx24-3dd0k2136080\"}", new JSONObject(processMap1).toString());
}
private TemplateInfo createTemplateInfo(String xmlContent) throws XMLStreamException {
diff --git a/designer-base/src/test/java/com/fr/design/os/impl/SupportOSImplTest.java b/designer-base/src/test/java/com/fr/design/os/impl/SupportOSImplTest.java
new file mode 100644
index 000000000..188753797
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/os/impl/SupportOSImplTest.java
@@ -0,0 +1,24 @@
+package com.fr.design.os.impl;
+
+import com.fr.general.GeneralContext;
+import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Locale;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/1/16
+ */
+public class SupportOSImplTest extends TestCase {
+
+ @Test
+ public void testAutoPush() {
+ Assert.assertTrue(SupportOSImpl.AUTOPUSHUPDATE.support());
+ GeneralContext.setLocale(Locale.TAIWAN);
+ Assert.assertFalse(SupportOSImpl.AUTOPUSHUPDATE.support());
+ }
+
+}
\ No newline at end of file
diff --git a/designer-base/src/test/java/com/fr/design/utils/DesignUtilsTest.java b/designer-base/src/test/java/com/fr/design/utils/DesignUtilsTest.java
new file mode 100644
index 000000000..9db729a97
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/utils/DesignUtilsTest.java
@@ -0,0 +1,32 @@
+package com.fr.design.utils;
+
+
+import com.fr.general.ComparatorUtils;
+import junit.framework.TestCase;
+import org.junit.Test;
+
+import java.net.ServerSocket;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/1/10
+ */
+public class DesignUtilsTest extends TestCase {
+
+ @Test
+ public void testIsPortOccupied() {
+ assertFalse(DesignUtils.isPortOccupied());
+ try {
+ if (ComparatorUtils.equals("true", System.getProperty("debug"))) {
+ new ServerSocket(DesignerPort.getInstance().getDebugMessagePort());
+ } else {
+ new ServerSocket(DesignerPort.getInstance().getMessagePort());
+ }
+ } catch (Exception ignore) {
+ System.exit(0);
+ }
+ assertTrue(DesignUtils.isPortOccupied());
+ }
+
+}
\ No newline at end of file
diff --git a/designer-base/src/test/java/com/fr/env/utils/DisplayUtilsTest.java b/designer-base/src/test/java/com/fr/env/utils/DisplayUtilsTest.java
new file mode 100644
index 000000000..181bd9788
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/env/utils/DisplayUtilsTest.java
@@ -0,0 +1,52 @@
+package com.fr.env.utils;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+/**
+ * @author: Maksim
+ * @Date: Created in 2020/3/16
+ * @Description:
+ */
+public class DisplayUtilsTest {
+
+ @Test
+ public void getDisplayLengthTest() {
+ String s1 = "本地设计器";
+ String s2 = "リモートサーバ";
+ String s3 = "Local Designer:";
+ String s4 = "本地,设，计器： persist-2020.01.15";
+ String s5 = "ローカルデザイナrelease-2020.03.03 ... Remote Server:persist-2020.01.15";
+ String s6 = "本地 00:00ロ ーカDE / abc ";
+
+ int length1 = DisplayUtils.getDisplayLength(s1);
+ int length2 = DisplayUtils.getDisplayLength(s2);
+ int length3 = DisplayUtils.getDisplayLength(s3);
+ int length4 = DisplayUtils.getDisplayLength(s4);
+ int length5 = DisplayUtils.getDisplayLength(s5);
+ int length6 = DisplayUtils.getDisplayLength(s6);
+ Assert.assertEquals(10,length1);
+ Assert.assertEquals(14,length2);
+ Assert.assertEquals(15,length3);
+ Assert.assertEquals(34,length4);
+ Assert.assertEquals(72,length5);
+ Assert.assertEquals(26,length6);
+ }
+
+ @Test
+ public void isLetterTest(){
+ char c1 = 'A';
+ char c2 = '中';
+ char c3 = ',';
+ char c4 = '，';
+ char c5 = 'デ';
+ char c6 = ' ';
+ Assert.assertTrue(DisplayUtils.isLetter(c1));
+ Assert.assertFalse(DisplayUtils.isLetter(c2));
+ Assert.assertTrue(DisplayUtils.isLetter(c3));
+ Assert.assertFalse(DisplayUtils.isLetter(c4));
+ Assert.assertFalse(DisplayUtils.isLetter(c5));
+ Assert.assertTrue(DisplayUtils.isLetter(c6));
+ }
+}
\ No newline at end of file
diff --git a/designer-base/src/test/java/com/fr/file/FILEChooserPaneTest.java b/designer-base/src/test/java/com/fr/file/FILEChooserPaneTest.java
index c8431a862..064cd05ce 100644
--- a/designer-base/src/test/java/com/fr/file/FILEChooserPaneTest.java
+++ b/designer-base/src/test/java/com/fr/file/FILEChooserPaneTest.java
@@ -25,15 +25,30 @@ public class FILEChooserPaneTest {
ChooseFileFilter chooseFileFilter2 = new ChooseFileFilter(FileExtension.CPTX, StringUtils.EMPTY);
String result3 = Reflect.on(chooserPane).call("calProperFileName", "WorkBook1.cpt", chooseFileFilter2).get();
- Assert.assertEquals("WorkBook1.cptx", result3);
+ Assert.assertEquals("WorkBook1.cpt.cptx", result3);
ChooseFileFilter chooseFileFilter3 = new ChooseFileFilter(FileExtension.CPT, StringUtils.EMPTY);
String result4 = Reflect.on(chooserPane).call("calProperFileName", "WorkBook1.cptx", chooseFileFilter3).get();
- Assert.assertEquals("WorkBook1.cpt", result4);
+ Assert.assertEquals("WorkBook1.cptx.cpt", result4);
ChooseFileFilter chooseFileFilter5 = new ChooseFileFilter(FileExtension.CPTX, StringUtils.EMPTY);
String result5 = Reflect.on(chooserPane).call("calProperFileName", "WorkBook1.cptx", chooseFileFilter5).get();
Assert.assertEquals("WorkBook1.cptx", result5);
+
+ ChooseFileFilter chooseFileFilter6 = new ChooseFileFilter(FileExtension.CPT, StringUtils.EMPTY);
+ String result6 = Reflect.on(chooserPane).call("calProperFileName", "WorkBook1.xls", chooseFileFilter6).get();
+ Assert.assertEquals("WorkBook1.xls.cpt", result6);
+
+ ChooseFileFilter chooseFileFilter7 = new ChooseFileFilter(FileExtension.XLS, StringUtils.EMPTY);
+ chooseFileFilter7.addExtension(".xlsx");
+ String result7 = Reflect.on(chooserPane).call("calProperFileName", "WorkBook1", chooseFileFilter7).get();
+ Assert.assertEquals("WorkBook1.xls", result7);
+
+ ChooseFileFilter chooseFileFilter8 = new ChooseFileFilter(FileExtension.XLSX, StringUtils.EMPTY);
+ chooseFileFilter8.addExtension(".xls");
+ String result8 = Reflect.on(chooserPane).call("calProperFileName", "WorkBook1", chooseFileFilter8).get();
+ Assert.assertEquals("WorkBook1.xlsx", result8);
+
}
}
diff --git a/designer-base/src/test/java/com/fr/file/filter/ChooseFileFilterTest.java b/designer-base/src/test/java/com/fr/file/filter/ChooseFileFilterTest.java
new file mode 100644
index 000000000..ec6779bab
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/file/filter/ChooseFileFilterTest.java
@@ -0,0 +1,33 @@
+package com.fr.file.filter;
+
+import com.fr.base.extension.FileExtension;
+import com.fr.stable.CoreConstants;
+import com.fr.stable.StringUtils;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/3/18
+ */
+public class ChooseFileFilterTest extends TestCase {
+
+ public void testGetExtensionString() {
+ ChooseFileFilter chooseFileFilter = new ChooseFileFilter(FileExtension.XLSX, StringUtils.EMPTY);
+ chooseFileFilter.addExtension(FileExtension.XLS.getExtension());
+ Assert.assertEquals(CoreConstants.DOT + FileExtension.XLSX.getExtension(), chooseFileFilter.getExtensionString());
+ Assert.assertEquals(CoreConstants.DOT + FileExtension.XLS.getExtension(), chooseFileFilter.getExtensionString(1));
+ ChooseFileFilter chooseFileFilter1 = new ChooseFileFilter();
+ Assert.assertEquals(StringUtils.EMPTY, chooseFileFilter1.getExtensionString());
+ Assert.assertEquals(StringUtils.EMPTY, chooseFileFilter1.getExtensionString(1));
+
+ }
+
+ public void testGetExtensionCount() {
+ ChooseFileFilter chooseFileFilter = new ChooseFileFilter(FileExtension.CPT, StringUtils.EMPTY);
+ chooseFileFilter.addExtension(FileExtension.CPTX.getExtension());
+ Assert.assertEquals(2, chooseFileFilter.getExtensionCount());
+ }
+}
\ No newline at end of file
diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
index f6f674ba9..4eb725834 100644
--- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
+++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
@@ -11,6 +11,18 @@ import com.fr.design.beans.BasicBeanPane;
import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.chart.fun.ChartTypeUIProvider;
import com.fr.design.chart.gui.ChartWidgetOption;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.design.gui.core.WidgetOption;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.mainframe.chart.AbstractChartAttrPane;
+import com.fr.design.mainframe.chart.ChartEditPane;
+import com.fr.design.mainframe.chart.ChartsConfigPane;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.mainframe.chart.gui.ChartStylePane;
+import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
+import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
+import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.module.DesignModuleFactory;
import com.fr.design.type.ui.AreaChartTypeUI;
import com.fr.design.type.ui.BarChartTypeUI;
import com.fr.design.type.ui.BubbleChartTypeUI;
@@ -28,18 +40,6 @@ import com.fr.design.type.ui.RadarChartTypeUI;
import com.fr.design.type.ui.RangeChartTypeUI;
import com.fr.design.type.ui.StockChartTypeUI;
import com.fr.design.type.ui.XYScatterChartTypeUI;
-import com.fr.design.condition.ConditionAttributesPane;
-import com.fr.design.gui.core.WidgetOption;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.design.mainframe.chart.AbstractChartAttrPane;
-import com.fr.design.mainframe.chart.ChartEditPane;
-import com.fr.design.mainframe.chart.ChartsConfigPane;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
-import com.fr.design.mainframe.chart.gui.ChartStylePane;
-import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
-import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
-import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
-import com.fr.design.module.DesignModuleFactory;
import com.fr.extended.chart.AbstractChart;
import com.fr.form.ui.ChartEditor;
import com.fr.general.GeneralContext;
@@ -80,20 +80,20 @@ import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.van.chart.area.AreaIndependentVanChartInterface;
import com.fr.van.chart.bar.BarIndependentVanChartInterface;
import com.fr.van.chart.bubble.BubbleIndependentVanChartInterface;
-import com.fr.van.chart.column.ColumnIndependentVanChartInterface;
+import com.fr.van.chart.column.VanColumnChartTypeUI;
import com.fr.van.chart.custom.CustomIndependentVanChartInterface;
-import com.fr.van.chart.drillmap.DrillMapIndependentVanChartInterface;
+import com.fr.van.chart.drillmap.VanDrillMapChartTypeUI;
import com.fr.van.chart.funnel.designer.FunnelIndependentVanChartInterface;
import com.fr.van.chart.gantt.designer.GanttIndependentVanChartInterface;
import com.fr.van.chart.gauge.GaugeIndependentVanChartInterface;
-import com.fr.van.chart.heatmap.designer.HeatMapIndependentVanChartInterface;
+import com.fr.van.chart.heatmap.designer.VanHeatMapChartTypeUI;
import com.fr.van.chart.line.LineIndependentVanChartInterface;
-import com.fr.van.chart.map.MapIndependentVanChartInterface;
+import com.fr.van.chart.map.VanMapChartTypeUI;
import com.fr.van.chart.multilayer.MultiPieIndependentVanChartInterface;
import com.fr.van.chart.pie.PieIndependentVanChartInterface;
import com.fr.van.chart.radar.RadarIndependentVanChartInterface;
import com.fr.van.chart.scatter.ScatterIndependentVanChartInterface;
-import com.fr.van.chart.structure.desinger.StructureIndependentVanChartInterface;
+import com.fr.van.chart.structure.desinger.VanStructureChartTypeUI;
import com.fr.van.chart.treemap.TreeMapIndependentVanChartInterface;
import com.fr.van.chart.wordcloud.designer.WordCloudIndependentVanChartInterface;
@@ -182,7 +182,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
private static void readVanChart() {
addChartTypeInterface(VAN_CHART_PRIORITY, PiePlot4VanChart.VAN_CHART_PIE_PLOT, new PieIndependentVanChartInterface());
- addChartTypeInterface(VAN_CHART_PRIORITY, VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID, new ColumnIndependentVanChartInterface());
+ addChartTypeInterface(VAN_CHART_PRIORITY, VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID, new VanColumnChartTypeUI());
addChartTypeInterface(VAN_CHART_PRIORITY, VanChartColumnPlot.VAN_CHART_BAR_PLOT_ID, new BarIndependentVanChartInterface());
addChartTypeInterface(VAN_CHART_PRIORITY, VanChartLinePlot.VAN_CHART_LINE_PLOT, new LineIndependentVanChartInterface());
addChartTypeInterface(VAN_CHART_PRIORITY, VanChartAreaPlot.VAN_CHART_AREA_PLOT_ID, new AreaIndependentVanChartInterface());
@@ -192,14 +192,14 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
addChartTypeInterface(VAN_CHART_PRIORITY, VanChartBubblePlot.VAN_CHART_BUBBLE_PLOT_ID, new BubbleIndependentVanChartInterface());
addChartTypeInterface(VAN_CHART_PRIORITY, VanChartCustomPlot.VAN_CHART_CUSTOM_PLOT_ID, new CustomIndependentVanChartInterface());
addChartTypeInterface(VAN_CHART_PRIORITY, VanChartMultiPiePlot.VAN_CHART_MULTILAYER_PLOT_ID, new MultiPieIndependentVanChartInterface());
- addChartTypeInterface(VAN_CHART_PRIORITY, VanChartMapPlot.VAN_CHART_MAP_ID, new MapIndependentVanChartInterface());
- addChartTypeInterface(VAN_CHART_PRIORITY, VanChartDrillMapPlot.VAN_CHART_DRILL_MAP_ID, new DrillMapIndependentVanChartInterface());
+ addChartTypeInterface(VAN_CHART_PRIORITY, VanChartMapPlot.VAN_CHART_MAP_ID, new VanMapChartTypeUI());
+ addChartTypeInterface(VAN_CHART_PRIORITY, VanChartDrillMapPlot.VAN_CHART_DRILL_MAP_ID, new VanDrillMapChartTypeUI());
addChartTypeInterface(VAN_CHART_PRIORITY, VanChartTreeMapPlot.VAN_CHART_TREE_MAP_PLOT_ID, new TreeMapIndependentVanChartInterface());
addChartTypeInterface(VAN_CHART_PRIORITY, VanChartFunnelPlot.VAN_CHART_FUNNEL_PLOT_ID, new FunnelIndependentVanChartInterface());
- addChartTypeInterface(VAN_CHART_PRIORITY, VanChartHeatMapPlot.VAN_CHART_HEAT_MAP_ID, new HeatMapIndependentVanChartInterface());
+ addChartTypeInterface(VAN_CHART_PRIORITY, VanChartHeatMapPlot.VAN_CHART_HEAT_MAP_ID, new VanHeatMapChartTypeUI());
addChartTypeInterface(VAN_CHART_PRIORITY, VanChartWordCloudPlot.WORD_CLOUD_PLOT_ID, new WordCloudIndependentVanChartInterface());
addChartTypeInterface(VAN_CHART_PRIORITY, VanChartGanttPlot.VAN_CHART_GANTT_PLOT_ID, new GanttIndependentVanChartInterface());
- addChartTypeInterface(VAN_CHART_PRIORITY, VanChartStructurePlot.STRUCTURE_PLOT_ID, new StructureIndependentVanChartInterface());
+ addChartTypeInterface(VAN_CHART_PRIORITY, VanChartStructurePlot.STRUCTURE_PLOT_ID, new VanStructureChartTypeUI());
}
diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java
index a7dd9f564..623271873 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java
@@ -1,5 +1,14 @@
package com.fr.design.chart;
+import com.fr.base.chart.BaseChartCollection;
+import com.fr.chart.chartattr.ChartCollection;
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.gui.chart.MiddleChartDialog;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.third.joda.time.DateTime;
+
+import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Dialog;
import java.awt.FlowLayout;
@@ -7,16 +16,6 @@ import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import javax.swing.JPanel;
-
-import com.fr.base.chart.BaseChartCollection;
-import com.fr.chart.chartattr.ChartCollection;
-import com.fr.design.gui.chart.MiddleChartDialog;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.dialog.BasicDialog;
-
-import com.fr.design.utils.gui.GUICoreUtils;
-
/**
* 封装一层 图表新建的对话框, 配合属性表确定: 先单独只要一种图表类型的对话框.
* @author kunsnat E-mail:kunsnat@gmail.com
@@ -40,6 +39,8 @@ public class ChartDialog extends MiddleChartDialog {
}
private void initComponent() {
+ final String createTime = DateTime.now().toString("yyyy-MM-dd HH:mm:ss");
+
this.setModal(true);
this.setLayout(new BorderLayout());
final ChartTypePane chartTypePane = new ChartTypePane();
@@ -63,7 +64,7 @@ public class ChartDialog extends MiddleChartDialog {
ok.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- chartTypePane.update((ChartCollection)cc);
+ chartTypePane.update((ChartCollection)cc, createTime);
doOK();
}
});
diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java b/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java
index 7485d5797..854505d63 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java
@@ -44,6 +44,7 @@ public class ChartIcon implements Icon, XMLable {
* @param x 缩略图的起始坐标x
* @param y 缩略图的起始坐标y
*/
+ @Override
public void paintIcon(Component c, Graphics g, int x, int y) {
Graphics2D g2d = (Graphics2D) g;
@@ -66,6 +67,7 @@ public class ChartIcon implements Icon, XMLable {
*
* @return int 缩略图宽度
*/
+ @Override
public int getIconWidth() {
return WIDTH;
}
@@ -75,6 +77,7 @@ public class ChartIcon implements Icon, XMLable {
*
* @return int 缩略图高度
*/
+ @Override
public int getIconHeight() {
return HEIGHT;
}
@@ -94,18 +97,21 @@ public class ChartIcon implements Icon, XMLable {
}
+ @Override
public void readXML(XMLableReader reader) {
-
+ //do nothing
}
+ @Override
public void writeXML(XMLPrintWriter writer) {
-
+ //do nothing
}
/**
* @return 克隆后的对象
* @throws CloneNotSupportedException 如果克隆失败则抛出此异常
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
ChartIcon cloned = (ChartIcon) super.clone();
cloned.imagePath = this.imagePath;
diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
index 19c613785..2bb9a99f2 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
@@ -9,6 +9,7 @@ import com.fr.chartx.attr.ChartProvider;
import com.fr.design.ChartTypeInterfaceManager;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.chart.info.ChartInfoCollector;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils;
@@ -119,6 +120,10 @@ public class ChartTypePane extends ChartCommonWizardPane {
}
public void update(ChartCollection cc) {
+ update(cc, null);
+ }
+
+ public void update(ChartCollection cc, String createTime) {
if (cc == null) {
return;
}
@@ -130,6 +135,8 @@ public class ChartTypePane extends ChartCommonWizardPane {
try {
chart4Update = (ChartProvider) chart.clone();
cc.addChart(chart4Update);
+ //记录埋点
+ ChartInfoCollector.getInstance().collection(chart4Update, createTime);
} catch (CloneNotSupportedException ex) {
FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
}
diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java b/designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java
index 2385cabd6..ca1f4f140 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java
@@ -55,12 +55,12 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
this();
populate(cc);
}
-
+
public ChartComponent(BaseChartCollection cc) {
this();
populate(cc);
}
-
+
public ChartComponent(ChartCollection cc, PropertyChangeListener l) {
this();
populate(cc);
@@ -72,6 +72,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
* 右键编辑 图表编辑层的监听事件, 在停止编辑时 响应整个编辑模板(form, sheet)的改变.
* @param l 监听事件
*/
+ @Override
public void addStopEditingListener(PropertyChangeListener l) {
if (!listeners.contains(l)) {
listeners.add(l);
@@ -87,6 +88,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
/**
* 停止编辑, 通知事情, 刷新画出新界面.
*/
+ @Override
public void reset() {
fireStopEditing();
@@ -97,6 +99,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
repaint();
}
+ @Override
public void populate(BaseChartCollection cc) { // kunsnat_bug: 5471 实现设置的即时预览
try {// clone 为了判断编辑前后的值.
this.chartCollection4Design = (ChartCollection)cc;
@@ -107,6 +110,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
reset();
}
+ @Override
public BaseChartCollection update() {
return this.chartCollection4Design;
}
@@ -180,53 +184,63 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
* @param event 鼠标事件
* 不设置鼠标点击跳转事件
*/
+ @Override
public void mouseClicked(MouseEvent event) {
+ //do nothing
}
/**
* 鼠标按压
* @param e 鼠标事件
*/
+ @Override
public void mousePressed(MouseEvent e) {
-
-
+ //do nothing
}
/**
* 鼠标松开
* @param e 鼠标事件
*/
- public void mouseReleased(MouseEvent e) {
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ //do nothing
}
/**
* 鼠标进入
* @param e 鼠标事件
*/
+ @Override
public void mouseEntered(MouseEvent e) {
-
+ //do nothing
}
/**
* 鼠标退出
* @param e 鼠标事件
*/
+ @Override
public void mouseExited(MouseEvent e) {
-
+ //do nothing
}
/**
* 鼠标拖拽
* @param e 鼠标事件
*/
- public void mouseDragged(MouseEvent e) {
+ @Override
+ public void mouseDragged(MouseEvent e) {
+ //do nothing
}
/**
* 鼠标移动
* @param e 鼠标事件
*/
+ @Override
public void mouseMoved(MouseEvent e) {
+ //do nothing
}
private boolean needRefreshChartGlyph() {
@@ -243,7 +257,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
if (resolution == 0){
resolution = ScreenResolution.getScreenResolution();
}
- painter.paint(g2d, chartWidth, chartHeight, resolution, null);
+ painter.paint(g2d, chartWidth, chartHeight, resolution, null, this);
}
}
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
index 2148257a4..d6134e0ce 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
@@ -13,6 +13,7 @@ import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.event.ChangeEvent;
import com.fr.design.event.ChangeListener;
import com.fr.design.event.UIObserver;
@@ -327,15 +328,15 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
}
private void showRenameWaring(String newName){
- JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Has_Been_Existed")
- + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alert"), JOptionPane.WARNING_MESSAGE);
+ FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Has_Been_Existed")
+ + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
}
private JMenuItem createRenameItem() {
JMenuItem renameItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Rename"));
renameItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- String newName = JOptionPane.showInputDialog(DesignerContext.getDesignerFrame().getContentPane(),
+ String newName = FineJOptionPane.showInputDialog(DesignerContext.getDesignerFrame().getContentPane(),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Rename"), groupExtensionPane.getSelectedObject());
if (StringUtils.isNotBlank(newName)) {
String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/AbstractChartDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/AbstractChartDataPane.java
index b8690f8df..c7893ae24 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/AbstractChartDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/AbstractChartDataPane.java
@@ -5,7 +5,10 @@ import com.fr.chartx.data.ChartDataDefinitionProvider;
import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.plugin.chart.vanchart.VanChart;
+import com.fr.stable.AssistUtils;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
import java.awt.BorderLayout;
/**
@@ -13,6 +16,12 @@ import java.awt.BorderLayout;
*/
public abstract class AbstractChartDataPane extends ChartDataPane {
+ private VanChart vanChart;
+
+ protected VanChart getVanChart() {
+ return vanChart;
+ }
+
public AbstractChartDataPane(AttributeChangeListener listener) {
super(listener);
}
@@ -26,15 +35,15 @@ public abstract class AbstractChartDataPane paneList;
+ private UITabGroup tabPane;
+
+ private String[] nameArray;
+
+ @Override
+ protected void initContentPane() {
+ if (customPlot == null) {
+ return;
+ }
+ cardLayout = new CardLayout();
+ initPaneList();
+ relayoutWhenListChange();
+ }
+
+ private void initPaneList() {
+
+ paneList = new ArrayList<>();
+
+ List customPlotList = customPlot.getCustomPlotList();
+
+ for (int i = 0; i < customPlotList.size(); i++) {
+ //根据不同的plot创建不同的数据配置界面
+ final VanChartPlot vanChartPlot = customPlotList.get(i);
+ paneList.add(new AbstractVanSingleDataPane(listener) {
+ @Override
+ protected SingleDataPane createSingleDataPane() {
+ return createSingleDataPaneByPlot(vanChartPlot);
+ }
+ });
+ }
+ }
+
+ private SingleDataPane createSingleDataPaneByPlot(VanChartPlot plot) {
+ CustomPlotType customType = CustomPlotFactory.getCustomType(plot);
+ switch (customType) {
+ case RING:
+ case SLOT:
+ case CUVETTE:
+ return new SingleDataPane(new GaugeDataSetFieldsPane(), new GaugeCellDataFieldsPane());
+ case SCATTER:
+ case BUBBLE:
+ return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane());
+ case PIE:
+ case SAME_PIE:
+ case DIFFERENT_PIE:
+ case POINTER_180:
+ case POINTER_360:
+ return new SingleDataPane(new SingleCategoryDataSetFieldsPane() {
+ @Override
+ public void checkBoxUse(boolean hasUse) {
+ super.checkBoxUse(hasUse);
+ UIComboBox[] comboBoxes = super.filedComboBoxes();
+ for (UIComboBox comboBox : comboBoxes) {
+ comboBox.setEnabled(false);
+ }
+ }
+ }, new SingleCategoryCellDataFieldsPane() {
+ @Override
+ protected TinyFormulaPane[] formulaPanes() {
+ TinyFormulaPane[] tinyFormulaPanes = super.formulaPanes();
+ for (TinyFormulaPane tinyFormulaPane : tinyFormulaPanes) {
+ GUICoreUtils.setEnabled(tinyFormulaPane, false);
+ }
+ return tinyFormulaPanes;
+ }
+ });
+ default:
+ if (StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType())){
+ return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());
+ } else {
+ return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
+ }
+ }
+ }
+
+ private void relayoutWhenListChange() {
+ centerPane = new JPanel(cardLayout) {
+ @Override
+ public Dimension getPreferredSize() {
+ return paneList.get(tabPane.getSelectedIndex()).getPreferredSize();
+ }
+ };
+
+ //获取tab的标题
+ initTabTitle();
+
+ tabPane = new VanChartCustomPlotUITabGroup(nameArray) {
+ @Override
+ public void tabChanged(int index) {
+ dealWithTabChanged(index);
+ }
+ };
+ tabPane.setSelectedIndex(0);
+ tabPane.tabChanged(0);
+ initLayout();
+ }
+
+ private void initTabTitle() {
+
+ if (customPlot == null) {
+ return;
+ }
+
+ List customPlotList = customPlot.getCustomPlotList();
+ nameArray = new String[Math.min(customPlotList.size(), paneList.size())];
+ for (int i = 0; i < nameArray.length; i++) {
+ JPanel pane = paneList.get(i);
+ VanChartPlot vanChartPlot = customPlotList.get(i);
+ CustomPlotType plotType = CustomPlotFactory.getCustomType(vanChartPlot);
+
+ nameArray[i] = CustomPlotFactory.getTitle(plotType);
+ centerPane.add(pane, nameArray[i]);
+ }
+ }
+
+ protected void dealWithTabChanged(int index) {
+ cardLayout.show(centerPane, nameArray[index]);
+ }
+
+ private void initLayout() {
+ JPanel tabPanel = new JPanel(new BorderLayout());
+ tabPanel.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 0, getBackground()));
+ tabPanel.add(tabPane, BorderLayout.CENTER);
+ this.setLayout(new BorderLayout(HGAP, VGAP));
+ this.add(tabPanel, BorderLayout.NORTH);
+ this.add(centerPane, BorderLayout.CENTER);
+ }
+
+ @Override
+ public void populate(ChartCollection collection) {
+ if (collection == null) {
+ return;
+ }
+ VanChart chart = collection.getSelectedChart(VanChart.class);
+ if (chart == null) {
+ return;
+ }
+ customPlot = chart.getPlot();
+
+ this.removeAll();
+ initContentPane();
+
+ CustomChartDataDefinition dataSetCollection = (CustomChartDataDefinition) chart.getChartDataDefinition();
+
+ if (dataSetCollection != null) {
+ Map customDefinitions = dataSetCollection.getCustomDefinitions();
+ for (int i = 0; i < paneList.size(); i++) {
+ VanChartPlot vanChartPlot = customPlot.getCustomPlotList().get(i);
+ AbstractDataDefinition dataDefinition = customDefinitions.get(CustomPlotFactory.getCustomType(vanChartPlot));
+ if (dataDefinition != null) {
+ paneList.get(i).populate(dataDefinition);
+ }
+ }
+ }
+
+ this.initAllListeners();
+ this.validate();
+ }
+
+
+ @Override
+ public void update(ChartCollection collection) {
+ if (collection == null) {
+ return;
+ }
+ VanChart chart = collection.getSelectedChart(VanChart.class);
+ if (chart == null) {
+ return;
+ }
+ Map definitions = new HashMap<>();
+ for (int i = 0; i < paneList.size(); i++) {
+ definitions.put(CustomPlotFactory.getCustomType(customPlot.getCustomPlotList().get(i)), paneList.get(i).update());
+ }
+ CustomChartDataDefinition customDefinition = new CustomChartDataDefinition();
+ customDefinition.setCustomDefinitions(definitions);
+ chart.setChartDataDefinition(customDefinition);
+ }
+}
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/GanttChartDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/GanttChartDataPane.java
deleted file mode 100644
index d172d7ba5..000000000
--- a/designer-chart/src/main/java/com/fr/design/chartx/GanttChartDataPane.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.fr.design.chartx;
-
-import com.fr.chartx.data.GanttChartDataDefinition;
-import com.fr.design.chartx.fields.diff.MultiCategoryCellDataFieldsPane;
-import com.fr.design.chartx.fields.diff.MultiCategoryDataSetFieldsPane;
-import com.fr.design.chartx.single.SingleDataPane;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.van.chart.map.designer.VanChartGroupPane;
-
-import javax.swing.JPanel;
-
-/**
- * Created by shine on 2019/5/22.
- */
-public class GanttChartDataPane extends AbstractChartDataPane {
-
- private AbstractVanSingleDataPane dataPane;
- private AbstractVanSingleDataPane linkPane;
-
- @Override
- protected JPanel createContentPane() {
- dataPane = new AbstractVanSingleDataPane(listener) {
- @Override
- protected SingleDataPane createSingleDataPane() {
- return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
- }
- };
- linkPane = new AbstractVanSingleDataPane(listener) {
- @Override
- protected SingleDataPane createSingleDataPane() {
- return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
- }
- };
- return new VanChartGroupPane(new String[]{"data", "link"}, new JPanel[]{dataPane, linkPane}) {
- };
- }
-
- public GanttChartDataPane(AttributeChangeListener listener) {
- super(listener);
- }
-
- @Override
- public void populate(GanttChartDataDefinition ganttChartDataDefinition) {
- dataPane.populate(ganttChartDataDefinition.getDataDefinition());
- linkPane.populate(ganttChartDataDefinition.getLinkDefinition());
- }
-
- @Override
- public GanttChartDataDefinition update() {
- return null;
- }
-}
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java
index 443fea07a..e93900ea6 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java
@@ -22,11 +22,13 @@ import com.fr.stable.StringUtils;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
+import java.util.ArrayList;
+import java.util.List;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
-import java.util.ArrayList;
-import java.util.List;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
/**
* Created by shine on 2018/9/12.
@@ -148,9 +150,18 @@ public abstract class AbstractCustomFieldComboBoxPane extends UIComboBoxPane<
private void initComponents() {
series = new UIComboBox();
+
value = valueComboBoxHasNone() ? new UIComboBoxWithNone() : new UIComboBox();
+ value.addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ function.setEnabled(value.getSelectedItem() != null);
+ }
+ });
+
function = new CalculateComboBox();
+ function.setEnabled(false);
Component[][] components = new Component[][]{
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name"), SwingConstants.LEFT), series},
@@ -171,7 +182,6 @@ public abstract class AbstractCustomFieldComboBoxPane extends UIComboBoxPane<
public void checkBoxUse(boolean hasUse) {
series.setEnabled(hasUse);
value.setEnabled(hasUse);
- function.setEnabled(hasUse);
}
public void clearAllBoxList() {
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPane.java
index 2a8154d7b..d22d95741 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPane.java
@@ -10,13 +10,13 @@ import com.fr.general.IOUtils;
import javax.swing.BoxLayout;
import javax.swing.JComponent;
import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
/**
@@ -24,7 +24,6 @@ import java.util.List;
* 一列组件 可增可删，通过JComponent后面的加减button增删。
*/
public abstract class AbstractMultiComponentPane extends JPanel {
- private static final int COM_W = 96;
private static final int H = 20;
private static final int ICON_W = 20;
@@ -35,6 +34,7 @@ public abstract class AbstractMultiComponentPane extends J
private List categoryComponentList = new ArrayList();
+ private boolean categoryAxis = true;
protected abstract T createFirstFieldComponent();
@@ -44,13 +44,23 @@ public abstract class AbstractMultiComponentPane extends J
protected abstract void updateField(T component, ColumnField field);
+ public void setCategoryAxis(boolean categoryAxis) {
+ this.categoryAxis = categoryAxis;
+ if(!categoryAxis){
+ addButton.setEnabled(false);
+ for (JComponent component : categoryComponentList) {
+ component.setEnabled(false);
+ }
+ }
+ }
+
public AbstractMultiComponentPane() {
UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Category"));
label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
firstFieldComponent = createFirstFieldComponent();
- firstFieldComponent.setPreferredSize(new Dimension(COM_W, H));
+ firstFieldComponent.setPreferredSize(new Dimension(componentWidth(), H));
addButton = new UIButton(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
addButton.setPreferredSize(new Dimension(ICON_W, H));
@@ -64,7 +74,7 @@ public abstract class AbstractMultiComponentPane extends J
});
final JPanel panel = new JPanel();
- panel.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 2));
+ panel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 2));
panel.add(label);
panel.add(firstFieldComponent);
@@ -78,6 +88,10 @@ public abstract class AbstractMultiComponentPane extends J
this.add(boxPane, BorderLayout.CENTER);
}
+ protected int componentWidth() {
+ return 96;
+ }
+
private JPanel addComboBoxAndButtonToBox(T uiComboBox, UIButton uiButton) {
final JPanel panel = new JPanel();
panel.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 2));
@@ -93,7 +107,7 @@ public abstract class AbstractMultiComponentPane extends J
private void addNewComboBox() {
final T comboBox = createOtherFieldComponent();
- comboBox.setPreferredSize(new Dimension(COM_W, H));
+ comboBox.setPreferredSize(new Dimension(componentWidth(), H));
UIButton delButton = new UIButton(IOUtils.readIcon("com/fr/design/images/toolbarbtn/close.png"));
delButton.setPreferredSize(new Dimension(ICON_W, H));
@@ -123,7 +137,7 @@ public abstract class AbstractMultiComponentPane extends J
}
private boolean canAdd() {
- return categoryComponentList.size() < 3;
+ return categoryComponentList.size() < 2 && categoryAxis;
}
public List componentList() {
@@ -165,4 +179,16 @@ public abstract class AbstractMultiComponentPane extends J
updateField(comboBox, temp);
}
}
-}
+
+ public void checkEnable(boolean hasUse) {
+ //增加按钮是否灰化要根据是否选择了数据源，是否分类轴，分类数量是否超标三个判断
+ boolean buttonUse = hasUse && categoryAxis && categoryComponentList.size() < 2;
+ //额外的分类是否灰化根据是否选择了数据源，是否分类轴判断
+ boolean categoryUse = hasUse && categoryAxis;
+
+ addButton.setEnabled(buttonUse);
+ for (JComponent component : categoryComponentList) {
+ component.setEnabled(categoryUse);
+ }
+ }
+}
\ No newline at end of file
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java
index 5f0e6500b..f784c4a86 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java
@@ -11,10 +11,10 @@ import com.fr.stable.AssistUtils;
import javax.swing.JComponent;
import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Component;
import java.util.ArrayList;
import java.util.List;
+import java.awt.BorderLayout;
+import java.awt.Component;
/**
* Created by shine on 2019/6/18.
@@ -148,4 +148,8 @@ public abstract class AbstractMultiComponentPaneWithUISpinner {
+public abstract class AbstractSingleFilterPane extends AbstractChartTabPane implements UIObserver {
private static final int FIL_HEIGHT = 150;
@@ -34,14 +36,12 @@ public abstract class AbstractSingleFilterPane extends AbstractChartTabPane categoryList = fieldCollection.getCategoryList();
+ if (!categoryList.isEmpty()) {
+ populateCategory(categoryList.get(0).getFilterProperties());
+ }
+ }
+
+ public void updateMultiCategoryFieldCollection(MultiCategoryColumnFieldCollection fieldCollection) {
+
+ SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = fieldCollection.getSeriesValueCorrelationDefinition();
+ if (seriesValueCorrelationDefinition != null) {
+ seriesValueCorrelationDefinition.setFilterProperties(updateSeries());
+ }
+
+ List categoryList = fieldCollection.getCategoryList();
+ if (!categoryList.isEmpty()) {
+ categoryList.get(0).setFilterProperties(updateCategory());
+ }
+ }
+
+ private void populateSeries(DataFilterProperties series) {
+ seriesFilterPane.populateBean(series);
+
+ }
+
+ private void populateCategory(DataFilterProperties category) {
+ categoryFilterPane.populateBean(category);
+
+ }
+
+ private DataFilterProperties updateSeries() {
+ return seriesFilterPane.updateBean();
+
+ }
+
+ private DataFilterProperties updateCategory() {
+ return categoryFilterPane.updateBean();
+ }
+
+
+}
\ No newline at end of file
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/CellDataSeriesXYValueCorrelationPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/CellDataSeriesXYValueCorrelationPane.java
new file mode 100644
index 000000000..d14d59473
--- /dev/null
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/CellDataSeriesXYValueCorrelationPane.java
@@ -0,0 +1,66 @@
+package com.fr.design.chartx.component;
+
+import com.fr.base.Utils;
+import com.fr.chartx.data.field.ColumnField;
+import com.fr.chartx.data.field.diff.BubbleColumnField;
+import com.fr.chartx.data.field.diff.BubbleColumnFieldCollection;
+import com.fr.design.chartx.component.correlation.AbstractCorrelationPane;
+import com.fr.design.chartx.component.correlation.FieldEditorComponentWrapper;
+import com.fr.design.chartx.component.correlation.TinyFormulaPaneEditorComponent;
+import com.fr.design.i18n.Toolkit;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Wim on 2019/11/04.
+ */
+public class CellDataSeriesXYValueCorrelationPane extends AbstractCorrelationPane {
+
+ @Override
+ protected FieldEditorComponentWrapper[] createFieldEditorComponentWrappers() {
+ return new FieldEditorComponentWrapper[]{
+ new TinyFormulaPaneEditorComponent(Toolkit.i18nText("Fine-Design_Chart_Series_Name")),
+ new TinyFormulaPaneEditorComponent(Toolkit.i18nText("Fine-Design_Chart_X_Axis")),
+ new TinyFormulaPaneEditorComponent(Toolkit.i18nText("Fine-Design_Chart_Y_Axis")),
+ new TinyFormulaPaneEditorComponent(Toolkit.i18nText("Fine-Design_Chart_Series_Value"))
+ };
+ }
+
+ @Override
+ protected List covertTBeanToTableModelList(BubbleColumnFieldCollection bubbleColumnFieldCollection) {
+ List result = new ArrayList<>();
+
+ List bubbleColumnFieldList = bubbleColumnFieldCollection.getList();
+ for (BubbleColumnField field : bubbleColumnFieldList) {
+ Object[] array = new Object[]{
+ field.getSeriesName().getFieldName(),
+ field.getXField().getFieldName(),
+ field.getYField().getFieldName(),
+ field.getSizeField().getFieldName()
+ };
+ result.add(array);
+ }
+
+ return result;
+ }
+
+ @Override
+ protected void setTableModelListToTBean(List tableValues, BubbleColumnFieldCollection bubbleColumnFieldCollection) {
+ List bubbleColumnFieldList = new ArrayList<>();
+ for (Object[] oneLine : tableValues) {
+ BubbleColumnField bubbleColumnField = new BubbleColumnField();
+ ColumnField series = new ColumnField(Utils.objectToString(oneLine[0]));
+ ColumnField xField = new ColumnField(Utils.objectToString(oneLine[1]));
+ ColumnField yField = new ColumnField(Utils.objectToString(oneLine[2]));
+ ColumnField value = new ColumnField(Utils.objectToString(oneLine[3]));
+ bubbleColumnField.setSeriesName(series);
+ bubbleColumnField.setXField(xField);
+ bubbleColumnField.setYField(yField);
+ bubbleColumnField.setSizeField(value);
+ bubbleColumnFieldList.add(bubbleColumnField);
+ }
+
+ bubbleColumnFieldCollection.setList(bubbleColumnFieldList);
+ }
+}
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java
new file mode 100644
index 000000000..41202061c
--- /dev/null
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java
@@ -0,0 +1,285 @@
+package com.fr.design.chartx.component;
+
+import com.fr.base.BaseUtils;
+import com.fr.chartx.TwoTuple;
+import com.fr.data.TableDataSource;
+import com.fr.data.TableDataSourceTailor;
+import com.fr.data.impl.EmbeddedTableData;
+import com.fr.data.impl.NameTableData;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.data.DesignTableDataManager;
+import com.fr.design.data.datapane.TableDataComboBox;
+import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.chart.gui.data.table.DataPaneHelper;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.GeneralUtils;
+import com.fr.general.data.DataModel;
+import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.map.data.MapMatchResult;
+import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
+import com.fr.script.Calculator;
+import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.tree.DefaultMutableTreeNode;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2019-11-04
+ */
+public class MapAreaMatchPane extends BasicBeanPane {
+
+ private TableDataComboBox tableNameCombox;
+ private UIComboBox areaNameBox;
+ private UILabel refreshLabel;
+
+ private MatchAreaTable matchAreaTable;
+
+ private MatchResultTable matchResultTable;
+
+ private static final Object[] HEADER = new Object[]{Toolkit.i18nText("Fine-Design_Chart_Area_Name"), Toolkit.i18nText("Fine-Design_Chart_Match_To")};
+
+ private static final Object[] HEADER_WITH_EMPTY = new Object[]{Toolkit.i18nText("Fine-Design_Chart_Area_Name"), Toolkit.i18nText("Fine-Design_Chart_Match_To"), ""};
+
+ public MapAreaMatchPane(TwoTuple> treeNodeAndItems) {
+ initButtonGroup();
+ initRefreshLabel();
+ areaNameBox = new UIComboBox();
+ this.setLayout(new BorderLayout(5, 5));
+ this.add(createContentPane(), BorderLayout.NORTH);
+ initTable(treeNodeAndItems);
+
+ JPanel tablePane = new JPanel();
+ tablePane.setLayout(new BorderLayout(5, 10));
+ tablePane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
+ JScrollPane matchAreaScroll = new JScrollPane(matchAreaTable) {
+ @Override
+ public Dimension getPreferredSize() {
+ return new Dimension(400, 290);
+ }
+ };
+ tablePane.add(matchAreaScroll, BorderLayout.CENTER);
+ JScrollPane matchResultScroll = new JScrollPane(matchResultTable) {
+ @Override
+ public Dimension getPreferredSize() {
+ return new Dimension(400, 200);
+ }
+ };
+ matchResultScroll.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Chart_Custom_Match_List")));
+ tablePane.add(matchResultScroll, BorderLayout.SOUTH);
+
+ this.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
+ this.add(tablePane, BorderLayout.CENTER);
+ }
+
+ private JPanel createContentPane() {
+ JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+
+ JPanel tableDataPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+ panel.add(tableDataPane);
+ tableDataPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":"));
+ tableNameCombox.setPreferredSize(new Dimension(96, 20));
+ tableDataPane.add(tableNameCombox);
+
+ JPanel areaNamePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+ panel.add(areaNamePane);
+ areaNamePane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":"));
+ areaNamePane.add(areaNameBox);
+ areaNameBox.setPreferredSize(new Dimension(96, 20));
+ panel.add(refreshLabel);
+ return panel;
+ }
+
+ private void initTable(TwoTuple> treeNodeAndItems) {
+ matchAreaTable = new MatchAreaTable(new Object[0][2], HEADER);
+ matchAreaTable.setRoot(treeNodeAndItems.getFirst());
+ matchAreaTable.setItems(treeNodeAndItems.getSecond());
+
+ matchResultTable = new MatchResultTable(new Object[0][3], HEADER_WITH_EMPTY);
+
+ DefaultTableModel model = new DefaultTableModel(new Object[0][3], HEADER_WITH_EMPTY);
+ matchResultTable.setModel(model);
+
+ matchAreaTable.setMatchResultTable(matchResultTable);
+ matchResultTable.setMatchAreaTable(matchAreaTable);
+ }
+
+ private void initButtonGroup() {
+ tableNameCombox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource());
+ tableNameCombox.addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ if (e.getStateChange() == ItemEvent.SELECTED) {
+ refreshBox();
+ }
+ }
+ });
+ }
+
+ private void initRefreshLabel() {
+ Icon refreshImage = BaseUtils.readIcon("/com/fr/design/images/control/refresh.png");
+ refreshLabel = new UILabel(refreshImage);
+ refreshLabel.addMouseListener(new MouseAdapter() {
+ boolean mouseEntered = false;
+ boolean buttonPressed = false;
+
+ public void mouseEntered(MouseEvent e) { // 当鼠标进入时候调用.
+ mouseEntered = true;
+ if (!buttonPressed) {
+ refreshLabel.setBackground(java.awt.Color.WHITE);
+ refreshLabel.setOpaque(true);
+ refreshLabel.setBorder(BorderFactory.createLineBorder(java.awt.Color.GRAY));
+ }
+ }
+
+ public void mouseExited(MouseEvent e) {
+ mouseEntered = false;
+ refreshLabel.setOpaque(false);
+ refreshLabel.setBorder(BorderFactory.createEmptyBorder());
+ }
+
+ public void mousePressed(MouseEvent e) {
+ buttonPressed = true;
+ refreshLabel.setBackground(java.awt.Color.lightGray);
+ }
+
+ public void mouseReleased(MouseEvent e) {
+ buttonPressed = false;
+ if (mouseEntered) {
+ refreshLabel.setBackground(java.awt.Color.WHITE);
+ populateData(tableNameCombox.getSelectedItem().getTableDataName(), GeneralUtils.objectToString(areaNameBox.getSelectedItem()));
+ }
+ }
+ });
+ }
+
+ public void updateBean(MapMatchResult matchResult) {
+ if (matchResult == null) {
+ return;
+ }
+
+ matchResultTable.updateBean(matchResult);
+ }
+
+ public void populateBean(MapMatchResult matchResult) {
+
+ }
+
+ public void populateBean(MapMatchResult matchResult, String tableName, String areaName) {
+ //先取保存的数据集名称和区域名，若不存在，就取数据集面板配置的数据集名称和区域名
+ matchResultTable.populateBean(matchResult);
+ tableNameCombox.setSelectedTableDataByName(tableName);
+ if (StringUtils.isEmpty(areaName)) {
+ return;
+ }
+ areaNameBox.setSelectedItem(areaName);
+ populateData(tableName, areaName);
+ }
+
+ private void populateData(String tableName, String columnName) {
+ Object[] columnData = getColumnData(tableName, columnName);
+ if (columnData == null) {
+ return;
+ }
+ populateMatchData(columnData);
+ }
+
+ private Object[] getColumnData(String tableName, String columnName) {
+ NameTableData nameTableData = new NameTableData(tableName);
+ TableDataSource dataSource = TableDataSourceTailor.extractTableData(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget());
+ Calculator calculator = Calculator.createCalculator();
+ calculator.setAttribute(TableDataSource.KEY, dataSource);
+ nameTableData.createTableData(calculator);
+ try {
+ EmbeddedTableData tableData = DesignTableDataManager.previewTableDataNeedInputParameters(dataSource, nameTableData, Integer.MAX_VALUE, false);
+ int colIndex = getColIndex(tableData, columnName);
+ if (colIndex == DataModel.COLUMN_NAME_NOT_FOUND) {
+ return null;
+ }
+ int size = tableData.getRowCount();
+ HashSet