Browse Source

Merge pull request #4104 in DESIGN/design from feature/10.0 to feature/x

* commit '48ef2eacb9d9bc48f52f5ce45328a525d794d981':
  REPORT-51446 注册表启动设计器会报错并闪退
  CHART-18997design 表单 扩展图表图表块读取失败 不吞抛错rethrow
research/11.0
superman 4 years ago
parent
commit
1eb17aa266
  1. 2
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  2. 9
      designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java
  3. 2
      designer-base/src/main/java/com/fr/start/BaseDesigner.java
  4. 2
      designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java
  5. 2
      designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java
  6. 2
      designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java

2
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@ -4,7 +4,7 @@
package com.fr.design.mainframe; package com.fr.design.mainframe;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.chart.exception.ChartNotFoundException; import com.fr.base.chart.exception.ChartNotFoundException;
import com.fr.design.DesignModelAdapter; import com.fr.design.DesignModelAdapter;
import com.fr.design.DesignState; import com.fr.design.DesignState;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;

9
designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java

@ -1,6 +1,6 @@
package com.fr.design.worker.open; package com.fr.design.worker.open;
import com.fr.chart.exception.ChartNotFoundException; import com.fr.base.chart.exception.ChartNotFoundException;
import com.fr.design.dialog.FineJOptionPane; import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
@ -13,13 +13,14 @@ import com.fr.exception.DecryptTemplateException;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import javax.swing.JOptionPane;
import javax.swing.SwingWorker;
import javax.swing.UIManager;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import javax.swing.JOptionPane;
import javax.swing.SwingWorker;
import javax.swing.UIManager;
/** /**
* 模板打开的worker * 模板打开的worker

2
designer-base/src/main/java/com/fr/start/BaseDesigner.java

@ -155,7 +155,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
isException = true;//此时有文件nullpointer异常,执行打开空文件 isException = true;//此时有文件nullpointer异常,执行打开空文件
} }
} }
if (file.exists() && !isException) { if (file != null && file.exists() && !isException) {
df.openTemplate(file); df.openTemplate(file);
} else { } else {
df.addAndActivateJTemplate(); df.addAndActivateJTemplate();

2
designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java

@ -3,9 +3,9 @@ package com.fr.design.mainframe.app;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.Style; import com.fr.base.Style;
import com.fr.base.TempNameStyle; import com.fr.base.TempNameStyle;
import com.fr.base.chart.exception.ChartNotFoundException;
import com.fr.base.extension.FileExtension; import com.fr.base.extension.FileExtension;
import com.fr.base.io.XMLEncryptUtils; import com.fr.base.io.XMLEncryptUtils;
import com.fr.chart.exception.ChartNotFoundException;
import com.fr.config.ServerPreferenceConfig; import com.fr.config.ServerPreferenceConfig;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.server.StyleListAction; import com.fr.design.actions.server.StyleListAction;

2
designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java

@ -1,9 +1,9 @@
package com.fr.design.mainframe.app; package com.fr.design.mainframe.app;
import com.fr.base.chart.exception.ChartNotFoundException;
import com.fr.base.extension.FileExtension; import com.fr.base.extension.FileExtension;
import com.fr.base.frpx.exception.FRPackageRunTimeException; import com.fr.base.frpx.exception.FRPackageRunTimeException;
import com.fr.base.frpx.exception.InvalidWorkBookException; import com.fr.base.frpx.exception.InvalidWorkBookException;
import com.fr.chart.exception.ChartNotFoundException;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.exception.DecryptTemplateException; import com.fr.exception.DecryptTemplateException;
import com.fr.exception.RemoteDesignPermissionDeniedException; import com.fr.exception.RemoteDesignPermissionDeniedException;

2
designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java

@ -1,8 +1,8 @@
package com.fr.design.mainframe.app; package com.fr.design.mainframe.app;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.base.chart.exception.ChartNotFoundException;
import com.fr.base.io.XMLEncryptUtils; import com.fr.base.io.XMLEncryptUtils;
import com.fr.chart.exception.ChartNotFoundException;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.AbstractAppProvider; import com.fr.design.mainframe.AbstractAppProvider;

Loading…
Cancel
Save