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

designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java

@@ -64,6 +64,7 @@ public class TableDataSourceAction extends TemplateComponentAction<JTemplate<?,
      * 撤销
      */
     public void prepare4Undo() {
+        //do nothing
     }
 
     /**

designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@@ -20,7 +20,7 @@ import com.fr.design.data.tabledata.wrapper.TableDataFactory;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
 import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.iprogressbar.AutoProgressBar;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
@@ -73,7 +73,7 @@ public abstract class DesignTableDataManager {
      */
     private static java.util.Map<String, TableDataWrapper> globalDsCache = new java.util.HashMap<String, TableDataWrapper>();
     private static java.util.Map<String, String> dsNameChangedMap = new HashMap<String, String>();
-//    private static List<ChangeListener> dsListeners = new ArrayList<ChangeListener>();
+    private static List<ChangeListener> globalDsListeners = new ArrayList<>();
 
     private static Map<String, List<ChangeListener>> dsListenersMap = new HashMap<String, List<ChangeListener>>();
 
@@ -95,15 +95,19 @@ public abstract class DesignTableDataManager {
      * 响应数据集改变.
      */
     private static void fireDsChanged() {
+        fireDsChanged(globalDsListeners);
         for (Entry<String, List<ChangeListener>> listenerEntry : dsListenersMap.entrySet()) {
             List<ChangeListener> dsListeners = listenerEntry.getValue();
-            for (int i = 0; i < dsListeners.size(); i++) {
-                //增强for循环用的iterator实现的, 如果中间哪个listener修改或删除了(如ChartEditPane.dsChangeListener),
-                // 由于dsListeners是arraylist, 此时会ConcurrentModifyException
-//        for (ChangeListener l : dsListeners) {
-                ChangeEvent e = null;
-                dsListeners.get(i).stateChanged(e);
-            }
+            fireDsChanged(dsListeners);
+        }
+    }
+
+    private static void fireDsChanged(List<ChangeListener> dsListeners) {
+        for (int i = 0; i < dsListeners.size(); i++) {
+            //增强for循环用的iterator实现的, 如果中间哪个listener修改或删除了(如ChartEditPane.dsChangeListener),
+            // 由于dsListeners是arraylist, 此时会ConcurrentModifyException
+            ChangeEvent e = null;
+            dsListeners.get(i).stateChanged(e);
         }
     }
 
@@ -160,13 +164,17 @@ public abstract class DesignTableDataManager {
         }
     }
 
+    public static void addGlobalDsChangeListener(ChangeListener l) {
+        globalDsListeners.add(l);
+    }
+
     /**
      * 添加模板数据集改变 监听事件.
      *
      * @param l ChangeListener监听器
      */
     public static void addDsChangeListener(ChangeListener l) {
-        JTemplate<?, ?> template = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
         String key = StringUtils.EMPTY;
         if (template != null) {
             key = template.getPath();
@@ -178,7 +186,6 @@ public abstract class DesignTableDataManager {
         }
         dsListeners.add(l);
     }
-
     /**
      * 获取数据源source中dsName的所有字段
      *

designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java

@@ -34,6 +34,7 @@ public class TableDataComboBox extends UIComboBox implements Prepare4DataSourceC
     private static final long serialVersionUID = 1L;
 	private boolean refresModel = false;
     private String treeName; //树数据集本身的名字
+	private ChangeListener changeListener;
 
     public TableDataComboBox(TableDataSource source){
         this(source,StringUtils.EMPTY);
@@ -136,15 +137,22 @@ public class TableDataComboBox extends UIComboBox implements Prepare4DataSourceC
 		}
 	}
 
-    /**
-     *注册listener,相应数据集改变
-     */
-    public void registerDSChangeListener() {
-        DesignTableDataManager.addDsChangeListener(new ChangeListener() {
-            public void stateChanged(ChangeEvent e) {
-                TableDataComboBox.this.refresh(DesignTableDataManager.getEditingTableDataSource());
-            }
-        });
-    }
+	/**
+	 *注册listener,相应数据集改变
+	 */
+	@Override
+	public void registerDSChangeListener() {
+		changeListener = new ChangeListener() {
+			@Override
+			public void stateChanged(ChangeEvent e) {
+				TableDataComboBox.this.refresh(DesignTableDataManager.getEditingTableDataSource());
+			}
+		};
+		DesignTableDataManager.addDsChangeListener(changeListener);
+	}
+
+	public void registerGlobalDSChangeListener() {
+		DesignTableDataManager.addGlobalDsChangeListener(changeListener);
+	}
 
 }

designer-base/src/main/java/com/fr/design/designer/creator/CRPropertyDescriptor.java

@@ -4,6 +4,7 @@
 package com.fr.design.designer.creator;
 
 import com.fr.stable.StringUtils;
