Pull request #2409: REPORT-38376 & REPORT-39308 设计器目录树等树控件JDK11下显示不全

Merge in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0

* commit '9af539cbbd2bd7b73258fe12489325991b09079a':
  REPORT-39308 参数输入面板参数名显示不完整
  REPORT-38376 设计器目录树等树控件JDK11下显示不全

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

@@ -1,21 +1,22 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.BaseUtils;
-import com.fr.general.NameObject;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.gui.itree.refreshabletree.UserObjectRefreshJTree;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.NameObject;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
 
 /**
  * TableData Tree
@@ -31,6 +32,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
         this.setCellRenderer(tableDataTreeCellRenderer);
         this.setEditable(false);
     }
+
     // CellRenderer
     private DefaultTreeCellRenderer tableDataTreeCellRenderer = new DefaultTreeCellRenderer() {
         private static final long serialVersionUID = 1L;
@@ -66,14 +68,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
                 this.setIcon(null);
                 this.setText(PENDING.toString());
             }
-            // 这里新建一个Label作为render是因为JTree在动态刷新的时候，节点上render画布的的宽度不会变，会使得一部分比较长的数据显示为"..."
+            this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
-            UILabel label = new UILabel();
-            label.setText(getText());
-            label.setIcon(getIcon());
-            Dimension dim = label.getPreferredSize();
-            dim.height += 2;
-            this.setSize(dim);
-            this.setPreferredSize(dim);
             this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND);
             this.setTextSelectionColor(Color.WHITE);
             this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);

designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java

@@ -2,7 +2,6 @@ package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.FRContext;
 import com.fr.design.constants.UIConstants;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.gui.itree.refreshabletree.RefreshableJTree;
 import com.fr.design.i18n.Toolkit;
@@ -14,13 +13,13 @@ import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.workspace.WorkContext;
 
+import javax.swing.BorderFactory;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -79,14 +78,7 @@ public class EnvFileTree extends RefreshableJTree {
                     this.setIcon(null);
                     this.setText(PENDING.toString());
                 }
-                // 这里新建一个Label作为render是因为JTree在动态刷新的时候，节点上render画布的的宽度不会变，会使得一部分比较长的数据显示为"..."
+                this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
-                UILabel label = new UILabel();
-                label.setText(getText());
-                label.setIcon(getIcon());
-                this.setSize(label.getPreferredSize());
-                Dimension dim = label.getPreferredSize();
-                dim.height += 2;
-                this.setPreferredSize(dim);
                 this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND);
                 this.setTextSelectionColor(Color.WHITE);
                 this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);

designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java

@@ -20,14 +20,18 @@ import com.fr.design.editor.editor.TextEditor;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
@@ -37,6 +41,7 @@ import java.util.Map.Entry;
 
 /**
  * The dialog used to input parameter.
+ *
  * @editor zhou
  * @since 2012-3-26上午11:09:45
  */
@@ -51,6 +56,8 @@ public class ParameterInputPane extends BasicPane {
 
     private boolean allowBlank = true;
 
+    private FlowTableLayoutHelper flowTableLayoutHelper;
+
     /**
      * Constructor.
      */
@@ -71,7 +78,7 @@ public class ParameterInputPane extends BasicPane {
         this.add(new JScrollPane(contentPane), BorderLayout.CENTER);
         contentPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters") + ":"));
 
-        FlowTableLayoutHelper flowTableLayoutHelper = new FlowTableLayoutHelper();
+        flowTableLayoutHelper = new FlowTableLayoutHelper();
 
         editorNameMap = new java.util.HashMap<ValueEditorPane, String>();
 
@@ -112,7 +119,12 @@ public class ParameterInputPane extends BasicPane {
                 nameAddedList.add(parameter.getName());
             }
         }
+    }
 
+    @Override
+    public void addNotify() {
+        super.addNotify();
+        // windows 高DPI下，使用getPreferredSize必须在添加到容器之后，否则得到的数值不准确，因此先放到这调整大小
         flowTableLayoutHelper.adjustLabelWidth();
     }
 

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/MapDataTree.java

@@ -1,13 +1,13 @@
 package com.fr.van.chart.drillmap.designer.data.comp;
 
 import com.fr.design.constants.UIConstants;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.map.designer.type.GEOJSONTreeHelper;
 import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
 import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
 import com.fr.stable.StringUtils;
 
+import javax.swing.BorderFactory;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
@@ -15,7 +15,6 @@ import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.util.Enumeration;
 
 /**
@@ -49,7 +48,7 @@ public class MapDataTree extends JTree {
         if (children.hasMoreElements()) {
             DefaultMutableTreeNode child = (DefaultMutableTreeNode) children.nextElement();
 
-            if(GEOJSONTreeHelper.getInstance().isSelectableTreeNode(child)){
+            if (GEOJSONTreeHelper.isSelectableTreeNode(child)) {
                 selectTreeNode(child, m_model);
             } else {
                 setFirstChildTreeNode(child, m_model);
@@ -115,14 +114,7 @@ public class MapDataTree extends JTree {
             DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) value;
             String name = getPresentName(treeNode);
             this.setText(name);
-
+            this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
-            UILabel label = new UILabel();
-            label.setText(getText());
-            label.setIcon(getIcon());
-            this.setSize(label.getPreferredSize());
-            Dimension dim = label.getPreferredSize();
-            dim.height += 2;
-            this.setPreferredSize(dim);
             this.setBackgroundNonSelectionColor(UIConstants.NORMAL_BACKGROUND);
             this.setForeground(UIConstants.FONT_COLOR);
             this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);

designer-form/src/main/java/com/fr/design/designer/treeview/ComponentTreeCellRenderer.java

@@ -3,14 +3,13 @@ package com.fr.design.designer.treeview;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XCreatorUtils;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.log.FineLoggerFactory;
 
+import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import java.awt.Component;
-import java.awt.Dimension;
 
 public class ComponentTreeCellRenderer extends DefaultTreeCellRenderer {
 
@@ -34,13 +33,7 @@ public class ComponentTreeCellRenderer extends DefaultTreeCellRenderer {
                 setIcon(icon);
             }
         }
-		UILabel label = new UILabel();
+        this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
-		label.setText(getText());
-		label.setIcon(getIcon());
-		Dimension dim = label.getPreferredSize();
-		dim.height += 2;
-		this.setSize(dim);
-		this.setPreferredSize(dim);
         this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND);
         return this;
     }