Merge pull request #42 in PF/design from ~DANIEL/finereport_design:dev to dev

* commit '0144fe22e0522f091b65c52621d71cfd03c65c6a': 打包 revert build change jdk diamond roll back 接口更新
8 years ago · 69220f0aac
8 changed files with 113 additions and 15 deletions
--- a/build.performance.gradle
+++ b/build.performance.gradle
@ -15,7 +15,6 @@ task appletJar<<{
 			fileset(dir:"${basicDir}/chart/build/classes/main")			
 			fileset(dir:"${basicDir}/report/build/classes/main")		
 			fileset(dir:"${basicDir}/platform/build/classes/main")
-			fileset(dir:"${basicDir}/performance/build/classes/main")
 		}
 		unjar(src:"${libDir}/3rd.jar",dest:"./tmp")
 		unjar(src:"${libDir}/servlet-api.jar",dest:"./tmp")
--- a/designer/src/com/fr/design/present/PresentPane.java
+++ b/designer/src/com/fr/design/present/PresentPane.java
@ -57,12 +57,12 @@ public class PresentPane extends UIComboBoxPane<Present> {
 	@Override
 	protected List<FurtherBasicBeanPane<? extends Present>> initPaneList() {
 		if (keys == null) {
-			keys = new ArrayList<>();
+			keys = new ArrayList<String>();
 		}
 		if (displays == null) {
-			displays = new ArrayList<>();
+			displays = new ArrayList<String>();
 		}
-		List<FurtherBasicBeanPane<? extends Present>> paneList = new ArrayList<>();
+		List<FurtherBasicBeanPane<? extends Present>> paneList = new ArrayList<FurtherBasicBeanPane<? extends Present>>();
 		FurtherBasicBeanPane<Present> none = new NonePresentPane();
 		paneList.add(none);
 		keys.add("NOPRESENT");
@ -99,7 +99,7 @@ public class PresentPane extends UIComboBoxPane<Present> {

 	@Override
 	protected UIComboBox createComboBox() {
-		return new DictionaryComboBox<>(keys.toArray(new String[keys.size()]), displays.toArray(new String[displays.size()]));
+		return new DictionaryComboBox<String>(keys.toArray(new String[keys.size()]), displays.toArray(new String[displays.size()]));
 	}

 	@Override
--- a/designer/src/com/fr/design/report/ReportExportAttrPane.java
+++ b/designer/src/com/fr/design/report/ReportExportAttrPane.java
@ -31,7 +31,7 @@ public class ReportExportAttrPane extends BasicPane {
        wordExportPane = new WordExportPane();
        uiTabbedPane.addTab("Word", wordExportPane);
        Set<ExportAttrTabProvider> providers = ExtraDesignClassManager.getInstance().getArray(ExportAttrTabProvider.XML_TAG);
-        paneList = new ArrayList<>();
+        paneList = new ArrayList<AbstractExportPane>();
        for (ExportAttrTabProvider provider : providers) {
            uiTabbedPane.addTab(provider.title(), provider.toSwingComponent());
            paneList.add(provider.toExportPane());
--- a/designer/src/com/fr/design/report/VerifierListPane.java
+++ b/designer/src/com/fr/design/report/VerifierListPane.java
@ -1 +1,100 @@
-package com.fr.design.report;

import com.fr.data.Verifier;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.fun.VerifyDefineProvider;
import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.controlpane.ObjectJControlPane;
import com.fr.design.mainframe.ElementCasePane;
import com.fr.general.Inter;
import com.fr.general.NameObject;
import com.fr.report.write.ReportWriteAttr;
import com.fr.report.write.ValueVerifier;
import com.fr.report.write.WClassVerifier;
import com.fr.stable.ArrayUtils;
import com.fr.stable.Nameable;

import java.util.ArrayList;
import java.util.Set;

/**
 * 校验列表
 */
public class VerifierListPane extends ObjectJControlPane {

    public VerifierListPane(ElementCasePane ePane) {
        super(ePane);
    }

    /**
     * 创建选项
     *
     * @return 选项
     */
    public NameableCreator[] createNameableCreators() {
        NameableCreator[] creators = new NameableCreator[]{
                new NameObjectCreator(Inter.getLocText(new String[]{"BuildIn", "Verify"}),
                        "/com/fr/web/images/reportlet.png",
                        ValueVerifier.class,
                        BuildInVerifierPane.class)
        };
        Set<VerifyDefineProvider> set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING);
        for (VerifyDefineProvider provider : set) {
            creators = ArrayUtils.add(creators, new NameObjectCreator(
                    provider.nameForVerifier(),
                    provider.iconPath(),
                    provider.classForVerifier(),
                    provider.appearanceForVerifier()
            ) {
            });
        }
        creators = ArrayUtils.add(creators, new NameObjectCreator(
                Inter.getLocText(new String[]{"Custom", "Verify"}),
                "/com/fr/web/images/reportlet.png",
                WClassVerifier.class,
                CustomVerifierPane.class));
        return creators;
    }

    @Override
    protected String title4PopupWindow() {
        return "Verify Collections";
    }

    public void populate(ReportWriteAttr reportWriteAttr) {
        if (reportWriteAttr == null) {
            return;
        }

        java.util.List<NameObject> nameObjectList = new ArrayList<>();

        int verifierCount = reportWriteAttr.getVerifierCount();
        for (int i = 0; i < verifierCount; i++) {
            Verifier verifier = reportWriteAttr.getVerifier(i);
            nameObjectList.add(new NameObject(verifier.getName(), verifier));
        }

        this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()]));
    }

    public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) {
        // Nameable[]居然不能强转成NameObject[],一定要这么写...
        Nameable[] res = this.update();
        NameObject[] res_array = new NameObject[res.length];
        java.util.Arrays.asList(res).toArray(res_array);

        reportWriteAttr.clearVerifiers();

        for (int i = 0; i < res_array.length; i++) {
            NameObject nameObject = res_array[i];
            if (nameObject.getObject() instanceof Verifier) {
                Verifier verifier = (Verifier) nameObject.getObject();
                verifier.setName(nameObject.getName());
                reportWriteAttr.addVerifier(verifier);
            }
        }
    }


}
+package com.fr.design.report;
+
+import com.fr.data.Verifier;
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.fun.VerifyDefineProvider;
+import com.fr.design.gui.controlpane.NameObjectCreator;
+import com.fr.design.gui.controlpane.NameableCreator;
+import com.fr.design.gui.controlpane.ObjectJControlPane;
+import com.fr.design.mainframe.ElementCasePane;
+import com.fr.general.Inter;
+import com.fr.general.NameObject;
+import com.fr.report.write.ReportWriteAttr;
+import com.fr.report.write.ValueVerifier;
+import com.fr.report.write.WClassVerifier;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.Nameable;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+/**
+ * 校验列表
+ */
+public class VerifierListPane extends ObjectJControlPane {
+
+    public VerifierListPane(ElementCasePane ePane) {
+        super(ePane);
+    }
+
+    /**
+     * 创建选项
+     *
+     * @return 选项
+     */
+    public NameableCreator[] createNameableCreators() {
+        NameableCreator[] creators = new NameableCreator[]{
+                new NameObjectCreator(Inter.getLocText(new String[]{"BuildIn", "Verify"}),
+                        "/com/fr/web/images/reportlet.png",
+                        ValueVerifier.class,
+                        BuildInVerifierPane.class)
+        };
+        Set<VerifyDefineProvider> set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING);
+        for (VerifyDefineProvider provider : set) {
+            creators = ArrayUtils.add(creators, new NameObjectCreator(
+                    provider.nameForVerifier(),
+                    provider.iconPath(),
+                    provider.classForVerifier(),
+                    provider.appearanceForVerifier()
+            ) {
+            });
+        }
+        creators = ArrayUtils.add(creators, new NameObjectCreator(
+                Inter.getLocText(new String[]{"Custom", "Verify"}),
+                "/com/fr/web/images/reportlet.png",
+                WClassVerifier.class,
+                CustomVerifierPane.class));
+        return creators;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "Verify Collections";
+    }
+
+    public void populate(ReportWriteAttr reportWriteAttr) {
+        if (reportWriteAttr == null) {
+            return;
+        }
+
+        java.util.List<NameObject> nameObjectList = new ArrayList<NameObject>();
+
+        int verifierCount = reportWriteAttr.getVerifierCount();
+        for (int i = 0; i < verifierCount; i++) {
+            Verifier verifier = reportWriteAttr.getVerifier(i);
+            nameObjectList.add(new NameObject(verifier.getName(), verifier));
+        }
+
+        this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()]));
+    }
+
+    public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) {
+        // Nameable[]居然不能强转成NameObject[],一定要这么写...
+        Nameable[] res = this.update();
+        NameObject[] res_array = new NameObject[res.length];
+        java.util.Arrays.asList(res).toArray(res_array);
+
+        reportWriteAttr.clearVerifiers();
+
+        for (int i = 0; i < res_array.length; i++) {
+            NameObject nameObject = res_array[i];
+            if (nameObject.getObject() instanceof Verifier) {
+                Verifier verifier = (Verifier) nameObject.getObject();
+                verifier.setName(nameObject.getName());
+                reportWriteAttr.addVerifier(verifier);
+            }
+        }
+    }
+
+
+}
--- a/designer/src/com/fr/design/write/submit/SubmitVisitorListPane.java
+++ b/designer/src/com/fr/design/write/submit/SubmitVisitorListPane.java
@ -68,7 +68,7 @@ public class SubmitVisitorListPane extends ObjectJControlPane {
            return;
        }

