From f3f4992777972acdc376d767d010d0b3e65fe2ee Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Fri, 15 Jun 2018 09:37:02 +0800 Subject: [PATCH 1/4] add ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f69258f5b..417bed08c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,6 @@ .DS_Store .classpath .project +target/ From 763492f73055a4231626f6d569f9e14d591f31f5 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Fri, 15 Jun 2018 15:09:51 +0800 Subject: [PATCH 2/4] issueREPORT-63799 --- .../fr/design/hyperlink/WebHyperNorthPane.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java b/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java index 910701df4..0d93157b9 100644 --- a/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java +++ b/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java @@ -2,6 +2,7 @@ package com.fr.design.hyperlink; import com.fr.config.ServerPreferenceConfig; import com.fr.design.constants.LayoutConstants; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; @@ -11,6 +12,7 @@ import com.fr.stable.ProductConstants; import com.fr.stable.StringUtils; import javax.swing.*; +import javax.swing.border.Border; import java.awt.*; /** @@ -22,6 +24,7 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane { private UITextField itemNameTextField; private boolean needRenamePane = false; private UITextField urlTextField; + private UILabel uiLabel; public WebHyperNorthPane(boolean needRenamePane) { this.needRenamePane = needRenamePane; @@ -45,23 +48,27 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane { protected JPanel setHeaderPanel() { JPanel headerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); - JPanel urlPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); - urlTextField = new UITextField(24); + JPanel urlPane = new JPanel(); + uiLabel = new UILabel("URL:"); + urlPane.add(uiLabel); + urlTextField = new UITextField(43); urlPane.add(urlTextField); urlTextField.setText(ProductConstants.WEBSITE_URL); + //UILabel label = new UILabel(Inter.getLocText(new String[]{"Example","Or"}, new String[]{":http://www.baidu.com","/main.jsp"})); JPanel urlWithHelp = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); urlWithHelp.add(GUICoreUtils.createNamedPane(urlPane, "URL:")); + //urlWithHelp.add(label); if (this.needRenamePane) { headerPane.setLayout(new BorderLayout(LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_SMALL)); itemNameTextField = new UITextField(); headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("FR-Designer_Name") + ":"), BorderLayout.NORTH); - headerPane.add(urlWithHelp, BorderLayout.CENTER); + headerPane.add(urlPane, BorderLayout.WEST); } else { - headerPane.add(urlWithHelp, BorderLayout.NORTH); + headerPane.add(urlPane, BorderLayout.WEST); } return headerPane; From 1d27bb796577d9ee1f22566ca1773c95568daca6 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Fri, 15 Jun 2018 15:21:08 +0800 Subject: [PATCH 3/4] issueREPORT-63799 --- .../com/fr/design/hyperlink/WebHyperNorthPane.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java b/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java index 0d93157b9..8bc2894bb 100644 --- a/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java +++ b/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java @@ -24,7 +24,6 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane { private UITextField itemNameTextField; private boolean needRenamePane = false; private UITextField urlTextField; - private UILabel uiLabel; public WebHyperNorthPane(boolean needRenamePane) { this.needRenamePane = needRenamePane; @@ -49,26 +48,22 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane { JPanel headerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); JPanel urlPane = new JPanel(); - uiLabel = new UILabel("URL:"); - urlPane.add(uiLabel); + urlTextField = new UITextField(43); urlPane.add(urlTextField); urlTextField.setText(ProductConstants.WEBSITE_URL); //UILabel label = new UILabel(Inter.getLocText(new String[]{"Example","Or"}, new String[]{":http://www.baidu.com","/main.jsp"})); - JPanel urlWithHelp = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); - urlWithHelp.add(GUICoreUtils.createNamedPane(urlPane, "URL:")); - - //urlWithHelp.add(label); + JPanel urlWithHelp = GUICoreUtils.createNamedPane(urlPane, "URL:"); if (this.needRenamePane) { headerPane.setLayout(new BorderLayout(LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_SMALL)); itemNameTextField = new UITextField(); headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("FR-Designer_Name") + ":"), BorderLayout.NORTH); - headerPane.add(urlPane, BorderLayout.WEST); + headerPane.add(urlWithHelp, BorderLayout.WEST); } else { - headerPane.add(urlPane, BorderLayout.WEST); + headerPane.add(urlWithHelp, BorderLayout.WEST); } return headerPane; From 559fa1b867523f1984f46d12fedb13a6e081db12 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Fri, 15 Jun 2018 15:46:40 +0800 Subject: [PATCH 4/4] issueREPORT-63799 --- .../fr/design/hyperlink/WebHyperNorthPane.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java b/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java index 8bc2894bb..a7a0a8077 100644 --- a/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java +++ b/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java @@ -2,7 +2,7 @@ package com.fr.design.hyperlink; import com.fr.config.ServerPreferenceConfig; import com.fr.design.constants.LayoutConstants; -import com.fr.design.gui.ilable.UILabel; + import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; @@ -11,9 +11,9 @@ import com.fr.js.WebHyperlink; import com.fr.stable.ProductConstants; import com.fr.stable.StringUtils; -import javax.swing.*; -import javax.swing.border.Border; -import java.awt.*; +import javax.swing.JPanel; +import java.awt.BorderLayout; + /** * chart 网页链接 定义属性 target url 特征的 界面 @@ -47,23 +47,20 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane { protected JPanel setHeaderPanel() { JPanel headerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); - JPanel urlPane = new JPanel(); - urlTextField = new UITextField(43); - urlPane.add(urlTextField); urlTextField.setText(ProductConstants.WEBSITE_URL); //UILabel label = new UILabel(Inter.getLocText(new String[]{"Example","Or"}, new String[]{":http://www.baidu.com","/main.jsp"})); - JPanel urlWithHelp = GUICoreUtils.createNamedPane(urlPane, "URL:"); + JPanel urlWithHelp = GUICoreUtils.createNamedPane(urlTextField, "URL:"); if (this.needRenamePane) { headerPane.setLayout(new BorderLayout(LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_SMALL)); itemNameTextField = new UITextField(); headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("FR-Designer_Name") + ":"), BorderLayout.NORTH); - headerPane.add(urlWithHelp, BorderLayout.WEST); + headerPane.add(urlWithHelp, BorderLayout.CENTER); } else { - headerPane.add(urlWithHelp, BorderLayout.WEST); + headerPane.add(urlWithHelp, BorderLayout.NORTH); } return headerPane;