Roger.Chen
/
example
forked from demo/example
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #23 in PG/plugin-report-doc-demo from release/10.0 to persist/10.0 

* commit 'b6a7536cb0dc75c8f249c434f8840aab4c793b2b':
  DEMO-3230 Release10 module无法引用 删掉不可用模块
  无JIRA任务  适配新10.0代码
persist/10.0
Lanlan 5 years ago
parent
34ec362f64 b6a7536cb0
commit
5a3d9301af
17 changed files with 34 additions and 37 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. 4
      src/main/java/com/fr/demo/SaveReportToDatabase.java
  2. 4
      src/main/java/com/fr/function/ReportCheck.java
  3. 4
      src/main/java/com/fr/io/CreateGenericTemplate.java
  4. 4
      src/main/java/com/fr/io/ExcelToCpt.java
  5. 4
      src/main/java/com/fr/io/ExcuteDemo.java
  6. 4
      src/main/java/com/fr/io/ExportApi.java
  7. 7
      src/main/java/com/fr/io/ExportApi_frm.java
  8. 4
      src/main/java/com/fr/io/ExportBatch.java
  9. 4
      src/main/java/com/fr/io/ExportExcel.java
  10. 4
      src/main/java/com/fr/io/ExportReports.java
  11. 4
      src/main/java/com/fr/io/JavaPrint.java
  12. 4
      src/main/java/com/fr/io/SaveReportToDatabase.java
  13. 4
      src/main/java/com/fr/io/SetParameterWindow.java
  14. 4
      src/main/java/com/fr/io/SimpleDemo.java
  15. 4
      src/main/java/com/fr/learn/Leaner.java
  16. 4
      src/test/main/java/com/fr/demo/ExportApiTest.java
  17. 4
      src/test/main/java/com/fr/demo/ModuleStartTest.java

4
src/main/java/com/fr/demo/SaveReportToDatabase.java
Unescape View File

@ -14,7 +14,7 @@ import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.io.File;
@ -35,7 +35,7 @@ public class SaveReportToDatabase {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/main/java/com/fr/function/ReportCheck.java
Unescape View File

@ -25,7 +25,7 @@ import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.script.AbstractFunction;
import com.fr.stable.WriteActor;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import com.fr.write.cal.WB;
@ -45,7 +45,7 @@ public class ReportCheck extends AbstractFunction {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/main/java/com/fr/io/CreateGenericTemplate.java
Unescape View File

@ -23,7 +23,7 @@ import com.fr.report.module.ReportBaseActivator;
import com.fr.report.worksheet.WorkSheet;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.io.File;
@ -37,7 +37,7 @@ public class CreateGenericTemplate {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/main/java/com/fr/io/ExcelToCpt.java
Unescape View File

@ -17,7 +17,7 @@ import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.io.File;
@ -32,7 +32,7 @@ public class ExcelToCpt {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/main/java/com/fr/io/ExcuteDemo.java
Unescape View File

@ -18,7 +18,7 @@ import com.fr.report.module.ReportBaseActivator;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.stable.WriteActor;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.io.File;
@ -33,7 +33,7 @@ public class ExcuteDemo {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/main/java/com/fr/io/ExportApi.java
Unescape View File

@ -18,7 +18,7 @@ import com.fr.report.module.ReportBaseActivator;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.stable.WriteActor;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.io.File;
@ -31,7 +31,7 @@ public class ExportApi {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),
new RestrictionActivator(),

7
src/main/java/com/fr/io/ExportApi_frm.java
Unescape View File

@ -8,11 +8,9 @@ import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl;
import com.fr.form.export.FormToWBExecutor;
import com.fr.general.I18nResource;
import com.fr.io.TemplateWorkBookIO;
import com.fr.io.exporter.ImageExporter;
import com.fr.io.exporter.PDFExporter;
import com.fr.io.exporter.excel.stream.StreamExcel2007Exporter;
import com.fr.main.impl.WorkBook;
import com.fr.main.workbook.ResultWorkBook;
import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox;
@ -21,8 +19,7 @@ import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.stable.WriteActor;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.io.File;
@ -34,7 +31,7 @@ public class ExportApi_frm {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),
new RestrictionActivator(),

4
src/main/java/com/fr/io/ExportBatch.java
Unescape View File

@ -19,7 +19,7 @@ import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.stable.StableUtils;
import com.fr.stable.WriteActor;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.io.BufferedReader;
@ -38,7 +38,7 @@ public class ExportBatch {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/main/java/com/fr/io/ExportExcel.java
Unescape View File

@ -26,7 +26,7 @@ import com.fr.report.module.ReportBaseActivator;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.stable.WriteActor;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.io.File;
@ -40,7 +40,7 @@ public class ExportExcel {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/main/java/com/fr/io/ExportReports.java
Unescape View File

@ -21,7 +21,7 @@ import com.fr.report.report.PageReport;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.stable.PageActor;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.io.File;
@ -35,7 +35,7 @@ public class ExportReports {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/main/java/com/fr/io/JavaPrint.java
Unescape View File

@ -17,7 +17,7 @@ import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.util.HashMap;
@ -29,7 +29,7 @@ public class JavaPrint {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/main/java/com/fr/io/SaveReportToDatabase.java
Unescape View File

@ -14,7 +14,7 @@ import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.io.File;
@ -45,7 +45,7 @@ public class SaveReportToDatabase {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/main/java/com/fr/io/SetParameterWindow.java
Unescape View File

@ -19,7 +19,7 @@ import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.awt.Color;
@ -33,7 +33,7 @@ public class SetParameterWindow {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/main/java/com/fr/io/SimpleDemo.java
Unescape View File

@ -19,7 +19,7 @@ import com.fr.report.elementcase.TemplateElementCase;
import com.fr.report.module.ReportBaseActivator;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import java.awt.Color;
@ -33,7 +33,7 @@ public class SimpleDemo {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/main/java/com/fr/learn/Leaner.java
Unescape View File

@ -1,8 +1,8 @@
package com.fr.learn;
import com.fr.start.Designer;
import com.fr.start.MainDesigner;
public class Leaner extends Designer {
public class Leaner extends MainDesigner {
static {
// 这段代码让插件能支持远程设计的时候的调试

4
src/test/main/java/com/fr/demo/ExportApiTest.java
Unescape View File

@ -22,7 +22,7 @@ import com.fr.report.worksheet.WorkSheet;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.stable.WriteActor;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import com.fr.write.web.excel.ExcelImportPlusProcessor;
import junit.framework.TestCase;
@ -43,7 +43,7 @@ public class ExportApiTest extends TestCase {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

4
src/test/main/java/com/fr/demo/ModuleStartTest.java
Unescape View File

@ -19,7 +19,7 @@ import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator;
import com.fr.report.write.WriteActivator;
import com.fr.scheduler.SchedulerActivator;
import com.fr.store.StateServerActivator;
import com.fr.store.StateServiceActivator;
import com.fr.workspace.simple.SimpleWork;
import junit.framework.TestCase;
import org.junit.Assert;
@ -65,7 +65,7 @@ public class ModuleStartTest extends TestCase {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new StateServerActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

Write Preview
Loading…
Cancel
Save