From b70e83ab0d0fd41abc47f021eee8bac073af4e8b Mon Sep 17 00:00:00 2001 From: vito Date: Mon, 11 Sep 2017 10:50:06 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/start/StartServer.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java index 0d87dfb3e..27f89e1e4 100644 --- a/designer_base/src/com/fr/start/StartServer.java +++ b/designer_base/src/com/fr/start/StartServer.java @@ -14,10 +14,7 @@ import com.fr.env.SignIn; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; import com.fr.general.Inter; -import com.fr.stable.EnvChangedListener; -import com.fr.stable.ProductConstants; -import com.fr.stable.StableUtils; -import com.fr.stable.StringUtils; +import com.fr.stable.*; import com.fr.stable.project.ProjectConstants; import com.fr.start.server.JettyHost; From 4a8407499bd226b42e337d11b2a184ac7f27b242 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 11 Sep 2017 14:39:49 +0800 Subject: [PATCH 02/10] =?UTF-8?q?REPORT-4492=20alphafine=20=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E9=A2=84=E8=A7=88=E7=95=8C=E9=9D=A2=E6=9C=89=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E8=BE=B9=E6=A1=86=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preview/DocumentPreviewPane.java | 31 ++++--------- .../fr/design/gui/itextarea/UITextArea.java | 44 ++++++++++--------- 2 files changed, 32 insertions(+), 43 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java index ed96fbed9..0fbfe4a2d 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java @@ -3,7 +3,6 @@ package com.fr.design.mainframe.alphafine.preview; import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.mainframe.alphafine.AlphaFineConstants; -import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.*; import java.awt.*; @@ -15,31 +14,19 @@ public class DocumentPreviewPane extends JPanel { public DocumentPreviewPane(String title, String summary) { this.setLayout(new BorderLayout()); - this.setBackground(Color.WHITE); + this.setPreferredSize(new Dimension(AlphaFineConstants.RIGHT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT)); + this.setBackground(Color.white); UITextArea titleArea = new UITextArea(title); - UITextArea contentArea = new UITextArea(summary); - titleArea.setOpaque(false); - contentArea.setOpaque(false); - titleArea.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + titleArea.setBorder(null); + titleArea.setEditable(false); titleArea.setForeground(AlphaFineConstants.BLUE); - contentArea.setForeground(AlphaFineConstants.BLACK); - titleArea.setPreferredSize(new Dimension(360, 30)); titleArea.setFont(AlphaFineConstants.LARGE_FONT); - contentArea.setFont(AlphaFineConstants.MEDIUM_FONT); add(titleArea, BorderLayout.NORTH); + UITextArea contentArea = new UITextArea(summary); + contentArea.setEditable(false); + contentArea.setBorder(null); + contentArea.setForeground(AlphaFineConstants.BLACK); + contentArea.setFont(AlphaFineConstants.MEDIUM_FONT); add(contentArea, BorderLayout.CENTER); } - - - public static void main(String[] args) { - JFrame jf = new JFrame("test"); - jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - JPanel content = (JPanel) jf.getContentPane(); - content.setLayout(null); - - content.add(new DocumentPreviewPane("test", "ababababaabbababab")); - GUICoreUtils.centerWindow(jf); - jf.setSize(400, 400); - jf.setVisible(true); - } } diff --git a/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java b/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java index 94ecdc3d7..ede8be593 100644 --- a/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java +++ b/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java @@ -20,11 +20,6 @@ public class UITextArea extends JTextArea implements UIObserver { initComponents(); } - @Override - public Insets getInsets() { - return new Insets(5, 5, 5, 5); - } - public UITextArea() { super(); InputEventBaseOnOS.addBasicEditInputMap(this); @@ -37,6 +32,26 @@ public class UITextArea extends JTextArea implements UIObserver { initComponents(); } + /** + * @param args + */ + public static void main(String... args) { +// JFrame jf = new JFrame("test"); +// jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); +// JPanel content = (JPanel) jf.getContentPane(); +// content.setLayout(new BorderLayout()); +// UITextArea bb = new UITextArea("123455weoijweio reiwj kewl jfejkfljds kl jfldk jfk jdskfjkdsfklj dkl jfsdjf"); +// content.add(bb, BorderLayout.CENTER); +// GUICoreUtils.centerWindow(jf); +// jf.setSize(400, 400); +// jf.setVisible(true); + } + + @Override + public Insets getInsets() { + return new Insets(5, 5, 5, 5); + } + private void initComponents() { setLineWrap(true); setWrapStyleWord(true); @@ -100,7 +115,9 @@ public class UITextArea extends JTextArea implements UIObserver { @Override protected void paintBorder(Graphics g) { - getUI().paintBorder((Graphics2D) g, getWidth(), getHeight(), true, Constants.NULL); + if (getBorder() != null) { + getUI().paintBorder((Graphics2D) g, getWidth(), getHeight(), true, Constants.NULL); + } } @Override @@ -117,19 +134,4 @@ public class UITextArea extends JTextArea implements UIObserver { public boolean shouldResponseChangeListener() { return true; } - - /** - * @param args - */ - public static void main(String... args) { -// JFrame jf = new JFrame("test"); -// jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); -// JPanel content = (JPanel) jf.getContentPane(); -// content.setLayout(new BorderLayout()); -// UITextArea bb = new UITextArea("123455weoijweio reiwj kewl jfejkfljds kl jfldk jfk jdskfjkdsfklj dkl jfsdjf"); -// content.add(bb, BorderLayout.CENTER); -// GUICoreUtils.centerWindow(jf); -// jf.setSize(400, 400); -// jf.setVisible(true); - } } \ No newline at end of file From 04da144da2636371dabf7e591aa0a66bec58632b Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 11 Sep 2017 14:42:15 +0800 Subject: [PATCH 03/10] rt --- .../preview/DocumentPreviewPane.java | 2 +- .../fr/design/gui/itextarea/UITextArea.java | 40 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java index 0fbfe4a2d..6aa46f1a6 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java @@ -14,8 +14,8 @@ public class DocumentPreviewPane extends JPanel { public DocumentPreviewPane(String title, String summary) { this.setLayout(new BorderLayout()); + this.setBackground(Color.WHITE); this.setPreferredSize(new Dimension(AlphaFineConstants.RIGHT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT)); - this.setBackground(Color.white); UITextArea titleArea = new UITextArea(title); titleArea.setBorder(null); titleArea.setEditable(false); diff --git a/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java b/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java index ede8be593..9f6010f4a 100644 --- a/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java +++ b/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java @@ -20,6 +20,11 @@ public class UITextArea extends JTextArea implements UIObserver { initComponents(); } + @Override + public Insets getInsets() { + return new Insets(5, 5, 5, 5); + } + public UITextArea() { super(); InputEventBaseOnOS.addBasicEditInputMap(this); @@ -32,26 +37,6 @@ public class UITextArea extends JTextArea implements UIObserver { initComponents(); } - /** - * @param args - */ - public static void main(String... args) { -// JFrame jf = new JFrame("test"); -// jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); -// JPanel content = (JPanel) jf.getContentPane(); -// content.setLayout(new BorderLayout()); -// UITextArea bb = new UITextArea("123455weoijweio reiwj kewl jfejkfljds kl jfldk jfk jdskfjkdsfklj dkl jfsdjf"); -// content.add(bb, BorderLayout.CENTER); -// GUICoreUtils.centerWindow(jf); -// jf.setSize(400, 400); -// jf.setVisible(true); - } - - @Override - public Insets getInsets() { - return new Insets(5, 5, 5, 5); - } - private void initComponents() { setLineWrap(true); setWrapStyleWord(true); @@ -134,4 +119,19 @@ public class UITextArea extends JTextArea implements UIObserver { public boolean shouldResponseChangeListener() { return true; } + + /** + * @param args + */ + public static void main(String... args) { +// JFrame jf = new JFrame("test"); +// jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); +// JPanel content = (JPanel) jf.getContentPane(); +// content.setLayout(new BorderLayout()); +// UITextArea bb = new UITextArea("123455weoijweio reiwj kewl jfejkfljds kl jfldk jfk jdskfjkdsfklj dkl jfsdjf"); +// content.add(bb, BorderLayout.CENTER); +// GUICoreUtils.centerWindow(jf); +// jf.setSize(400, 400); +// jf.setVisible(true); + } } \ No newline at end of file From 3a1d7edc02ae5ea2c83ec850cb5e4cba2d92e852 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 11 Sep 2017 14:44:15 +0800 Subject: [PATCH 04/10] rt --- designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java b/designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java index 6e3f717dc..926a78708 100644 --- a/designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java +++ b/designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java @@ -32,7 +32,7 @@ public class UITextAreaUI extends BasicTextAreaUI { } public void paintBorder(Graphics2D g2d, int width, int height, boolean isRound, int rectDirection) { - if (isRollOver && textField.isEnabled()) { + if (isRollOver && textField.isEnabled() && ((UITextArea)textField).isEditable()) { g2d.setColor(UIConstants.TEXT_FILED_BORDER_SELECTED); g2d.drawRect(0, 0, width - 1, height - 1); } else { From c0488d7e014d052c640d3bde660e8734c15dff1f Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 11 Sep 2017 14:47:39 +0800 Subject: [PATCH 05/10] =?UTF-8?q?REPORT-4366=20=E8=A1=A8=E5=8D=95=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E5=B8=83=E5=B1=80=EF=BC=8Cbody=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98=EF=BC=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=8B=E5=91=BD=E5=90=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/designer/layout/FRFitLayoutDefinePane.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java index 7f45a1f98..4b8b89d83 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java @@ -44,7 +44,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { private UIComboBox adaptComboBox; private UISpinner componentIntervel; private PaddingBoundPane paddingBound; - private AccessibleWLayoutBorderStyleEditor background; + private AccessibleWLayoutBorderStyleEditor stylePane; public FRFitLayoutDefinePane(XCreator xCreator) { super(xCreator); @@ -65,9 +65,9 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { public JPanel createAdvancePane() { JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - background = new AccessibleWLayoutBorderStyleEditor(); + stylePane = new AccessibleWLayoutBorderStyleEditor(); paddingBound = new PaddingBoundPane(); - JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background")), background}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7); + JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), stylePane}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7); jp2.setBorder(BorderFactory.createEmptyBorder(10, 0, 5, 0)); jPanel.add(paddingBound, BorderLayout.CENTER); jPanel.add(jp2, BorderLayout.NORTH); @@ -119,7 +119,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { layoutComboBox.setSelectedIndex(ob.getBodyLayoutType().getTypeValue()); adaptComboBox.setSelectedIndex(ob.getCompState()); componentIntervel.setValue(ob.getCompInterval()); - background.setValue(ob.getBorderStyle()); + stylePane.setValue(ob.getBorderStyle()); } @@ -127,7 +127,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { public WFitLayout updateBean() { WFitLayout layout = (WFitLayout) creator.toData(); paddingBound.update(layout); - LayoutBorderStyle borderStyle = (LayoutBorderStyle) background.getValue(); + LayoutBorderStyle borderStyle = (LayoutBorderStyle) stylePane.getValue(); if(borderStyle != null){ layout.setBorderStyle(borderStyle); } From b86851405b41058ea432711be68016eb36a1c343 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 11 Sep 2017 14:55:24 +0800 Subject: [PATCH 06/10] RT --- .../design/mainframe/alphafine/component/AlphaFineDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index e35d0c056..b5daed04e 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -684,7 +684,7 @@ public class AlphaFineDialog extends UIDialog { } else { try { Thread.sleep(10); - doSearch(searchTextField.getText()); + doSearch(searchTextField.getText().toLowerCase()); } catch (InterruptedException e1) { FRLogger.getLogger().error(e1.getMessage()); } From bb11bc1bed0316495638dea5533c1b870a4b0ead Mon Sep 17 00:00:00 2001 From: vito Date: Mon, 11 Sep 2017 16:28:01 +0800 Subject: [PATCH 07/10] pmd --- designer_base/src/com/fr/start/StartServer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java index 27f89e1e4..56cc557aa 100644 --- a/designer_base/src/com/fr/start/StartServer.java +++ b/designer_base/src/com/fr/start/StartServer.java @@ -14,7 +14,11 @@ import com.fr.env.SignIn; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; import com.fr.general.Inter; -import com.fr.stable.*; +import com.fr.stable.EnvChangedListener; +import com.fr.stable.ProductConstants; +import com.fr.stable.StableUtils; +import com.fr.stable.StringUtils; +import com.fr.stable.OperatingSystem; import com.fr.stable.project.ProjectConstants; import com.fr.start.server.JettyHost; From 0a7464278805bee324ccecbe3a4b38cd0cbb2d1a Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 11 Sep 2017 17:23:17 +0800 Subject: [PATCH 08/10] =?UTF-8?q?REPORT-4494=20&&=20REPORT-4373=20?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=8C=89=E9=92=AE=E6=8E=A7=E4=BB=B6=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=92=8C=E9=87=8D=E6=96=B0=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/widget/WidgetPane.java | 4 +++- .../fr/design/widget/ui/ButtonDefinePane.java | 10 +++++++--- .../widget/component/CheckBoxDictPane.java | 4 +++- .../ui/designer/CheckBoxGroupDefinePane.java | 17 ++++++----------- .../ui/designer/ComboCheckBoxDefinePane.java | 14 ++++++-------- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/designer/src/com/fr/design/widget/WidgetPane.java b/designer/src/com/fr/design/widget/WidgetPane.java index 61e79acb8..36f99491f 100644 --- a/designer/src/com/fr/design/widget/WidgetPane.java +++ b/designer/src/com/fr/design/widget/WidgetPane.java @@ -92,7 +92,9 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener AttributeChangeListener listener = new AttributeChangeListener() { @Override public void attributeChange() { - CellWidgetPropertyPane.getInstance().update(); + if(shouldFireSelectedEvent){ + CellWidgetPropertyPane.getInstance().update(); + } } }; diff --git a/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java b/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java index 59a5b62bb..e8ae05c31 100644 --- a/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java +++ b/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java @@ -28,6 +28,12 @@ public class ButtonDefinePane extends AbstractDataModify