Browse Source

Merge pull request #3 in PG/plugin-report-doc_demo from ~YAOH.WU/plugin-report-doc_demo:release/10.0 to release/10.0

* commit '37ba9a2480919c54a0f43715baddd3af5d2c27b5':
  REPORT-10287 source language level 1.6
persist/10.0
yaoh.wu 6 years ago
parent
commit
363ca91c46
  1. 7
      plugin-report-doc_demo.iml
  2. 2
      plugin.xml
  3. 5
      src/com/fr/data/ParamSAPDataTest.java
  4. 3
      src/com/fr/data/XMLDemoTableData.java

7
plugin-report-doc_demo.iml

@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4"> <module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="lib" level="project" />
<orderEntry type="library" name="Maven: com.fr.core:fine-core:10.0-RELEASE-SNAPSHOT" level="project" /> <orderEntry type="library" name="Maven: com.fr.core:fine-core:10.0-RELEASE-SNAPSHOT" level="project" />
<orderEntry type="module" module-name="engine" /> <orderEntry type="module" module-name="engine" />
<orderEntry type="module" module-name="base-dialect" /> <orderEntry type="module" module-name="base-dialect" />
@ -15,5 +14,9 @@
<orderEntry type="module" module-name="engine-write" /> <orderEntry type="module" module-name="engine-write" />
<orderEntry type="module" module-name="engine-cross" /> <orderEntry type="module" module-name="engine-cross" />
<orderEntry type="module" module-name="engine-page" /> <orderEntry type="module" module-name="engine-page" />
<orderEntry type="library" name="lib" level="project" />
<orderEntry type="module" module-name="designer-realize" />
<orderEntry type="module" module-name="fservice" />
<orderEntry type="module" module-name="fschedule" />
</component> </component>
</module> </module>

2
plugin.xml

@ -4,7 +4,7 @@
<name><![CDATA[文档demo代码集成]]></name> <name><![CDATA[文档demo代码集成]]></name>
<active>yes</active> <active>yes</active>
<hidden>no</hidden> <hidden>no</hidden>
<version>1.1.0</version> <version>1.1.1</version>
<env-version>10.0~</env-version> <env-version>10.0~</env-version>
<jartime>2018-08-02</jartime> <jartime>2018-08-02</jartime>
<vendor>finereport</vendor> <vendor>finereport</vendor>

5
src/com/fr/data/ParamSAPDataTest.java

@ -10,6 +10,7 @@ import com.sap.conn.jco.JCoFunction;
import com.sap.conn.jco.JCoTable; import com.sap.conn.jco.JCoTable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
public class ParamSAPDataTest extends AbstractTableData { public class ParamSAPDataTest extends AbstractTableData {
private String[] columnNames = null; private String[] columnNames = null;
@ -21,12 +22,12 @@ public class ParamSAPDataTest extends AbstractTableData {
private static JCoDestination jCoDestination; private static JCoDestination jCoDestination;
public ParamSAPDataTest() { public ParamSAPDataTest() {
ArrayList<String> arrayList = new ArrayList<>(); ArrayList<String> arrayList = new ArrayList<String>();
arrayList.add("LIFNR"); arrayList.add("LIFNR");
arrayList.add("NAME1"); arrayList.add("NAME1");
this.parameters = new XmlColConf<>(arrayList, ParameterProvider.class); this.parameters = new XmlColConf<Collection<ParameterProvider>>(arrayList, ParameterProvider.class);
this.columnNames = new String[this.columnNum]; this.columnNames = new String[this.columnNum];
this.columnNames[0] = "供应商编码"; this.columnNames[0] = "供应商编码";

3
src/com/fr/data/XMLDemoTableData.java

@ -16,6 +16,7 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
/** /**
@ -30,7 +31,7 @@ public class XMLDemoTableData extends AbstractParameterTableData {
// 构造函数 // 构造函数
public XMLDemoTableData() { public XMLDemoTableData() {
// 定义需要的参数,这里定义一个参数,参数名为filename,给其一个默认值"Northwind.xml" // 定义需要的参数,这里定义一个参数,参数名为filename,给其一个默认值"Northwind.xml"
this.parameters = new XmlColConf<>(new ArrayList(), ParameterProvider.class); this.parameters = new XmlColConf<Collection<ParameterProvider>>(new ArrayList(), ParameterProvider.class);
parameters.add(new Parameter("filename", "Northwind")); parameters.add(new Parameter("filename", "Northwind"));
} }

Loading…
Cancel
Save