Merging in latest from upstream (ST/design:refs/heads/release/9.0)

* commit 'c96af36e803c219e00ec886a5d6c90c81b82b3d0':
  REPORT-6949 条件属性的超级链接重命名后会自动生成超级链接
  REPORT-6868 设计器单元格双击弹出数据集参数问题

designer/src/com/fr/design/dscolumn/DSColumnPane.java

@@ -1,26 +1,30 @@
 package com.fr.design.dscolumn;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
 import com.fr.base.FRContext;
 import com.fr.data.TableDataSource;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.dialog.BasicPane;
-import com.fr.general.Inter;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.general.Inter;
 import com.fr.report.cell.CellElement;
 import com.fr.report.cell.DefaultTemplateCellElement;
 import com.fr.report.cell.TemplateCellElement;
 
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+/**
+ * @author null
+ * @version 2018年2月9日13点47分
+ * @since 8.0
+ */
 public class DSColumnPane extends BasicPane {
 
     private TableDataSource tplEC;
@@ -29,17 +33,56 @@ public class DSColumnPane extends BasicPane {
     private DSColumnConditionsPane conditionPane = null;
     private DSColumnAdvancedPane advancedPane = null;
     private TemplateCellElement cellElement;
-    protected Component lastSelectedComponent;
+    private Component lastSelectedComponent;
 
     public static final int SETTING_ALL = 2;
     public static final int SETTING_DSRELATED = 1;
 
+
+    private ChangeListener appliedWizardTabChangeListener = new ChangeListener() {
+
+        @Override
+        public void stateChanged(ChangeEvent evt) {
+            try {
+                if (lastSelectedComponent == null) {
+                    lastSelectedComponent = basicPane;
+                }
+                // selectTabComponent是正要切换到的那个Pane
+                Component selectTabComponent = tabbedPane.getSelectedComponent();
+                // denny: 如果切换Tab时上一个Pane是basicPane, 则刷新一下其他Pane，
+                // 因为选择的数据列可能改变, 导致后面过滤和使用公式用到的数据项改变
+                if (lastSelectedComponent == basicPane) {
+                    basicPane.update(cellElement);
+
+                    // denny_GUI: 刷新其他面板
+                    refreshOtherTabs();
+                }
+                // 切换标签的时候就，确认是否有没有添加到列表中的条件
+                lastSelectedComponent = selectTabComponent;
+            } catch (Exception e) {
+                FRContext.getLogger().error(e.getMessage(), e);
+            }
+
+        }
+    };
+    /**
+     * cellElement 改变时，刷新一下
+     * 比如：上边切换Tab时，basicPane Update了一下，可能会改变Field cellElement的值
+     */
+    private PropertyChangeListener myPropertyChangeListener = new PropertyChangeListener() {
+
+        @Override
+        public void propertyChange(PropertyChangeEvent evt) {
+            refreshOtherTabs();
+        }
+    };
+
     public DSColumnPane() {
-    	this.initComponents(SETTING_ALL);
+        this(SETTING_ALL);
     }
 
-    public DSColumnPane(int setting) {
+    private DSColumnPane(int setting) {
-    	this.initComponents(setting);
+        this.initComponents(setting);
     }
 
     protected void initComponents(int setting) {
@@ -68,14 +111,18 @@ public class DSColumnPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-    	return Inter.getLocText("ExpandD-Data_Column");
+        return Inter.getLocText("ExpandD-Data_Column");
     }
 
-    /*
+    /**
-     * populate
+     * 更新面板信息
+     *
+     * @param tds         数据源
+     * @param cellElement 单元格
+     * @throws Exception e
      */
     public void populate(TableDataSource tds, TemplateCellElement cellElement) throws Exception {
-    	this.tplEC = tds;
+        this.tplEC = tds;
 
         if (tds == null || cellElement == null) {
             // _denny: 我不认为这种情况应该出现，以防万一
@@ -85,15 +132,16 @@ public class DSColumnPane extends BasicPane {
         // _denny: 这边需要克隆一下，因为在设置时，可能改变字段cellElement，但改变真实值是不被期望的
         try {
             this.cellElement = (TemplateCellElement) cellElement.clone();
-        } catch (CloneNotSupportedException ce) {
+        } catch (CloneNotSupportedException ignored) {
         }
+        // 只更新基本设置的面板信息即可，因为从基本信息切换到其他设置的时候也还是会更新其他面板的
         this.basicPane.populate(tds, this.cellElement);
-        this.conditionPane.populate(tds, this.cellElement);
-        this.advancedPane.populate(this.cellElement);
     }
 
-    /*
+    /**
-     * update
+     * update 保存
+     *
+     * @return 单元格信息
      */
     public CellElement update() {
         this.basicPane.update(cellElement);
@@ -101,54 +149,24 @@ public class DSColumnPane extends BasicPane {
         this.advancedPane.update(cellElement);
         return cellElement;
     }
-    public ChangeListener appliedWizardTabChangeListener = new ChangeListener() {
 
-        public void stateChanged(ChangeEvent evt) {
+    /**
-            try {
+     * denny:当数据tab中的数据发生变化的时候刷新后面的tab
-                if (lastSelectedComponent == null) {
+     */
-                    lastSelectedComponent = basicPane;
+    private void refreshOtherTabs() {
-                }
+        // deny:当JTabPane中加入一个Pane时，后面的Pane可能还没有初始化
-                //selectTabComponent是正要切换到的那个Pane
-                Component selectTabComponent = tabbedPane.getSelectedComponent();
-                // _denny: 如果切换Tab时上一个Pane是basicPane, 则刷新一下其他Pane，
-                // 因为选择的数据列可能改变, 导致后面过滤和使用公式用到的数据项改变
-                if (lastSelectedComponent == basicPane) {
-                    basicPane.update(cellElement);
-
-                    // denny_GUI: 刷新其他面板
-                    refrushOtherTabs();
-                }
-                // 切换标签的时候就，确认是否有没有添加到列表中的条件
-                lastSelectedComponent = selectTabComponent;
-            } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
-            }
-
-        }
-    };
-    // cellElement 改变时，刷新一下
-    // 比如：上边切换Tab时，basicPane Update了一下，可能会改变Field cellElement的值
-    PropertyChangeListener myPropertyChangeListener = new PropertyChangeListener() {
-
-        public void propertyChange(PropertyChangeEvent evt) {
-            refrushOtherTabs();
-        }
-    };
-
-    //_denny:当数据tab中的数据发生变化的时候刷新后面的tab
-    public void refrushOtherTabs() {
-        // ——deny:当JTabPane中加入一个Pane时，后面的Pane可能还没有初始化
         if (conditionPane == null || advancedPane == null) {
             return;
         }
         this.conditionPane.populate(tplEC, cellElement);
         this.advancedPane.populate(cellElement);
     }
-    public void putElementcase(ElementCasePane t){
+
-    	basicPane.putElementcase(t);
+    public void putElementcase(ElementCasePane t) {
+        basicPane.putElementcase(t);
     }
 
-	public void putCellElement(TemplateCellElement tplCE) {
+    public void putCellElement(TemplateCellElement tplCE) {
-		basicPane.putCellElement(tplCE);
+        basicPane.putCellElement(tplCE);
-	}
+    }
 }

designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java

@@ -1,38 +1,42 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
-import com.fr.design.actions.edit.HyperlinkAction;
-import com.fr.design.fun.MenuHandler;
-import com.fr.design.gui.frpane.HyperlinkGroupPane;
-import com.fr.design.menu.KeySetUtils;
-import com.fr.design.present.ConditionAttributesGroupPane;
-import com.fr.general.Inter;
-import com.fr.grid.selection.FloatSelection;
-import com.fr.grid.selection.Selection;
-import com.fr.page.ReportSettingsProvider;
-import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.DesignState;
 import com.fr.design.actions.UpdateAction;
-import com.fr.design.actions.cell.*;
+import com.fr.design.actions.cell.CellAttributeAction;
+import com.fr.design.actions.cell.CellExpandAttrAction;
+import com.fr.design.actions.cell.CellWidgetAttrAction;
+import com.fr.design.actions.cell.ConditionAttributesAction;
+import com.fr.design.actions.cell.GlobalStyleMenuDef;
 import com.fr.design.actions.columnrow.InsertColumnAction;
 import com.fr.design.actions.columnrow.InsertRowAction;
 import com.fr.design.actions.core.ActionFactory;
+import com.fr.design.actions.edit.HyperlinkAction;
 import com.fr.design.actions.edit.merge.MergeCellAction;
 import com.fr.design.actions.edit.merge.UnmergeCellAction;
 import com.fr.design.actions.utils.DeprecatedActionManager;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
+import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.fun.MenuHandler;
+import com.fr.design.gui.frpane.HyperlinkGroupPane;
 import com.fr.design.mainframe.cell.QuickEditorRegion;
+import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
-import com.fr.report.worksheet.WorkSheet;
+import com.fr.design.present.ConditionAttributesGroupPane;
 import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
 import com.fr.design.selection.SelectionEvent;
 import com.fr.design.selection.SelectionListener;
+import com.fr.general.Inter;
+import com.fr.grid.selection.FloatSelection;
+import com.fr.grid.selection.Selection;
+import com.fr.page.ReportSettingsProvider;
+import com.fr.report.worksheet.WorkSheet;
 import com.fr.stable.ArrayUtils;
 
-import javax.swing.*;
+import javax.swing.JPanel;
-import java.awt.*;
+import java.awt.BorderLayout;
 
 /**
  * 类说明: 设计面板中最上方的"插入" "单元格"下拉列表Menu模块.
@@ -79,11 +83,11 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
         CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
         QuickEditorRegion.getInstance().populate(getCurrentEditor());
         JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        // 模板初始化完成后，才能初始化超级链接面板
         if (editingTemplate != null && !editingTemplate.isUpMode()) {
             Selection editingSelection = getSelection();
-            // 模板初始化完成后，才能初始化超级链接面板
+            // 获取超级链接面板并刷新显示
             HyperlinkGroupPane hyperlinkGroupPane = editingTemplate.getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
-            hyperlinkGroupPane.populate(ElementCasePaneDelegate.this);
             if (editingSelection instanceof FloatSelection) {
                 EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_FLOAT);
                 JPanel floatPane = new JPanel(new BorderLayout());

designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPaneNoPop.java

@@ -5,7 +5,7 @@ import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
 /**
  * Created by plough on 2017/9/4.
  */
-public class ReportHyperlinkGroupPaneNoPop extends ReportHyperlinkGroupPane{
+public class ReportHyperlinkGroupPaneNoPop extends ReportHyperlinkGroupPane {
     private static ReportHyperlinkGroupPaneNoPop singleton;
 
     private ReportHyperlinkGroupPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
@@ -24,4 +24,9 @@ public class ReportHyperlinkGroupPaneNoPop extends ReportHyperlinkGroupPane{
     protected boolean isNewStyle() {
         return false;
     }
+
+    @Override
+    public boolean needAutoSave() {
+        return false;
+    }
 }

designer_base/src/com/fr/design/gui/frpane/HyperlinkGroupPane.java

@@ -44,15 +44,12 @@ public abstract class HyperlinkGroupPane extends UIListControlPane {
 
             @Override
             public void on(PluginEvent event) {
-
+                refreshNameableCreator(createNameableCreators());
-               refreshNameableCreator(createNameableCreators());
-
             }
         }, new PluginFilter() {
 
             @Override
             public boolean accept(PluginContext context) {
-
                 return context.contain(HyperlinkProvider.XML_TAG);
             }
         });
@@ -63,6 +60,7 @@ public abstract class HyperlinkGroupPane extends UIListControlPane {
      *
      * @return 返回Nameable按钮数组.
      */
+    @Override
     public NameableCreator[] createNameableCreators() {
         Map<String, NameableCreator> nameCreators = new ListMap<>();
         NameableCreator[] creators = DesignModuleFactory.getHyperlinkGroupType().getHyperlinkCreators();
@@ -82,6 +80,7 @@ public abstract class HyperlinkGroupPane extends UIListControlPane {
      *
      * @return 返回标题字符串.
      */
+    @Override
     public String title4PopupWindow() {
         return Inter.getLocText("FR-Designer_Hyperlink");
     }
@@ -91,11 +90,11 @@ public abstract class HyperlinkGroupPane extends UIListControlPane {
         return Inter.getLocText("FR-Designer_Add_Hyperlink");
     }
 
-    public void populate(NameJavaScriptGroup nameHyperlink_array) {
+    public void populate(NameJavaScriptGroup hyperlinkArray) {
-        java.util.List<NameObject> list = new ArrayList<NameObject>();
+        java.util.List<NameObject> list = new ArrayList<>();
-        if (nameHyperlink_array != null) {
+        if (hyperlinkArray != null) {
-            for (int i = 0; i < nameHyperlink_array.size(); i++) {
+            for (int i = 0; i < hyperlinkArray.size(); i++) {
-                list.add(new NameObject(nameHyperlink_array.getNameHyperlink(i).getName(), nameHyperlink_array.getNameHyperlink(i).getJavaScript()));
+                list.add(new NameObject(hyperlinkArray.getNameHyperlink(i).getName(), hyperlinkArray.getNameHyperlink(i).getJavaScript()));
             }
         }
 
@@ -113,20 +112,29 @@ public abstract class HyperlinkGroupPane extends UIListControlPane {
      */
     public NameJavaScriptGroup updateJSGroup() {
         Nameable[] res = this.update();
-        NameJavaScript[] res_array = new NameJavaScript[res.length];
+        NameJavaScript[] resArray = new NameJavaScript[res.length];
         for (int i = 0; i < res.length; i++) {
             NameObject no = (NameObject) res[i];
-            res_array[i] = new NameJavaScript(no.getName(), (JavaScript) no.getObject());
+            resArray[i] = new NameJavaScript(no.getName(), (JavaScript) no.getObject());
         }
 
-        return new NameJavaScriptGroup(res_array);
+        return new NameJavaScriptGroup(resArray);
     }
 
     @Override
     public void saveSettings() {
-        if (isPopulating) {
+        if (isPopulating || !needAutoSave()) {
             return;
         }
         hyperlinkGroupPaneActionProvider.saveSettings(this);
     }
+
+    /**
+     * 是否需要自动保存到超级链接属性中
+     *
+     * @return 是否需要自动保存
+     */
+    public boolean needAutoSave() {
+        return true;
+    }
 }

designer_base/src/com/fr/design/gui/frpane/HyperlinkGroupPaneActionProvider.java

@@ -3,9 +3,23 @@ package com.fr.design.gui.frpane;
 import com.fr.design.designer.TargetComponent;
 
 /**
+ * @author plough
  * Created by plough on 2017/7/26.
  */
 public interface HyperlinkGroupPaneActionProvider {
+
+    /**
+     * 刷新面板展示
+     *
+     * @param hyperlinkGroupPane 超链面板
+     * @param elementCasePane    模板
+     */
     void populate(HyperlinkGroupPane hyperlinkGroupPane, TargetComponent elementCasePane);
+
+    /**
+     * 保存到文件
+     *
+     * @param hyperlinkGroupPane 超联面板
+     */
     void saveSettings(HyperlinkGroupPane hyperlinkGroupPane);
 }

designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java

@@ -29,7 +29,8 @@ public class FormHyperlinkGroupPane extends HyperlinkGroupPane{
      *
      * @return 返回Nameable按钮数组.
      */
-	 public NameableCreator[] createNameableCreators() {
+	 @Override
+     public NameableCreator[] createNameableCreators() {
 		 NameableCreator[] creators = super.createNameableCreators();
 		 for (int i=0; i<creators.length; i++) {
 			 if (ComparatorUtils.equals(creators[i].menuName(), Inter.getLocText("FR-Designer_Email"))) {