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

Merge pull request #1381 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0 

* commit 'db181c4505c6fd7fe96a3150ebc549e03f59136f':
  REPORT-25730 最新的release设计器启动后一直报模板不存在 还需要判断是否存在
  REPORT-25730 最新的release设计器启动后一直报模板不存在 这里执行的时候需要判空。
  REPORT-24344 Spider数据集插件需要约束下BI 相关jar的 jar time 开放校验接口。
feature/big-screen
Harrison 5 years ago
parent
5071692c7c db181c4505
commit
5453f6d7de
7 changed files with 23 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
  2. 3
      designer-base/src/main/java/com/fr/design/extra/PluginUtils.java
  3. 6
      designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
  4. 4
      designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
  5. 4
      designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
  6. 6
      designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
  7. 4
      designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java

11
designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
Unescape View File

@ -171,8 +171,15 @@ public class TableDataTreePane extends BasicTableDataTreePane {
private void reloadCurrTemplate() {
JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
HistoryTemplateListCache.getInstance().closeSelectedReport(jt);
DesignerContext.getDesignerFrame().openTemplate(jt.getEditingFILE());
if (accept(jt)) {
HistoryTemplateListCache.getInstance().closeSelectedReport(jt);
DesignerContext.getDesignerFrame().openTemplate(jt.getEditingFILE());
}
}
private boolean accept(JTemplate<?, ?> jt) {
return jt != null && jt.getEditingFILE() != null && !jt.getEditingFILE().exists();
}
}, new PluginFilter() {
@Override

3
designer-base/src/main/java/com/fr/design/extra/PluginUtils.java
Unescape View File

@ -12,6 +12,7 @@ import com.fr.plugin.basic.version.Version;
import com.fr.plugin.basic.version.VersionIntervalFactory;
import com.fr.plugin.context.PluginContext;
import com.fr.plugin.context.PluginMarker;
import com.fr.plugin.error.PluginCoreErrorCode;
import com.fr.plugin.error.PluginErrorCode;
import com.fr.plugin.manage.PluginManager;
import com.fr.plugin.view.PluginView;
@ -195,7 +196,7 @@ public class PluginUtils {
}
public static String getMessageByErrorCode(PluginErrorCode errorCode) {
if(errorCode == PluginErrorCode.None){
if(errorCode == PluginCoreErrorCode.None){
return "";
}

6
designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
Unescape View File

@ -7,7 +7,7 @@ import com.fr.design.extra.PluginUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.plugin.context.PluginMarker;
import com.fr.plugin.error.PluginErrorCode;
import com.fr.plugin.error.PluginCoreErrorCode;
import com.fr.plugin.manage.PluginManager;
import com.fr.plugin.manage.control.PluginTask;
import com.fr.plugin.manage.control.PluginTaskResult;
@ -43,7 +43,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
jsCallback.execute("success");
FineLoggerFactory.getLogger().info(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) {
} else if (result.errorCode() == PluginCoreErrorCode.NeedDealWithPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence"),
@ -63,7 +63,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
PluginOperateUtils.installPluginOnline(marker, jsCallback);
}
PluginManager.getController().install(zipFile, new InstallFromDiskCallback(zipFile, jsCallback));
} else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){
} else if(result.errorCode() == PluginCoreErrorCode.HasLowerPluginWhenInstall){
int rv = JOptionPane.showOptionDialog(
null,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"),

4
designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
Unescape View File

@ -6,7 +6,7 @@ import com.fr.design.extra.PluginOperateUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.plugin.context.PluginMarker;
import com.fr.plugin.error.PluginErrorCode;
import com.fr.plugin.error.PluginCoreErrorCode;
import com.fr.plugin.manage.control.AbstractDealPreTaskCallback;
import com.fr.plugin.manage.control.PluginTask;
import com.fr.plugin.manage.control.PluginTaskResult;
@ -40,7 +40,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
jsCallback.execute("success");
FineLoggerFactory.getLogger().info(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){
} else if(result.errorCode() == PluginCoreErrorCode.HasLowerPluginWhenInstall){
int rv = JOptionPane.showOptionDialog(
null,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"),

4
designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
Unescape View File

@ -6,7 +6,7 @@ import com.fr.design.extra.PluginUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.plugin.context.PluginMarker;
import com.fr.plugin.error.PluginErrorCode;
import com.fr.plugin.error.PluginCoreErrorCode;
import com.fr.plugin.manage.PluginManager;
import com.fr.plugin.manage.control.PluginTaskResult;
@ -29,7 +29,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
jsCallback.execute("success");
FineLoggerFactory.getLogger().info(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) {
}else if (result.errorCode() == PluginCoreErrorCode.NeedUninstallDependingPluginFirst) {
int rv = JOptionPane.showOptionDialog(
null,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence"),

6
designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
Unescape View File

@ -7,7 +7,7 @@ import com.fr.design.extra.PluginUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.plugin.context.PluginMarker;
import com.fr.plugin.error.PluginErrorCode;
import com.fr.plugin.error.PluginCoreErrorCode;
import com.fr.plugin.manage.PluginManager;
import com.fr.plugin.manage.control.PluginTask;
import com.fr.plugin.manage.control.PluginTaskResult;
@ -41,7 +41,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
jsCallback.execute("success");
FineLoggerFactory.getLogger().info(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) {
} else if (result.errorCode() == PluginCoreErrorCode.NeedDealWithPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Dependence"),
@ -61,7 +61,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
PluginOperateUtils.updatePluginOnline(marker, jsCallback);
}
PluginManager.getController().update(zipFile, new UpdateFromDiskCallback(zipFile, jsCallback));
} else if(result.errorCode() == PluginErrorCode.NoPluginToUpdate){
} else if(result.errorCode() == PluginCoreErrorCode.NoPluginToUpdate){
int rv = JOptionPane.showOptionDialog(
null,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_No_Plugin_Update"),

4
designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java
Unescape View File

@ -6,7 +6,7 @@ import com.fr.design.extra.PluginUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.plugin.context.PluginMarker;
import com.fr.plugin.error.PluginErrorCode;
import com.fr.plugin.error.PluginCoreErrorCode;
import com.fr.plugin.manage.PluginManager;
import com.fr.plugin.manage.control.PluginTaskResult;
import com.fr.plugin.manage.control.ProgressCallback;
@ -34,7 +34,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
if (result.isSuccess()) {
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update_Success"));
FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
} else if (result.errorCode() == PluginErrorCode.OperationNotSupport) {
} else if (result.errorCode() == PluginCoreErrorCode.OperationNotSupport) {
int rv = JOptionPane.showOptionDialog(
null,
com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Dependence"),

Write Preview
Loading…
Cancel
Save