-        List<NameObject> nameObjectList = new ArrayList<>();
+        List<NameObject> nameObjectList = new ArrayList<NameObject>();

        int submiterCount = reportWriteAttr.getSubmitVisitorCount();
        for (int i = 0; i < submiterCount; i++) {
@ -169,8 +169,8 @@ public class SubmitVisitorListPane extends ObjectJControlPane {
        public CustomPane() {
            this.setLayout(FRGUIPaneFactory.createBorderLayout());
            customCardPane = FRGUIPaneFactory.createCardLayout_S_Pane();
-            customSubmitPanes = new HashMap<>();
-            comboItemsMap = new HashMap<>();
+            customSubmitPanes = new HashMap<String, BasicBeanPane>();
+            comboItemsMap = new HashMap<String, String>();

            Set<SubmitProvider> providers = ExtraDesignClassManager.getInstance().getArray(SubmitProvider.MARK_STRING);
            addSubmitPane(new DefaultSubmit());
@ -178,7 +178,7 @@ public class SubmitVisitorListPane extends ObjectJControlPane {
                addSubmitPane(provider);
            }

-            configTypes = new ArrayList<>();
+            configTypes = new ArrayList<String>();
            for (Map.Entry<String, BasicBeanPane> entry : customSubmitPanes.entrySet()) {
                String key = entry.getKey();
                configTypes.add(comboItemsMap.get(key));
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
@ -389,8 +389,8 @@ public class XCardSwitchButton extends XButton {
            return;
        }
        int tabLength = this.tagLayout.getComponentCount();
-        Map<Integer, Integer> cardWidth = new HashMap<>();
-        Map<Integer, Integer> cardHeight = new HashMap<>();
+        Map<Integer, Integer> cardWidth = new HashMap<Integer, Integer>();
+        Map<Integer, Integer> cardHeight = new HashMap<Integer, Integer>();
        for (int i = 0; i < tabLength; i++) {
            XCardSwitchButton temp = (XCardSwitchButton) this.tagLayout.getComponent(i);
            CardSwitchButton tempCard = (CardSwitchButton) temp.toData();
--- a/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java
+++ b/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java
@ -60,7 +60,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
                        .setRendererClass(BooleanRender.class)
                        .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit"))
        };
-        List<CRPropertyDescriptor> defaultList = new ArrayList<>();
+        List<CRPropertyDescriptor> defaultList = new ArrayList<CRPropertyDescriptor>();

        for (CRPropertyDescriptor propertyDescriptor: propertyTableEditor) {
            defaultList.add(propertyDescriptor);
--- a/designer_form/src/com/fr/design/gui/xtable/PropertyGroupModel.java
+++ b/designer_form/src/com/fr/design/gui/xtable/PropertyGroupModel.java
@ -54,7 +54,7 @@ public class PropertyGroupModel extends AbstractPropertyGroupModel {
                creator.resetCreatorName(value.toString());
            }
            if(ComparatorUtils.equals("visible", properties[row].getName())){
-                creator.resetVisible((boolean) value);
+                creator.resetVisible((Boolean) value);
            }
            properties[row].firePropertyChanged();
            return true;