+import com.fr.stable.core.PropertyChangeAdapter;
 import com.fr.stable.core.PropertyChangeListener;
 
 import java.beans.IntrospectionException;
@@ -40,6 +41,12 @@ public final class CRPropertyDescriptor extends PropertyDescriptor {
         return this;
     }
 
+    @Deprecated
+    public CRPropertyDescriptor setPropertyChangeListener(PropertyChangeAdapter l) {
+        this.l = l;
+        return this;
+    }
+
     public void firePropertyChanged() {
         if (l != null) {
             l.propertyChange();

designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java

@@ -1,6 +1,6 @@
 package com.fr.design.env;
 
-import com.fr.cluster.engine.remote.ClusterOperator;
+import com.fr.cluster.engine.base.FineClusterConfig;
 import com.fr.design.i18n.Toolkit;
 import com.fr.stable.AssistUtils;
 import com.fr.workspace.WorkContext;
@@ -70,7 +70,7 @@ public class RemoteWorkspace implements Workspace {
 
     @Override
     public boolean isCluster() {
-        return WorkContext.getCurrent().get(ClusterOperator.class).isCluster();
+        return FineClusterConfig.getInstance().isCluster();
     }
 
     @Override

designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

@@ -44,6 +44,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Enumeration;
+import java.util.Objects;
 
 import static javax.swing.JOptionPane.WARNING_MESSAGE;
 import static javax.swing.JOptionPane.YES_NO_OPTION;
@@ -299,7 +300,18 @@ public class TemplateTreePane extends JPanel implements FileOperations {
                 }
             }
         }
-        reportletsTree.refresh();
+        refreshAfterDelete();
+    }
+
+    private void refreshAfterDelete() {
+        TreePath[] paths = reportletsTree.getSelectionPaths();
+        if (paths == null) {
+            reportletsTree.refresh();
+        } else  {
+            for (TreePath path : Objects.requireNonNull(reportletsTree.getSelectionPaths())) {
+                reportletsTree.refreshParent(path);
+            }
+        }
     }
 
     private boolean deleteNodes(Collection<ExpandMutableTreeNode> nodes) {

designer-base/src/main/java/com/fr/design/gui/frpane/AbstractAttrNoScrollPane.java

@@ -65,7 +65,7 @@ public abstract class AbstractAttrNoScrollPane extends BasicPane {
 	}
 
 
-	protected void initListener(Container parentComponent) {
+	public void initListener(Container parentComponent) {
 		for (int i = 0; i < parentComponent.getComponentCount(); i++) {
 			Component tmpComp = parentComponent.getComponent(i);
 

designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java

@@ -23,6 +23,8 @@ import java.awt.FlowLayout;
 import java.awt.FontMetrics;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
@@ -141,6 +143,12 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
                         attributeChange();
                     }
                 });
+                this.addFocusListener(new FocusAdapter() {
+                    @Override
+                    public void focusLost(FocusEvent e) {
+                        attributeChange();
+                    }
+                });
             }
         };
         editor.setEditable(false);

designer-base/src/main/java/com/fr/design/gui/ispinner/UIBasicSpinner.java

@@ -7,6 +7,9 @@ import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import java.awt.*;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.text.ParseException;
 
 /**
  * Created by IntelliJ IDEA.
@@ -56,7 +59,17 @@ public class UIBasicSpinner extends JSpinner implements UIObserver {
                 }
             });
         }
+        final JFormattedTextField textField = ((JSpinner.DefaultEditor) this.getEditor()).getTextField();
+        textField.addFocusListener(new FocusAdapter() {
+            @Override
+            public void focusLost(FocusEvent e) {
+                try {
+                    textField.commitEdit();
+                } catch (ParseException ignore) {
 
+                }
+            }
+        });
     }
 
 

designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java

@@ -145,6 +145,11 @@ public abstract class RefreshableJTree extends CheckBoxTree {
         refresh((ExpandMutableTreeNode) this.getModel().getRoot(), StringUtils.EMPTY);
     }
 
+    //REPORT-24085，只刷新父节点
+    public void refreshParent(TreePath path) {
+        refresh((ExpandMutableTreeNode) path.getParentPath().getLastPathComponent(), StringUtils.EMPTY);
+    }
+
     public void refreshChildByName(String childName) {
         refresh((ExpandMutableTreeNode) this.getModel().getRoot(), childName);
     }

designer-base/src/main/java/com/fr/design/present/DictPresentPane.java

@@ -5,6 +5,7 @@ import java.awt.event.ItemListener;
 
 import com.fr.base.present.DictPresent;
 import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.data.tabledata.Prepare4DataSourceChange;
 import com.fr.design.present.dict.DictionaryPane;
 
 
@@ -13,7 +14,7 @@ import com.fr.design.present.dict.DictionaryPane;
  * @author zhou
  * @since 2012-5-31上午10:54:20
  */
