Merge remote-tracking branch 'origin/release/8.0' into release/8.0

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")

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

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());

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);
+            }
+        }
+    }
+
+
+}

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<>();
+            customSubmitPanes = new HashMap<String, BasicBeanPane>();
-            comboItemsMap = new HashMap<>();
+            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));

designer_base/src/com/fr/design/data/DesignTableDataManager.java

@@ -36,6 +36,7 @@ import java.io.ByteArrayOutputStream;
 import java.text.Collator;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 设计器管理操作数据集的类:
@@ -54,11 +55,11 @@ public abstract class DesignTableDataManager {
      * 其实globalDsCache没有绝对的必要，只是为了操作方便。如果没有它，那么每次清空服务器数据集或者存储过程的时候，还要去遍历找一下，
      * 这个操作可能比较复杂 。 从减少代码复杂度的角度看，还是很有必要的
      */
-    private static java.util.Map<String, TableDataWrapper> globalDsCache = new java.util.HashMap<String, TableDataWrapper>();
+    private static java.util.Map<String, TableDataWrapper> globalDsCache = new ConcurrentHashMap<String, TableDataWrapper>();
-    private static java.util.Map<String, String> dsNameChangedMap = new HashMap<String, String>();
+    private static java.util.Map<String, String> dsNameChangedMap = new ConcurrentHashMap<String, String>();
 //    private static List<ChangeListener> dsListeners = new ArrayList<ChangeListener>();
 
-    private static Map<String, List<ChangeListener>> dsListenersMap = new HashMap<String, List<ChangeListener>>();
+    private static Map<String, List<ChangeListener>> dsListenersMap = new ConcurrentHashMap<String, List<ChangeListener>>();;
 
 
     public static String NO_PARAMETER = "no_paramater_pane";

designer_base/src/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java

@@ -18,6 +18,7 @@ import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.script.Calculator;
 import com.fr.stable.ParameterProvider;
+import com.fr.stable.StringUtils;
 import com.fr.stable.project.ProjectConstants;
 
 import javax.swing.*;
@@ -160,6 +161,10 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
 
     @Override
     public void populateBean(ClassTableData ob) {
+        if(StringUtils.isEmpty(ob.getClassName())) {
+            return;
+        }
+
         this.editorPane.populate(ob.getParameters(Calculator.createCalculator()));
         this.classNameTextField.setText(ob.getClassName());
     }

designer_base/src/com/fr/design/gui/ilable/UILabel.java

@@ -29,6 +29,11 @@ public class UILabel extends JLabel {
 		super(text);
 	}
 
+	public UILabel(String text, boolean enable) {
+		super(text);
+		this.setEnabled(enable);
+	}
+
 	public UILabel(Icon image, int horizontalAlignment) {
 		super(image, horizontalAlignment);
 	}

designer_base/src/com/fr/design/locale/designer.properties

@@ -2008,3 +2008,4 @@ Default=Default
 FR-Designer_Sheet_Label_Page_Display_Position=Sheet tab display location:
 FR-Designer_Provide_Choose_All=Provide Select All
 FR-Designer_Decimal_Places=Decimal Places:
+FR-Base-Load_Resource_File=Load resource file

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -2009,3 +2009,4 @@ Default=Default
 FR-Designer_Sheet_Label_Page_Display_Position=Sheet tab display location:
 FR-Designer_Provide_Choose_All=Provide Select All
 FR-Designer_Decimal_Places=Decimal Places:
+FR-Base-Load_Resource_File=Load Configuration File

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -2008,3 +2008,4 @@ Default=\u65E2\u5B9A
 FR-Designer_Sheet_Label_Page_Display_Position=Sheet\u30E9\u30D9\u30EB\u30DA\u30FC\u30B8\u306E\u8868\u793A\u4F4D\u7F6E
 FR-Designer_Provide_Choose_All=\u5168\u9078\u629E\u53EF\u80FD
 FR-Designer_Decimal_Places=\u5C0F\u6570\u67A0\u6570:
+FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -2008,3 +2008,4 @@ Default=\uAE30\uBCF8
 FR-Designer_Sheet_Label_Page_Display_Position=
 FR-Designer_Provide_Choose_All=\uC81C\uACF5\uBAA8\uB450\uC120\uD0DD
 FR-Designer_Decimal_Places=\uC18C\uC218\uC218\uB7C9:
+FR-Base-Load_Resource_File=\uB85C\uB529\uAD6C\uC131\uD30C\uC77C

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -2008,3 +2008,4 @@ Default=\u9ED8\u8BA4
 FR-Designer_Sheet_Label_Page_Display_Position=sheet\u6807\u7B7E\u9875\u663E\u793A\u4F4D\u7F6E\uFF1A
 FR-Designer_Provide_Choose_All=\u63D0\u4F9B\u5168\u9009
 FR-Designer_Decimal_Places=\u5C0F\u6570\u6570\u76EE\uFF1A
+FR-Base-Load_Resource_File=\u52A0\u8F7D\u914D\u7F6E\u6587\u4EF6

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -2009,3 +2009,4 @@ Default=\u9810\u8A2D
 FR-Designer_Sheet_Label_Page_Display_Position=sheet\u6A19\u7C64\u9801\u986F\u793A\u4F4D\u7F6E\uFF1A
 FR-Designer_Provide_Choose_All=\u63D0\u4F9B\u5168\u9078
 FR-Designer_Decimal_Places=\u5C0F\u6578\u6578\u76EE\uFF1A
+FR-Base-Load_Resource_File=\u52A0\u8F09\u914D\u7F6E\u6A94\u6848

designer_base/src/com/fr/design/mainframe/loghandler/LogHandlerBar.java

@@ -1,24 +1,16 @@
 package com.fr.design.mainframe.loghandler;
 
-import java.awt.Component;
+import com.fr.base.BaseUtils;
-import java.awt.Container;
+import com.fr.design.gui.ibutton.UIButton;
-import java.awt.Dimension;
+import com.fr.general.Inter;
-import java.awt.Insets;
+
-import java.awt.ItemSelectable;
+import javax.swing.*;
-import java.awt.LayoutManager;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.Timer;
-
-import com.fr.base.BaseUtils;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.general.Inter;
-
 public class LogHandlerBar extends JPanel implements ItemSelectable {
 
 	private static final long serialVersionUID = 1L;
@@ -33,8 +25,6 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 	private int SERVERNUM = 0;
 
 	private boolean isWithSerious;
-	private int i;
-	private Timer timer;
 
 	public LogHandlerBar() {
 		this(null);
@@ -95,29 +85,7 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 	}
 
 	public synchronized void timerPaint() {
-		isWithSerious = true;
+		repaint();
-		timer = new Timer(500, null);
-		ActionListener taskAction = new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				if (i < 5) {
-					isWithSerious = i % 2 == 0 ? true : false;
-					repaint();
-				} else if (i == 5) {
-					if (timer == null)
-						return;
-					timer.stop();
-					timer = null;
-					i = 0;
-					isWithSerious = true;
-					return;
-				}
-				i++;
-			}
-		};
-		if (timer != null) {
-			timer.addActionListener(taskAction);
-			timer.start();
-		}
 	}
 
 	public int getInfo() {

designer_chart/src/com/fr/design/mainframe/chart/ChartsConfigPane.java

@@ -18,7 +18,7 @@ public abstract class ChartsConfigPane <T extends Charts> extends AbstractChartA
 
     @Override
     public void populate(ChartCollection collection) {
-        if (StableUtils.classInstanceOf(collection.getSelectedChart().getClass(),acceptType())) {
+        if (StableUtils.classInstanceOf(collection.getSelectedChart().getClass(), acceptType())) {
             populate(collection, (T)collection.getSelectedChart());
         }
     }
@@ -27,7 +27,7 @@ public abstract class ChartsConfigPane <T extends Charts> extends AbstractChartA
 
     @Override
     public void update(ChartCollection collection) {
-        if (StableUtils.classInstanceOf(collection.getSelectedChart().getClass(),acceptType())) {
+        if (StableUtils.classInstanceOf(collection.getSelectedChart().getClass(), acceptType())) {
             update(collection, (T)collection.getSelectedChart());
         }
     }

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> cardWidth = new HashMap<Integer, Integer>();
-        Map<Integer, Integer> cardHeight = new HashMap<>();
+        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();

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);

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;