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 e35d0c0568..b5daed04ec 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()); } 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 ed96fbed91..6aa46f1a63 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.*; @@ -16,30 +15,18 @@ 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)); 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 94ecdc3d7d..9f6010f4ab 100644 --- a/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java +++ b/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java @@ -100,7 +100,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 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 6e3f717dca..926a787082 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 {