-public class DictPresentPane extends FurtherBasicBeanPane<DictPresent> {
+public class DictPresentPane extends FurtherBasicBeanPane<DictPresent> implements Prepare4DataSourceChange {
 	private DictionaryPane dictionaryPane;
 
 	public DictPresentPane() {
@@ -50,4 +51,8 @@ public class DictPresentPane extends FurtherBasicBeanPane<DictPresent> {
 		dictionaryPane.reset();
 	}
 
+	@Override
+	public void registerDSChangeListener() {
+		dictionaryPane.registerDSChangeListener();
+	}
 }

designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java

@@ -5,6 +5,7 @@ import com.fr.data.impl.DynamicSQLDict;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.data.tabledata.Prepare4DataSourceChange;
 import com.fr.design.gui.frpane.UIComboBoxPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
@@ -20,7 +21,7 @@ import java.util.List;
  * @author zhou
  * @since 2012-5-31下午12:20:41
  */
-public class DictionaryPane extends UIComboBoxPane<Dictionary> implements DataCreatorUI {
+public class DictionaryPane extends UIComboBoxPane<Dictionary> implements DataCreatorUI, Prepare4DataSourceChange {
     private TableDataDictPane tableDataDictPane;
 
     @Override
@@ -77,4 +78,9 @@ public class DictionaryPane extends UIComboBoxPane<Dictionary> implements DataCr
         paneList.add(new FormulaDictPane());
         return paneList;
     }
+
+    @Override
+    public void registerDSChangeListener() {
+        tableDataDictPane.registerDSChangeListener();
+    }
 }

designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java

@@ -16,6 +16,7 @@ import com.fr.design.data.datapane.TableDataComboBox;
 import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.data.datapane.preview.PreviewLabel;
 import com.fr.design.data.datapane.preview.PreviewLabel.Previewable;
+import com.fr.design.data.tabledata.Prepare4DataSourceChange;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
 import com.fr.design.editor.DoubleDeckValueEditorPane;
@@ -48,7 +49,7 @@ import java.util.List;
  * @editor zhou
  * @since 2012-3-29下午1:49:24
  */
-public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary> implements Previewable, UIObserver {
+public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary> implements Previewable, UIObserver, Prepare4DataSourceChange {
     private static final int BEGIN = 1;
     private static final int END = 10;
     private static final int VGAP = 24;
@@ -368,4 +369,9 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
     public boolean shouldResponseChangeListener() {
         return true;
     }
+
+    @Override
+    public void registerDSChangeListener() {
+        tableDataNameComboBox.registerGlobalDSChangeListener();
+    }
 }

designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -133,6 +133,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
 
     @Deprecated
     public void reLayout(Chart currentChart) {
+        //do nothing
     }
 
     /**

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java

@@ -1,6 +1,7 @@
 package com.fr.van.chart.designer.style.label;
 
 import com.fr.chart.chartattr.Plot;
+import com.fr.chartx.TwoTuple;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
@@ -11,6 +12,7 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.style.color.ColorSelectBox;
 
+import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.attr.plot.VanChartLabelPositionPlot;
 import com.fr.plugin.chart.base.AttrLabelDetail;
 import com.fr.plugin.chart.base.AttrTooltipContent;
@@ -47,11 +49,16 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
     protected ColorSelectBox backgroundColor;
 
     private JPanel tractionLinePane;
+    private JPanel positionPane;
+    private Integer[] oldPositionValues;
 
     protected VanChartStylePane parent;
+    private Plot plot;
 
     public VanChartPlotLabelDetailPane(Plot plot, VanChartStylePane parent) {
         this.parent = parent;
+        this.plot = plot;
+
         this.setLayout(new BorderLayout());
         initToolTipContentPane(plot);
         JPanel contentPane = createLabelPane(plot);
@@ -105,42 +112,83 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
     }
 
-    protected JPanel createLabelPositionPane(double[] row, double[] col, Plot plot) {
-        if(plot instanceof VanChartLabelPositionPlot){
+    private TwoTuple<String[], Integer[]> getPositionNamesAndValues() {
+        if (plot instanceof VanChartLabelPositionPlot) {
+
             String[] names = ((VanChartLabelPositionPlot) plot).getLabelLocationNameArray();
-            Integer[] values =  ((VanChartLabelPositionPlot) plot).getLabelLocationValueArray();
+            Integer[] values = ((VanChartLabelPositionPlot) plot).getLabelLocationValueArray();
 
-            if(names == null || names.length == 0){
-                return new JPanel();
+            if (names == null || names.length == 0) {
+                return null;
             }
-            if(values == null || values.length == 0){
-                return new JPanel();
+            if (values == null || values.length == 0) {
+                return null;
             }
 
-            position = new UIButtonGroup<Integer>(names, values);
-            autoAdjust = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false});
+            return new TwoTuple<>(names, values);
+        }
+        return null;
+    }
 
+    private JPanel createLabelPositionPane(double[] row, double[] col, Plot plot) {
 
-            Component[][] comps = new Component[2][2];
+        if (getPositionNamesAndValues() == null) {
+            return new JPanel();
+        }
 
-            comps[0] = new Component[]{null,null};
-            comps[1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), SwingConstants.LEFT), position};
+        autoAdjust = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false});
 
-            JPanel panel =new JPanel(new BorderLayout());
-            panel.add(getLabelPositionPane(comps,row,col),BorderLayout.CENTER);
-            if(plot.isSupportLeadLine()){
-                tractionLine = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show_Guideline"));
-                tractionLinePane = TableLayout4VanChartHelper.createGapTableLayoutPane("",tractionLine);
-                panel.add(tractionLinePane, BorderLayout.SOUTH);
-                initPositionListener();
-            } else if(PlotFactory.plotAutoAdjustLabelPosition(plot)){
-                panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto_Adjust"),autoAdjust), BorderLayout.SOUTH);
-            }
-            return panel;
+        JPanel panel = new JPanel(new BorderLayout());
+
+        positionPane = new JPanel();
+        checkPositionPane();
+        panel.add(positionPane, BorderLayout.CENTER);
+
+
+        if (plot.isSupportLeadLine()) {
+            tractionLine = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show_Guideline"));
+            tractionLinePane = TableLayout4VanChartHelper.createGapTableLayoutPane("", tractionLine);
+            panel.add(tractionLinePane, BorderLayout.SOUTH);
+            initPositionListener();
+        } else if (PlotFactory.plotAutoAdjustLabelPosition(plot)) {
+            panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto_Adjust"), autoAdjust), BorderLayout.SOUTH);
         }
-        return new JPanel();
+        return panel;
     }
 
+    private void checkPositionPane() {
+        if (positionPane == null) {
+            return;
+        }
+        TwoTuple<String[], Integer[]> result = getPositionNamesAndValues();
+        if (result == null) {
+            return;
+        }
+
+        Integer[] values = result.getSecond();
+        if (ComparatorUtils.equals(values, oldPositionValues)) {
+            return;
+        }
+        oldPositionValues = values;
+
+        position = new UIButtonGroup<Integer>(result.getFirst(), values);
+
+        Component[][] comps = new Component[2][2];
+
+        comps[0] = new Component[]{null, null};
+        comps[1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), SwingConstants.LEFT), position};
+
+        double[] row = new double[]{TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.PREFERRED};
+        double[] col = new double[]{TableLayout.FILL, TableLayout4VanChartHelper.EDIT_AREA_WIDTH};
+
+        positionPane.removeAll();
+        positionPane.setLayout(new BorderLayout());
+        positionPane.add(getLabelPositionPane(comps, row, col), BorderLayout.CENTER);
+
+        parent.initListener(positionPane);
+    }
+
+
     protected JPanel getLabelPositionPane (Component[][] comps, double[] row, double[] col){
         JPanel panel = TableLayoutHelper.createTableLayoutPane(comps,row,col);
         return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout"), panel);
@@ -228,6 +276,8 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
     }
 
     public void populate(AttrLabelDetail detail) {
+        checkPositionPane();
+
         dataLabelContentPane.populateBean(detail.getContent());
         if(position != null){
             position.setSelectedItem(detail.getPosition());

designer-realize/src/main/java/com/fr/design/condition/WHPane.java

@@ -33,17 +33,6 @@ public abstract class WHPane extends ConditionAttrSingleConditionPane<HighlightA
         GUICoreUtils.setColumnForSpinner(spinner, 5);
         this.spinner.setValue(new Integer(0));
         this.locString = locString;
-        final JFormattedTextField textField = ((JSpinner.NumberEditor) this.spinner.getEditor()).getTextField();
-        textField.addFocusListener(new FocusAdapter() {
-            @Override
-            public void focusLost(FocusEvent e) {
-                try {
-                    textField.commitEdit();
-                } catch (ParseException ignore) {
-
-                }
-            }
-        });
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/present/PresentPane.java

@@ -75,6 +75,7 @@ public class PresentPane extends UIComboBoxPane<Present> {
 		displays.add(none.title4PopupWindow());
 
 		dictPresentPane = new DictPresentPane();
+		dictPresentPane.registerDSChangeListener();
 		paneList.add(dictPresentPane);
 		keys.add(DictPresent.class.getName());
 		displays.add(dictPresentPane.title4PopupWindow());