From e14f3372947e41d164bf5c7cb7e35d5717636dfe Mon Sep 17 00:00:00 2001 From: hzzz Date: Fri, 4 Aug 2017 11:59:17 +0800 Subject: [PATCH] color --- designer/src/com/fr/design/condition/BackPane.java | 2 +- .../com/fr/design/mainframe/SheetNameTabPane.java | 2 +- .../alphafine/cell/render/ContentCellRender.java | 2 +- .../alphafine/component/AlphaFineDialog.java | 10 +++++----- .../alphafine/preview/DocumentPreviewPane.java | 2 +- .../alphafine/preview/PluginPreviewPane.java | 6 +++--- .../src/com/fr/design/present/BarCodePane.java | 2 +- .../com/fr/design/present/CurrencyLinePane.java | 2 +- .../src/com/fr/design/webattr/ToolBarDragPane.java | 6 +++--- .../submit/SmartInsertDBManipulationPane.java | 6 +++--- designer/src/com/fr/grid/DrawFlowRect.java | 8 ++++---- designer/src/com/fr/grid/Grid.java | 2 +- designer/src/com/fr/grid/GridColumnUI.java | 4 ++-- designer/src/com/fr/grid/GridRowUI.java | 4 ++-- designer/src/com/fr/poly/PolyDesignUI.java | 2 +- designer/src/com/fr/poly/PolyDesigner.java | 2 +- designer/src/com/fr/poly/creator/BlockEditor.java | 2 +- .../floatquick/FloatStringQuickEditor.java | 2 +- designer/src/com/fr/start/Designer.java | 6 +++--- .../design/actions/help/alphafine/RemindPane.java | 2 +- .../src/com/fr/design/constants/UIConstants.java | 6 +++--- .../fr/design/gui/controlpane/UIControlPane.java | 2 +- .../controlpane/UINameableListCellRenderer.java | 2 +- .../com/fr/design/gui/date/UICalendarPanel.java | 4 ++-- .../src/com/fr/design/gui/frpane/UITitlePanel.java | 2 +- .../src/com/fr/design/gui/ibutton/UITabButton.java | 2 +- .../com/fr/design/gui/icombobox/UIComboBoxUI.java | 2 +- .../gui/icontainer/UIEastResizableContainer.java | 2 +- .../fr/design/gui/iscrollbar/UIScrollButton.java | 7 ------- .../src/com/fr/design/gui/ispinner/UISpinner.java | 2 +- .../com/fr/design/gui/itextarea/UITextAreaUI.java | 2 +- .../fr/design/gui/itextfield/UITextFieldUI.java | 2 +- .../gui/syntax/ui/rtextarea/ConfigurableCaret.java | 4 ++-- .../gui/syntax/ui/rtextarea/FoldIndicator.java | 4 ++-- .../design/mainframe/EastRegionContainerPane.java | 4 ++-- .../mainframe/loghandler/DesignerLogHandler.java | 2 +- .../src/com/fr/design/style/BorderPane.java | 2 +- .../background/BackgroundCustomJComponent.java | 4 ++-- .../background/gradient/GradientSelectBox.java | 6 +++--- .../style/background/impl/ColorBackgroundPane.java | 2 +- .../src/com/fr/design/style/color/ColorCell.java | 2 +- .../fr/design/style/color/ColorChooserPreview.java | 14 +++++++------- .../design/style/color/ColorSelectDetailPane.java | 2 +- .../design/style/color/DetailColorSelectPane.java | 2 +- .../design/style/color/PickColorButtonFactory.java | 2 +- .../src/com/fr/design/utils/gui/GUICoreUtils.java | 2 +- .../com/fr/design/chart/gui/ChartComponent.java | 2 +- .../fr/design/chart/gui/active/ActiveGlyph.java | 2 +- .../SeriesCondition/LabelBackgroundPane.java | 2 +- .../chart/gui/style/ChartAccColorPane.java | 4 ++-- .../gui/style/ChartDataPointLabel4GisPane.java | 2 +- .../chart/gui/style/ChartFillStylePane.java | 2 +- .../chart/gui/style/ChartPreFillStylePane.java | 2 +- .../chart/gui/style/series/UIColorPickerPane.java | 4 ++-- .../fr/design/designer/creator/FormCardPane.java | 2 +- .../fr/design/designer/creator/XIframeEditor.java | 2 +- .../com/fr/design/form/util/XCreatorConstants.java | 2 +- .../com/fr/design/gui/xpane/LayoutBorderPane.java | 2 +- .../design/gui/xpane/LayoutBorderPreviewPane.java | 2 +- .../src/com/fr/design/gui/xpane/ToolTipEditor.java | 2 +- .../src/com/fr/design/mainframe/CoverPane.java | 2 +- .../src/com/fr/design/mainframe/FormArea.java | 2 +- .../com/fr/design/mainframe/ShareWidgetButton.java | 2 +- .../mainframe/widget/editors/ColorTextField.java | 4 ++-- .../widget/editors/ElementCaseToolBarPane.java | 6 +++--- .../design/mainframe/widget/editors/TextField.java | 2 +- .../mainframe/widget/wrappers/ColorWrapper.java | 4 ++-- 67 files changed, 104 insertions(+), 111 deletions(-) diff --git a/designer/src/com/fr/design/condition/BackPane.java b/designer/src/com/fr/design/condition/BackPane.java index d7d6c30f3d..7e90632317 100644 --- a/designer/src/com/fr/design/condition/BackPane.java +++ b/designer/src/com/fr/design/condition/BackPane.java @@ -55,7 +55,7 @@ public class BackPane extends ConditionAttrSingleConditionPane this.add(backgroundPreviewPane); this.add(editBackgroundButton); this.add(this.backScopeComboBox); - this.backgroundPreviewPane.setBackgroundObject(ColorBackground.getInstance(Color.white)); + this.backgroundPreviewPane.setBackgroundObject(ColorBackground.getInstance(Color.WHITE)); } @Override diff --git a/designer/src/com/fr/design/mainframe/SheetNameTabPane.java b/designer/src/com/fr/design/mainframe/SheetNameTabPane.java index cbb0309ee9..6a1997053e 100644 --- a/designer/src/com/fr/design/mainframe/SheetNameTabPane.java +++ b/designer/src/com/fr/design/mainframe/SheetNameTabPane.java @@ -384,7 +384,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse if (isNeedPaintAuthority) { g2d.setPaint(new GradientPaint(1, 1, UIConstants.AUTHORITY_SHEET_LIGHT, 1, getHeight() - 1, UIConstants.AUTHORITY_SHEET_DARK)); } else { - g2d.setPaint(new GradientPaint(1, 1, Color.white, 1, getHeight() - 1, Color.white)); + g2d.setPaint(new GradientPaint(1, 1, Color.WHITE, 1, getHeight() - 1, Color.WHITE)); } GeneralPath generalPath = new GeneralPath(Path2D.WIND_EVEN_ODD, x.length); generalPath.moveTo((float) x[0], (float) y[0]); diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java b/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java index 25506cbcc2..563e26f46b 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java @@ -32,7 +32,7 @@ public class ContentCellRender implements ListCellRenderer { if (isSelected) { String iconUrl = "/com/fr/design/mainframe/alphafine/images/selected" + model.getType().getTypeValue() + ".png"; panel.setBackground(AlphaFineConstants.BLUE); - titleLabel.setForeground(Color.white); + titleLabel.setForeground(Color.WHITE); titleLabel.setIcon(new ImageIcon(IOUtils.readImage(iconUrl))); } else { String iconUrl = "/com/fr/design/mainframe/alphafine/images/alphafine" + model.getType().getTypeValue() + ".png"; 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 074279e7cc..6b1113f358 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -132,13 +132,13 @@ public class AlphaFineDialog extends UIDialog { UILabel iconLabel = new UILabel(new ImageIcon(getClass().getResource("/com/fr/design/mainframe/alphafine/images/bigsearch.png"))); iconLabel.setPreferredSize(AlphaFineConstants.ICON_LABEL_SIZE); iconLabel.setOpaque(true); - iconLabel.setBackground(Color.white); + iconLabel.setBackground(Color.WHITE); topPane.add(iconLabel, BorderLayout.WEST); topPane.add(searchTextField, BorderLayout.CENTER); closeButton = new UIButton() { @Override public void paintComponent(Graphics g) { - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRect(0, 0, getSize().width, getSize().height); super.paintComponent(g); } @@ -171,7 +171,7 @@ public class AlphaFineDialog extends UIDialog { searchTextField = new AlphaFineTextField(PLACE_HOLDER); initTextFieldKeyListener(); searchTextField.setFont(AlphaFineConstants.GREATER_FONT); - searchTextField.setBackground(Color.white); + searchTextField.setBackground(Color.WHITE); searchTextField.setBorderPainted(false); } @@ -294,11 +294,11 @@ public class AlphaFineDialog extends UIDialog { searchResultList.setCellRenderer(new ContentCellRender()); leftSearchResultPane = new UIScrollPane(searchResultList); - leftSearchResultPane.setBackground(Color.white); + leftSearchResultPane.setBackground(Color.WHITE); leftSearchResultPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); leftSearchResultPane.setPreferredSize(new Dimension(AlphaFineConstants.LEFT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT)); rightSearchResultPane = new JPanel(); - rightSearchResultPane.setBackground(Color.white); + rightSearchResultPane.setBackground(Color.WHITE); UILabel splitLine = new UILabel(); splitLine.setBackground(AlphaFineConstants.GRAY); splitLine.setPreferredSize(new Dimension(1, AlphaFineConstants.CONTENT_HEIGHT)); 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 89ed813872..ed96fbed91 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java @@ -15,7 +15,7 @@ public class DocumentPreviewPane extends JPanel { public DocumentPreviewPane(String title, String summary) { this.setLayout(new BorderLayout()); - this.setBackground(Color.white); + this.setBackground(Color.WHITE); UITextArea titleArea = new UITextArea(title); UITextArea contentArea = new UITextArea(summary); titleArea.setOpaque(false); diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java index 5df3b8ac2e..fed36e99f2 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java @@ -16,7 +16,7 @@ public class PluginPreviewPane extends JPanel { public PluginPreviewPane(String title, Image image, String version, String jartime, CellType type, int price) { setLayout(new BorderLayout()); setBorder(BorderFactory.createEmptyBorder(50, 0, 0, 0)); - setBackground(Color.white); + setBackground(Color.WHITE); UILabel imageLabel = new UILabel(); image = image.getScaledInstance(200, 200, Image.SCALE_SMOOTH); imageLabel.setIcon(new ImageIcon(image)); @@ -29,9 +29,9 @@ public class PluginPreviewPane extends JPanel { line.setPreferredSize(new Dimension(200, 1)); line.setBackground(AlphaFineConstants.GRAY); JPanel panel = new JPanel(new BorderLayout()); - panel.setBackground(Color.white); + panel.setBackground(Color.WHITE); JPanel bottomPane = new JPanel(new BorderLayout()); - bottomPane.setBackground(Color.white); + bottomPane.setBackground(Color.WHITE); bottomPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); if (type == CellType.PLUGIN) { UILabel versionLabel = new UILabel("V" + version); diff --git a/designer/src/com/fr/design/present/BarCodePane.java b/designer/src/com/fr/design/present/BarCodePane.java index e34a382c95..db894b2037 100644 --- a/designer/src/com/fr/design/present/BarCodePane.java +++ b/designer/src/com/fr/design/present/BarCodePane.java @@ -302,7 +302,7 @@ public class BarCodePane extends FurtherBasicBeanPane { private Object obj; public BarCodePreviewPane() { -// setBackground(Color.white); +// setBackground(Color.WHITE); } /** diff --git a/designer/src/com/fr/design/present/CurrencyLinePane.java b/designer/src/com/fr/design/present/CurrencyLinePane.java index 4bf9ea7562..b6e0ff8530 100644 --- a/designer/src/com/fr/design/present/CurrencyLinePane.java +++ b/designer/src/com/fr/design/present/CurrencyLinePane.java @@ -154,7 +154,7 @@ public class CurrencyLinePane extends FurtherBasicBeanPane CurrencyLineAttr currencyLineAttr; public CurrencyLinePreviewPane() { -// setBackground(Color.white); +// setBackground(Color.WHITE); } public void setObject(String text, CurrencyLineAttr currencyLineAttr) { diff --git a/designer/src/com/fr/design/webattr/ToolBarDragPane.java b/designer/src/com/fr/design/webattr/ToolBarDragPane.java index bd6dd0fc0c..f6d07cc37b 100644 --- a/designer/src/com/fr/design/webattr/ToolBarDragPane.java +++ b/designer/src/com/fr/design/webattr/ToolBarDragPane.java @@ -130,10 +130,10 @@ public class ToolBarDragPane extends WidgetToolBarPane { initLayoutTable(); JPanel center = FRGUIPaneFactory.createBorderLayout_S_Pane(); - center.setBackground(Color.white); + center.setBackground(Color.WHITE); center.add(topButton, BorderLayout.NORTH); JPanel small = FRGUIPaneFactory.createBorderLayout_S_Pane(); - small.setBackground(Color.white); + small.setBackground(Color.WHITE); small.add(new UILabel(StringUtils.BLANK), BorderLayout.NORTH); small.add(layoutTable, BorderLayout.CENTER); center.add(small, BorderLayout.CENTER); @@ -168,7 +168,7 @@ public class ToolBarDragPane extends WidgetToolBarPane { layoutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); layoutTable.setColumnSelectionAllowed(false); layoutTable.setRowSelectionAllowed(false); - layoutTable.setBackground(Color.white); + layoutTable.setBackground(Color.WHITE); int columnWidth = Integer.parseInt(Inter.getLocText("FR-Designer_LayoutTable_Column_Width")); for (int i = 0; i < layoutTable.getColumnModel().getColumnCount(); i++) { layoutTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidth); diff --git a/designer/src/com/fr/design/write/submit/SmartInsertDBManipulationPane.java b/designer/src/com/fr/design/write/submit/SmartInsertDBManipulationPane.java index 097bb6bfb2..e80d89c364 100644 --- a/designer/src/com/fr/design/write/submit/SmartInsertDBManipulationPane.java +++ b/designer/src/com/fr/design/write/submit/SmartInsertDBManipulationPane.java @@ -517,7 +517,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane { if (row == SmartJTablePane4DB.this.editingRowIndex) { this.setBackground(java.awt.Color.cyan); } else { - this.setBackground(java.awt.Color.white); + this.setBackground(java.awt.Color.WHITE); } return this; @@ -550,7 +550,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane { if (row == SmartJTablePane4DB.this.editingRowIndex) { pane.setBackground(java.awt.Color.cyan); } else { - pane.setBackground(java.awt.Color.white); + pane.setBackground(java.awt.Color.WHITE); } pane.setToolTipText(tip); @@ -585,7 +585,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane { if (row == SmartJTablePane4DB.this.editingRowIndex) { this.setBackground(java.awt.Color.cyan); } else { - this.setBackground(java.awt.Color.white); + this.setBackground(java.awt.Color.WHITE); } return this; diff --git a/designer/src/com/fr/grid/DrawFlowRect.java b/designer/src/com/fr/grid/DrawFlowRect.java index bb68d2a830..a42d14cee1 100644 --- a/designer/src/com/fr/grid/DrawFlowRect.java +++ b/designer/src/com/fr/grid/DrawFlowRect.java @@ -88,7 +88,7 @@ public class DrawFlowRect implements Runnable { g.drawLine(x, y, width, y); //第二根线同上 g.drawLine(x-1, y-1, width, y-1); - g.setColor(Color.white); + g.setColor(Color.WHITE); //第一根白色虚线 drawFlowLine(g, x, y, width, y); isReal = oldisReal; //还原 数据 @@ -101,7 +101,7 @@ public class DrawFlowRect implements Runnable { g.setColor(Color.black); //右 g.drawLine(width, y, width, height); g.drawLine(width-1, y-1, width-1, height); - g.setColor(Color.white); + g.setColor(Color.WHITE); isReal = oldisReal; //还原 数据 lenReal = oldlenReal; drawFlowLine(g, width, y, width, height); @@ -115,7 +115,7 @@ public class DrawFlowRect implements Runnable { g.setColor(Color.black); //左 g.drawLine(x, height, x, y); g.drawLine(x+1, height-1, x+1, y); - g.setColor(Color.white); + g.setColor(Color.WHITE); isReal = oldisReal; //还原 数据 lenReal = oldlenReal; drawFlowLine(g, x, height, x, y ); @@ -128,7 +128,7 @@ public class DrawFlowRect implements Runnable { g.setColor(Color.black); //下 g.drawLine(width, height, x, height); g.drawLine(width+1, height+1, x, height+1); - g.setColor(Color.white); + g.setColor(Color.WHITE); isReal = oldisReal; //还原 数据 lenReal = oldlenReal; drawFlowLine(g, width, height, x, height); diff --git a/designer/src/com/fr/grid/Grid.java b/designer/src/com/fr/grid/Grid.java index 8c1eab7480..f90b000d4e 100644 --- a/designer/src/com/fr/grid/Grid.java +++ b/designer/src/com/fr/grid/Grid.java @@ -57,7 +57,7 @@ public class Grid extends BaseGridComponent { transient private TemplateCellElement editingCellElement; private boolean showGridLine = true; - private Color gridLineColor = new Color(0xF0F0F3); // line color. + private Color gridLineColor = new Color(0xf0f0f3); // line color. private boolean isShowPaginateLine = true; private Color paginationLineColor = Color.RED; // line color of paper diff --git a/designer/src/com/fr/grid/GridColumnUI.java b/designer/src/com/fr/grid/GridColumnUI.java index ca5909420f..227de31941 100644 --- a/designer/src/com/fr/grid/GridColumnUI.java +++ b/designer/src/com/fr/grid/GridColumnUI.java @@ -27,7 +27,7 @@ import com.fr.report.elementcase.ElementCase; * @since 2012-3-22下午5:51:10 */ public class GridColumnUI extends ComponentUI { - protected Color withoutDetailsBackground = new Color(0xF0F0F3); + protected Color withoutDetailsBackground = new Color(0xf0f0f3); private int resolution ; public GridColumnUI(int resolution){ @@ -70,7 +70,7 @@ public class GridColumnUI extends ComponentUI { if (gridColumn.getBackground() != null) { g2d.setPaint(this.withoutDetailsBackground); GraphHelper.fill(g2d, new Rectangle2D.Double(0, 0, columnLeftWidth, size.getHeight())); - g2d.setPaint(Color.white); + g2d.setPaint(Color.WHITE); GraphHelper.fill(g2d, new Rectangle2D.Double(columnLeftWidth, 0, size.getWidth() - columnLeftWidth, size.getHeight())); } // draw left border line. diff --git a/designer/src/com/fr/grid/GridRowUI.java b/designer/src/com/fr/grid/GridRowUI.java index 960cd08612..4c0694a21a 100644 --- a/designer/src/com/fr/grid/GridRowUI.java +++ b/designer/src/com/fr/grid/GridRowUI.java @@ -26,7 +26,7 @@ import com.fr.report.elementcase.ElementCase; * @since 2012-3-22下午5:54:21 */ public class GridRowUI extends ComponentUI { - private Color detailsBackground = new Color(0xF0F0F3); + private Color detailsBackground = new Color(0xf0f0f3); private int resolution ; GridRowUI(int resolution){ @@ -69,7 +69,7 @@ public class GridRowUI extends ComponentUI { if (gridRow.getBackground() != null) { g2d.setPaint(this.detailsBackground); GraphHelper.fill(g2d, new Rectangle2D.Double(0, 0, size.getWidth(), rowTopHeight)); - g2d.setPaint(Color.white); + g2d.setPaint(Color.WHITE); GraphHelper.fill(g2d, new Rectangle2D.Double(0, rowTopHeight, size.getHeight(), size.getHeight() - rowTopHeight)); } // draw top border line. diff --git a/designer/src/com/fr/poly/PolyDesignUI.java b/designer/src/com/fr/poly/PolyDesignUI.java index 0eaf7c139e..efe76a69aa 100644 --- a/designer/src/com/fr/poly/PolyDesignUI.java +++ b/designer/src/com/fr/poly/PolyDesignUI.java @@ -76,7 +76,7 @@ public class PolyDesignUI extends ComponentUI { Graphics2D g2d = (Graphics2D) g; Dimension d = c.getSize(); TemplateReport report = designer.getTemplateReport(); - g2d.setPaint(Color.white); + g2d.setPaint(Color.WHITE); GraphHelper.fillRect(g, 0, 0, d.width, d.height); ReportSettingsProvider rs = report.getReportSettings(); if (rs != null) { diff --git a/designer/src/com/fr/poly/PolyDesigner.java b/designer/src/com/fr/poly/PolyDesigner.java index 94c99b5380..35f196f0fb 100644 --- a/designer/src/com/fr/poly/PolyDesigner.java +++ b/designer/src/com/fr/poly/PolyDesigner.java @@ -152,7 +152,7 @@ public class PolyDesigner extends ReportComponent this.initDataChangeListener(); } protected void initComponets(){ - this.setBackground(Color.white); + this.setBackground(Color.WHITE); this.setOpaque(false); this.setLayout(new BlockEditorLayout()); editComponent = createEffective(); diff --git a/designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java b/designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java index 04bf7808a5..b89baec319 100644 --- a/designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java +++ b/designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java @@ -50,7 +50,7 @@ public class FloatStringQuickEditor extends FloatQuickEditor { stringTextField.setWrapStyleWord(true); stringTextField.setMargin(new Insets(5, 5, 5, 5)); stringTextField.setBorder(BorderFactory.createLineBorder(Color.gray)); - stringTextField.setBackground(Color.white); + stringTextField.setBackground(Color.WHITE); } ActionListener getFormulaActionListener = new ActionListener() { diff --git a/designer/src/com/fr/start/Designer.java b/designer/src/com/fr/start/Designer.java index 5110136228..d4e92bf9cc 100644 --- a/designer/src/com/fr/start/Designer.java +++ b/designer/src/com/fr/start/Designer.java @@ -139,7 +139,7 @@ public class Designer extends BaseDesigner { return dim; } }; - templeJpanel.setBackground(Color.white); + templeJpanel.setBackground(Color.WHITE); largeToolbar.add(templeJpanel); createRunButton(largeToolbar); largeToolbar.add(run); @@ -150,7 +150,7 @@ public class Designer extends BaseDesigner { return dim; } }; - templeJpanel.setBackground(Color.white); + templeJpanel.setBackground(Color.WHITE); largeToolbar.add(templeJpanel); largeToolbar.setBorder(new MatteBorder(new Insets(0, 0, 1, 0), UIConstants.LINE_COLOR)); return largeToolbar; @@ -263,7 +263,7 @@ public class Designer extends BaseDesigner { run.set4Toolbar(); run.getUpButton().setToolTipText(Inter.getLocText("FR-Designer_Preview")); run.getDownButton().setToolTipText(Inter.getLocText("FR-Designer_Dropdown-More-Preview")); - run.setBackground(Color.white); + run.setBackground(Color.WHITE); } @Override diff --git a/designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java b/designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java index dce47b97a2..fc565bd6de 100644 --- a/designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java +++ b/designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java @@ -69,7 +69,7 @@ public class RemindPane extends JPanel { }); noRemindLabel = new UILabel(Inter.getLocText("FR-Designer-Alphafine_No_Remind")); noRemindLabel.setFont(MEDIUM_FONT); - noRemindLabel.setForeground(Color.white); + noRemindLabel.setForeground(Color.WHITE); checkLabel = new UILabel(); checkLabel.setIcon(unCheckIcon); checkLabel.addMouseListener(new MouseAdapter() { diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java index bd45a84c42..c956265661 100644 --- a/designer_base/src/com/fr/design/constants/UIConstants.java +++ b/designer_base/src/com/fr/design/constants/UIConstants.java @@ -81,9 +81,9 @@ public interface UIConstants { public static final Color AUTHORITY_SHEET_DARK = new Color(86, 120, 143); public static final Color AUTHORITY_SHEET_LIGHT = new Color(156, 204, 238); public static final Color AUTHORITY_SHEET_UNSELECTED = new Color(146, 192, 225); - public static final Color ATTRIBUTE_PRESS = new Color(0xdfecfc); - public static final Color ATTRIBUTE_NORMAL = new Color(0xe2e2e2); - public static final Color ATTRIBUTE_HOVER = new Color(0xd3d3d3); + public static final Color ATTRIBUTE_PRESS = new Color(0xD8F2FD); + public static final Color ATTRIBUTE_NORMAL = new Color(0xDADADD); + public static final Color ATTRIBUTE_HOVER = new Color(0xC9C9CD); public static final Color CHECKBOX_HOVER_SELECTED = new Color(0x3394f0); public static final Color TEXT_FILED_BORDER_SELECTED = new Color(0x3384f0); public static final Color SHEET_NORMAL = new Color(0xc8c8ca); diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java index 0a04ea4460..2d52cdbcff 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java @@ -142,7 +142,7 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH @Override public void paint(Graphics g, JComponent c) { Graphics2D g2 = (Graphics2D) g; - g2.setColor(Color.white); + g2.setColor(Color.WHITE); g2.fillRect(0, 0, c.getWidth(), c.getHeight()); } }); diff --git a/designer_base/src/com/fr/design/gui/controlpane/UINameableListCellRenderer.java b/designer_base/src/com/fr/design/gui/controlpane/UINameableListCellRenderer.java index 086cd5a77b..223ea25a69 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UINameableListCellRenderer.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UINameableListCellRenderer.java @@ -90,7 +90,7 @@ public class UINameableListCellRenderer extends if (isSelected) { setBackground(bg == null ? list.getSelectionBackground() : bg); setForeground(fg == null ? list.getSelectionForeground() : fg); - label.setForeground(Color.white); + label.setForeground(Color.WHITE); editButton.setIcon(UIConstants.LIST_EDIT_WHITE_ICON); } else { diff --git a/designer_base/src/com/fr/design/gui/date/UICalendarPanel.java b/designer_base/src/com/fr/design/gui/date/UICalendarPanel.java index aeded09154..137209b906 100644 --- a/designer_base/src/com/fr/design/gui/date/UICalendarPanel.java +++ b/designer_base/src/com/fr/design/gui/date/UICalendarPanel.java @@ -575,7 +575,7 @@ public class UICalendarPanel extends JPanel { this.getComponent(selectedIndex).setForeground(Color.black); } if (index != -1 && index < getComponentCount()) { - this.getComponent(index).setForeground(Color.white); + this.getComponent(index).setForeground(Color.WHITE); } this.selectedIndex = index; repaint(); @@ -716,7 +716,7 @@ public class UICalendarPanel extends JPanel { Graphics2D g2d = (Graphics2D)g; if (isRolOver) { Shape shape = new RoundRectangle2D.Double(1, 1, 86, 15, UIConstants.ARC, UIConstants.ARC); - GUIPaintUtils.paintBorderShadow(g2d, 3, shape, UIConstants.HOVER_BLUE, Color.white); + GUIPaintUtils.paintBorderShadow(g2d, 3, shape, UIConstants.HOVER_BLUE, Color.WHITE); } else { GUIPaintUtils.drawBorder(g2d, 0, 0, 101, 18, true, 3); } diff --git a/designer_base/src/com/fr/design/gui/frpane/UITitlePanel.java b/designer_base/src/com/fr/design/gui/frpane/UITitlePanel.java index 6cdcf50cff..315c112c5d 100644 --- a/designer_base/src/com/fr/design/gui/frpane/UITitlePanel.java +++ b/designer_base/src/com/fr/design/gui/frpane/UITitlePanel.java @@ -27,7 +27,7 @@ public class UITitlePanel extends JPanel { public UITitlePanel(JPanel contentPanel, String title) { JPanel TitleBar = FRGUIPaneFactory.createBorderLayout_S_Pane(); TitleBar.setBackground(new Color(148, 148, 148)); - TitleBar.setForeground(Color.white); + TitleBar.setForeground(Color.WHITE); TitleBar.setBorder(BorderFactory.createMatteBorder(1, 0, 1, 0, new Color(85, 85, 85))); UILabel titlelabel = new UILabel(" " + title); diff --git a/designer_base/src/com/fr/design/gui/ibutton/UITabButton.java b/designer_base/src/com/fr/design/gui/ibutton/UITabButton.java index fe4bd72756..c072245232 100644 --- a/designer_base/src/com/fr/design/gui/ibutton/UITabButton.java +++ b/designer_base/src/com/fr/design/gui/ibutton/UITabButton.java @@ -157,7 +157,7 @@ public class UITabButton extends UILabel implements UISelectedComponent { GradientPaint gp = new GradientPaint(1, 1, darkColor, 1, 5, lightColor); g2d.setPaint(gp); g2d.fillRect(0, 0, w - 1, h); - this.setForeground(Color.white); + this.setForeground(Color.WHITE); } else if (!isSelected() && isRollover) { Color blue = UIConstants.LIGHT_BLUE; g2d.setColor(blue); diff --git a/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java b/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java index f5cd1eabbc..6ecfb70919 100644 --- a/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java +++ b/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java @@ -99,7 +99,7 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener { if (hasFocus && !isPopupVisible(comboBox)) { if (comboBox.isEnabled()) { c.setForeground(Color.black); - c.setBackground(Color.white); + c.setBackground(Color.WHITE); } else { c.setForeground(DefaultLookup.getColor( comboBox, this, "ComboBox.disabledForeground", comboBox.getForeground())); diff --git a/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java b/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java index 8f82b1b097..add452758b 100644 --- a/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java +++ b/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java @@ -99,7 +99,7 @@ public class UIEastResizableContainer extends JPanel { UIEastResizableContainer bb = new UIEastResizableContainer(leftPane, rightPane); JPanel cc = new JPanel(); - cc.setBackground(Color.white); + cc.setBackground(Color.WHITE); content.add(bb, BorderLayout.EAST); content.add(cc, BorderLayout.CENTER); diff --git a/designer_base/src/com/fr/design/gui/iscrollbar/UIScrollButton.java b/designer_base/src/com/fr/design/gui/iscrollbar/UIScrollButton.java index 7b2cb31894..6b393be39f 100644 --- a/designer_base/src/com/fr/design/gui/iscrollbar/UIScrollButton.java +++ b/designer_base/src/com/fr/design/gui/iscrollbar/UIScrollButton.java @@ -110,15 +110,8 @@ public class UIScrollButton extends BasicArrowButton { } else { scrollBarBg = new GradientPaint(1, 1, new Color(0xffffff), 1, 16, new Color(0xffffff)); } -// GradientPaint scrollBarHight = new GradientPaint(0, 0, new Color(1.0f, 1.0f, 1.0f, 0.5f), 0, 7, new Color(1.0f, 1.0f, 1.0f, 0.2f)); g2.setPaint(scrollBarBg); g2.fillRoundRect(1, 1, 16, 16, 0, 0); -// g2.setPaint(scrollBarHight); -// g2.fillRoundRect(1, 1, 16, 7, 3, 3); -// g2.setColor(a); -// g2.drawRoundRect(1, 1, 15, 15, 3, 3); -// g2.setColor(new Color(212, 212, 216)); -// g2.drawRoundRect(2, 2, 13, 13, 3, 3); break; } // dispose of image graphics diff --git a/designer_base/src/com/fr/design/gui/ispinner/UISpinner.java b/designer_base/src/com/fr/design/gui/ispinner/UISpinner.java index 048639ec14..d2b85be2cd 100644 --- a/designer_base/src/com/fr/design/gui/ispinner/UISpinner.java +++ b/designer_base/src/com/fr/design/gui/ispinner/UISpinner.java @@ -315,7 +315,7 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver g2d.fillRoundRect(1, 1, width - 2, height - 2, UIConstants.ARC, UIConstants.ARC); if (isRollOver && isEnabled()) { Shape shape = new RoundRectangle2D.Double(1, 1, width - 3, height - 3, UIConstants.ARC, UIConstants.ARC); - GUIPaintUtils.paintBorderShadow(g2d, 3, shape, UIConstants.HOVER_BLUE, Color.white); + GUIPaintUtils.paintBorderShadow(g2d, 3, shape, UIConstants.HOVER_BLUE, Color.WHITE); } else { g2d.setColor(UIConstants.LINE_COLOR); g2d.drawRoundRect(1, 1, width - 2, height - 2, UIConstants.ARC, UIConstants.ARC); 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 86c3a17223..d013d0de0b 100644 --- a/designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java +++ b/designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java @@ -46,7 +46,7 @@ public class UITextAreaUI extends BasicTextAreaUI { g2d.clearRect(0, 0, width, height); if(isRollOver && textField.isEnabled() && ((UITextArea)textField).isEditable()) { Shape shape = new RoundRectangle2D.Double(1, 1, width - 3, height - 3, UIConstants.ARC, UIConstants.ARC); - GUIPaintUtils.paintBorderShadow(g2d, 3, shape, UIConstants.HOVER_BLUE, Color.white); + GUIPaintUtils.paintBorderShadow(g2d, 3, shape, UIConstants.HOVER_BLUE, Color.WHITE); } else { g2d.setColor(UIConstants.LINE_COLOR); g2d.drawRoundRect(1, 1, width - 2, height - 2, UIConstants.ARC, UIConstants.ARC); diff --git a/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java b/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java index be3d46fa1c..5142c030ec 100644 --- a/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java +++ b/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java @@ -20,7 +20,7 @@ public class UITextFieldUI extends BasicTextFieldUI { protected boolean isRollOver; private JComponent textField; - private Color backgroundColor = Color.white; + private Color backgroundColor = Color.WHITE; public UITextFieldUI(final JComponent textField) { super(); diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/ConfigurableCaret.java b/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/ConfigurableCaret.java index 64dd8d3a18..8d723847b6 100644 --- a/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/ConfigurableCaret.java +++ b/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/ConfigurableCaret.java @@ -422,7 +422,7 @@ public class ConfigurableCaret extends DefaultCaret { case BLOCK_STYLE: Color textAreaBg = textArea.getBackground(); if (textAreaBg==null) { - textAreaBg = Color.white; + textAreaBg = Color.WHITE; } g.setXORMode(textAreaBg); // fills x==r.x to x==(r.x+(r.width)-1), inclusive. @@ -439,7 +439,7 @@ public class ConfigurableCaret extends DefaultCaret { case UNDERLINE_STYLE: textAreaBg = textArea.getBackground(); if (textAreaBg==null) { - textAreaBg = Color.white; + textAreaBg = Color.WHITE; } g.setXORMode(textAreaBg); int y = r.y + r.height; diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/FoldIndicator.java b/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/FoldIndicator.java index a65d7963a2..8314f8e2bf 100644 --- a/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/FoldIndicator.java +++ b/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/FoldIndicator.java @@ -92,7 +92,7 @@ public class FoldIndicator extends AbstractGutterComponent { /** * The default color used to paint the "inside" of fold icons. */ - static final Color DEFAULT_FOLD_BACKGROUND = Color.white; + static final Color DEFAULT_FOLD_BACKGROUND = Color.WHITE; /** * Listens for events in this component. @@ -128,7 +128,7 @@ public class FoldIndicator extends AbstractGutterComponent { public JToolTip createToolTip() { JToolTip tip = super.createToolTip(); Color textAreaBG = textArea.getBackground(); - if (textAreaBG!=null && !Color.white.equals(textAreaBG)) { + if (textAreaBG!=null && !Color.WHITE.equals(textAreaBG)) { Color bg = TipUtil.getToolTipBackground(); // If current L&F's tool tip color is close enough to "yellow", // and we're not using the default text background of white, use diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index 3866471149..483d0c36b4 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -337,7 +337,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); JPanel cc = new JPanel(); - cc.setBackground(Color.white); + cc.setBackground(Color.WHITE); // JPanel leftPane = new JPanel(); // leftPane.setBackground(Color.yellow); // JPanel rightPane = new JPanel(); @@ -812,7 +812,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { super(); this.propertyItem = propertyItem; this.title = propertyItem.getTitle(); - originColor = Color.white; + originColor = Color.WHITE; setBackground(originColor); setLayout(new BorderLayout()); UILabel label = new UILabel(title); diff --git a/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java index a844fd3a2e..466c9b56d9 100644 --- a/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -146,7 +146,7 @@ public class DesignerLogHandler { this.setPreferredSize(new Dimension(super.getPreferredSize().width, 150)); jTextArea.setEditable(false); - jTextArea.setBackground(Color.white); + jTextArea.setBackground(Color.WHITE); popup = new JPopupMenu(); selectAll = new UIMenuItem(Inter.getLocText("FR-Designer_Select_All")); diff --git a/designer_base/src/com/fr/design/style/BorderPane.java b/designer_base/src/com/fr/design/style/BorderPane.java index 896c41f9c1..f086ff41f3 100644 --- a/designer_base/src/com/fr/design/style/BorderPane.java +++ b/designer_base/src/com/fr/design/style/BorderPane.java @@ -485,7 +485,7 @@ public class BorderPane extends BasicPane { // Paint the background component which depends on cell set case public void paint(Graphics g) { // background - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRect(0, 0, getWidth() - 1, getHeight() - 1); // borders diff --git a/designer_base/src/com/fr/design/style/background/BackgroundCustomJComponent.java b/designer_base/src/com/fr/design/style/background/BackgroundCustomJComponent.java index 5a2d0e5df6..524c7e39a2 100644 --- a/designer_base/src/com/fr/design/style/background/BackgroundCustomJComponent.java +++ b/designer_base/src/com/fr/design/style/background/BackgroundCustomJComponent.java @@ -38,7 +38,7 @@ public class BackgroundCustomJComponent extends BackgroundJComponent { path.lineTo(13, 12); path.lineTo(19, 7); path.closePath(); - g2d.setColor(Color.white); + g2d.setColor(Color.WHITE); g2d.fill(path); g2d.setColor(Color.gray); g2d.draw(path); @@ -54,7 +54,7 @@ public class BackgroundCustomJComponent extends BackgroundJComponent { path.lineTo(7, 12); path.lineTo(1, 7); path.closePath(); - g2d.setColor(Color.white); + g2d.setColor(Color.WHITE); g2d.fill(path); g2d.setColor(Color.gray); g2d.draw(path); diff --git a/designer_base/src/com/fr/design/style/background/gradient/GradientSelectBox.java b/designer_base/src/com/fr/design/style/background/gradient/GradientSelectBox.java index c50751a48d..1195622cbf 100644 --- a/designer_base/src/com/fr/design/style/background/gradient/GradientSelectBox.java +++ b/designer_base/src/com/fr/design/style/background/gradient/GradientSelectBox.java @@ -26,7 +26,7 @@ public class GradientSelectBox extends BasicPane { private BackgroundJComponent displayComponent; private Color startColor = Color.black; - private Color endColor = Color.white; + private Color endColor = Color.WHITE; public GradientSelectBox() { this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0)); @@ -35,11 +35,11 @@ public class GradientSelectBox extends BasicPane { startBox.setSelectObject(Color.black); this.add(displayComponent = new BackgroundJComponent()); - displayComponent.setSelfBackground(new GradientBackground(Color.black, Color.white, 0)); + displayComponent.setSelfBackground(new GradientBackground(Color.black, Color.WHITE, 0)); displayComponent.setPreferredSize(new Dimension(80, 15)); this.add(endBox = new CustomSelectBox(Constants.RIGHT)); - endBox.setSelectObject(Color.white); + endBox.setSelectObject(Color.WHITE); startBox.addSelectChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { diff --git a/designer_base/src/com/fr/design/style/background/impl/ColorBackgroundPane.java b/designer_base/src/com/fr/design/style/background/impl/ColorBackgroundPane.java index effbe6328c..62a08a948a 100644 --- a/designer_base/src/com/fr/design/style/background/impl/ColorBackgroundPane.java +++ b/designer_base/src/com/fr/design/style/background/impl/ColorBackgroundPane.java @@ -28,7 +28,7 @@ public class ColorBackgroundPane extends BackgroundDetailPane { ColorBackground colorBackgroud = (ColorBackground) background; this.detailColorSelectPane.populate(colorBackgroud.getColor()); } else { - this.detailColorSelectPane.populate(Color.white); + this.detailColorSelectPane.populate(Color.WHITE); } } diff --git a/designer_base/src/com/fr/design/style/color/ColorCell.java b/designer_base/src/com/fr/design/style/color/ColorCell.java index b94ca9260f..8e9cc617a8 100644 --- a/designer_base/src/com/fr/design/style/color/ColorCell.java +++ b/designer_base/src/com/fr/design/style/color/ColorCell.java @@ -65,7 +65,7 @@ public class ColorCell extends JComponent implements ColorSelectable { // transparent if (color == null) { - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRect(b.left, b.top, d.width - b.left - b.right, d.height - b.top - b.bottom); g.setColor(Color.gray); diff --git a/designer_base/src/com/fr/design/style/color/ColorChooserPreview.java b/designer_base/src/com/fr/design/style/color/ColorChooserPreview.java index ff3d7f0eb7..74221432b3 100644 --- a/designer_base/src/com/fr/design/style/color/ColorChooserPreview.java +++ b/designer_base/src/com/fr/design/style/color/ColorChooserPreview.java @@ -89,7 +89,7 @@ public class ColorChooserPreview extends JPanel { private int paintSwatch(Graphics g, int offsetX) { int swatchX = offsetX; - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRect(swatchX, 0, SWATH_WIDTH, (SQUARE_SIZE) + (SQUARE_GAP / 2)); g.setColor(myColor); g.fillRect(swatchX, (SQUARE_SIZE) + (SQUARE_GAP / 2), SWATH_WIDTH, (SQUARE_SIZE) + (SQUARE_GAP / 2) ); @@ -128,7 +128,7 @@ public class ColorChooserPreview extends JPanel { SwingUtilities2.drawString(host, g, getSampleText(), textXOffset + (TEXT_GAP / 2), height+ascent + TEXT_GAP + 2); - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRect(textXOffset, (height + TEXT_GAP) * 2, width + TEXT_GAP, height + 2); @@ -149,11 +149,11 @@ public class ColorChooserPreview extends JPanel { int squareXOffset = offsetX; Color color = myColor; /** 方形预览框第1列第1行：从外到内（white,color,white） */ - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRect(squareXOffset, 0, SQUARE_SIZE, SQUARE_SIZE); g.setColor(color); g.fillRect(squareXOffset + INNER_GAP, INNER_GAP, SQUARE_SIZE - INNER_GAP2, SQUARE_SIZE - INNER_GAP2); - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRect(squareXOffset+INNER_GAP2, INNER_GAP2, SQUARE_SIZE - INNER_GAP3, SQUARE_SIZE - INNER_GAP3); /** 方形预览框第1列第2行：color全色 */ g.setColor(color); @@ -164,19 +164,19 @@ public class ColorChooserPreview extends JPanel { g.fillRect(squareXOffset, 0, SQUARE_SIZE, SQUARE_SIZE); g.setColor(color); g.fillRect(squareXOffset + INNER_GAP, INNER_GAP, SQUARE_SIZE - INNER_GAP2, SQUARE_SIZE - INNER_GAP2); - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRect(squareXOffset + INNER_GAP2, INNER_GAP2, SQUARE_SIZE - INNER_GAP3, SQUARE_SIZE - INNER_GAP3); g.translate(-(SQUARE_SIZE + SQUARE_GAP), 0); /** 方形预览框第2列第2行：从外到内（white,color） */ g.translate(SQUARE_SIZE + SQUARE_GAP, SQUARE_SIZE + SQUARE_GAP); - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRect(squareXOffset,0,SQUARE_SIZE,SQUARE_SIZE); g.setColor(color); g.fillRect(squareXOffset + INNER_GAP, INNER_GAP, SQUARE_SIZE - INNER_GAP2, SQUARE_SIZE - INNER_GAP2); g.translate(-(SQUARE_SIZE + SQUARE_GAP), -(SQUARE_SIZE + SQUARE_GAP)); /** 方形预览框第3列第1行：从外到内（white,color,black） */ g.translate((SQUARE_SIZE + SQUARE_GAP) * 2, 0); - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRect(squareXOffset, 0, SQUARE_SIZE,SQUARE_SIZE); g.setColor(color); g.fillRect(squareXOffset + INNER_GAP, INNER_GAP, SQUARE_SIZE - INNER_GAP2, SQUARE_SIZE - INNER_GAP2); diff --git a/designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java b/designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java index a84b772cac..d2f4028f8a 100644 --- a/designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java +++ b/designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java @@ -48,7 +48,7 @@ public class ColorSelectDetailPane extends BasicPane { public ColorSelectDetailPane(Color color) { if (color == null) { - color = Color.white; + color = Color.WHITE; } this.color = color; initComponents(); diff --git a/designer_base/src/com/fr/design/style/color/DetailColorSelectPane.java b/designer_base/src/com/fr/design/style/color/DetailColorSelectPane.java index 0ade305208..c2c1075ec1 100644 --- a/designer_base/src/com/fr/design/style/color/DetailColorSelectPane.java +++ b/designer_base/src/com/fr/design/style/color/DetailColorSelectPane.java @@ -78,7 +78,7 @@ public class DetailColorSelectPane extends BasicPane { this.addChangeListener(colorPreviewLabelChangeListener); //use the white as the default color. - this.populate(Color.white); + this.populate(Color.WHITE); } @Override diff --git a/designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java b/designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java index 19d0c86ee9..47c60e94a8 100644 --- a/designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java +++ b/designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java @@ -57,7 +57,7 @@ public class PickColorButtonFactory { public void paint(Graphics g, JComponent c) { super.paint(g, c); Dimension size = c.getSize(); - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRoundRect(0, 0, size.width - 1, size.height - 1, 1, 1); g.setColor(new Color(153, 153, 153)); // #999999 g.drawRoundRect(0, 0, size.width - 1, size.height - 1, 1, 1); diff --git a/designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java b/designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java index 8d03f039e8..8c6252b633 100644 --- a/designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java +++ b/designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java @@ -131,7 +131,7 @@ public abstract class GUICoreUtils{ if (style.getBackground() instanceof ColorBackground) { textField.setBackground(((ColorBackground) style.getBackground()).getColor()); } else { - textField.setBackground(Color.white); + textField.setBackground(Color.WHITE); } } diff --git a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java index 127f640d2d..9c48aaa360 100644 --- a/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java +++ b/designer_chart/src/com/fr/design/chart/gui/ChartComponent.java @@ -169,7 +169,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene Paint oldPaint = g2d.getPaint(); - g2d.setPaint(Color.white); + g2d.setPaint(Color.WHITE); g2d.fillRect(0, 0, this.getBounds().width, this.getBounds().height); g2d.setPaint(oldPaint); diff --git a/designer_chart/src/com/fr/design/chart/gui/active/ActiveGlyph.java b/designer_chart/src/com/fr/design/chart/gui/active/ActiveGlyph.java index c0fa1e1939..ef0c9364de 100644 --- a/designer_chart/src/com/fr/design/chart/gui/active/ActiveGlyph.java +++ b/designer_chart/src/com/fr/design/chart/gui/active/ActiveGlyph.java @@ -64,7 +64,7 @@ public abstract class ActiveGlyph { Paint oldPaint = g2d.getPaint(); Composite oldComposite = g2d.getComposite(); - g2d.setPaint(Color.white); + g2d.setPaint(Color.WHITE); g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f)); g2d.fill(chartGlyph.getShape()); diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java index 3e79aca658..382d522a88 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java @@ -56,7 +56,7 @@ public class LabelBackgroundPane extends ConditionAttrSingleConditionPane{ gradientButton.setSelected(false); cardLayout.show(changeColorSetPane, "acc"); - colorGradient.getSelectColorPointBtnP1().setColorInner(Color.white); + colorGradient.getSelectColorPointBtnP1().setColorInner(Color.WHITE); colorGradient.getSelectColorPointBtnP2().setColorInner(Color.black);// 控件中的位置无效. } else { styleSelectBox.setSelectedIndex(styleSelectBox.getItemCount() - 1); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartPreFillStylePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartPreFillStylePane.java index cef26f779f..c5c59af4eb 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartPreFillStylePane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartPreFillStylePane.java @@ -44,7 +44,7 @@ public class ChartPreFillStylePane extends ChartFillStylePane { gradientButton.setSelected(false); cardLayout.show(changeColorSetPane, "acc"); - colorGradient.getSelectColorPointBtnP1().setColorInner(Color.white); + colorGradient.getSelectColorPointBtnP1().setColorInner(Color.WHITE); colorGradient.getSelectColorPointBtnP2().setColorInner(Color.black);// 控件中的位置无效. } else { int colorStyle = condition.getColorStyle(); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java index ec7798a7a7..a24b818346 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java @@ -522,14 +522,14 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { if(number != null) { double value = number.doubleValue(); if(value < forValue && value > backValue) { - setBackgroundUIColor(i,Color.white); + setBackgroundUIColor(i,Color.WHITE); } else { setBackgroundUIColor(i, Color.red); } forValue = value; }else{ //公式类型 - setBackgroundUIColor(i,Color.white); + setBackgroundUIColor(i,Color.WHITE); } } this.repaint(); diff --git a/designer_form/src/com/fr/design/designer/creator/FormCardPane.java b/designer_form/src/com/fr/design/designer/creator/FormCardPane.java index 5bf1606785..8f53ca5e81 100644 --- a/designer_form/src/com/fr/design/designer/creator/FormCardPane.java +++ b/designer_form/src/com/fr/design/designer/creator/FormCardPane.java @@ -47,7 +47,7 @@ public class FormCardPane extends JComponent implements SwingConstants { tabPane = new JPanel(); tabPane.setOpaque(true); tabPane.setBorder(BorderFactory.createLineBorder(Color.pink)); - tabPane.setBackground(Color.white); + tabPane.setBackground(Color.WHITE); } private void initCardComponent() { diff --git a/designer_form/src/com/fr/design/designer/creator/XIframeEditor.java b/designer_form/src/com/fr/design/designer/creator/XIframeEditor.java index c1b0356e9e..61ad25defd 100644 --- a/designer_form/src/com/fr/design/designer/creator/XIframeEditor.java +++ b/designer_form/src/com/fr/design/designer/creator/XIframeEditor.java @@ -62,7 +62,7 @@ public class XIframeEditor extends XWidgetCreator { UITextField address = new UITextField(); editor.add(address, BorderLayout.NORTH); JPanel contentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - contentPane.setBackground(Color.white); + contentPane.setBackground(Color.WHITE); editor.add(contentPane, BorderLayout.CENTER); } return editor; diff --git a/designer_form/src/com/fr/design/form/util/XCreatorConstants.java b/designer_form/src/com/fr/design/form/util/XCreatorConstants.java index 33aac54a86..91cd2007ed 100644 --- a/designer_form/src/com/fr/design/form/util/XCreatorConstants.java +++ b/designer_form/src/com/fr/design/form/util/XCreatorConstants.java @@ -26,7 +26,7 @@ public class XCreatorConstants { // 拖拽标识块的大小 public static final int RESIZE_BOX_SIZ = 5; // 拖拽的小方块的内部颜色 - public static final Color RESIZE_BOX_INNER_COLOR = Color.white; + public static final Color RESIZE_BOX_INNER_COLOR = Color.WHITE; // 拖拽的小方块的边框颜色 public static final Color RESIZE_BOX_BORDER_COLOR = new Color(143, 171, 196); // 当前选取的组件的边框线着色 diff --git a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java index 26f407702d..4c7c1d959e 100644 --- a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java +++ b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java @@ -849,7 +849,7 @@ public class LayoutBorderPane extends BasicPane { g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2d.setColor(lineColor); g2d.drawRoundRect(0, 0, width - 1, height - 1, 5, 5); - g2d.setColor(Color.white); + g2d.setColor(Color.WHITE); g2d.drawRoundRect(1, 1, width - 3, height - 3, 5, 5); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); } diff --git a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java index 9433cac780..ea75ee3df2 100644 --- a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java +++ b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java @@ -77,7 +77,7 @@ public class LayoutBorderPreviewPane extends JPanel{ Shape shape = new Rectangle2D.Double(smallGAP, smallGAP, this.getWidth() - GAP, this.getHeight() - GAP); background.paint(g, shape); } else { - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRect(smallGAP, smallGAP, this.getWidth() - GAP, this.getHeight() - GAP); } diff --git a/designer_form/src/com/fr/design/gui/xpane/ToolTipEditor.java b/designer_form/src/com/fr/design/gui/xpane/ToolTipEditor.java index 6fbc858b06..16b46cea2f 100644 --- a/designer_form/src/com/fr/design/gui/xpane/ToolTipEditor.java +++ b/designer_form/src/com/fr/design/gui/xpane/ToolTipEditor.java @@ -144,7 +144,7 @@ public class ToolTipEditor extends JWindow { public EditorChoosePane() { super(); - background = new GradientBackground(Color.white, new Color(234, 246, 254), GradientBackground.TOP2BOTTOM); + background = new GradientBackground(Color.WHITE, new Color(234, 246, 254), GradientBackground.TOP2BOTTOM); this.setLayout(new EditorLayout()); this.initComponents(); } diff --git a/designer_form/src/com/fr/design/mainframe/CoverPane.java b/designer_form/src/com/fr/design/mainframe/CoverPane.java index b6cdd472a2..9fed1ab7c3 100644 --- a/designer_form/src/com/fr/design/mainframe/CoverPane.java +++ b/designer_form/src/com/fr/design/mainframe/CoverPane.java @@ -89,7 +89,7 @@ public class CoverPane extends JPanel { Graphics2D g2d = (Graphics2D) g; Composite oldComposite = g2d.getComposite(); g2d.setComposite(composite); - g2d.setColor(Color.white); + g2d.setColor(Color.WHITE); g2d.fillRect(0, 0, getWidth(), getHeight()); g2d.setComposite(oldComposite); super.paint(g); diff --git a/designer_form/src/com/fr/design/mainframe/FormArea.java b/designer_form/src/com/fr/design/mainframe/FormArea.java index e51500a767..12188f2da0 100644 --- a/designer_form/src/com/fr/design/mainframe/FormArea.java +++ b/designer_form/src/com/fr/design/mainframe/FormArea.java @@ -88,7 +88,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent { this.designer.addMouseWheelListener(showValSpinnerMouseWheelListener); this.designer.addKeyListener(showValSpinnerKeyListener); this.setOpaque(true); - this.setBackground(Color.white); + this.setBackground(Color.WHITE); } diff --git a/designer_form/src/com/fr/design/mainframe/ShareWidgetButton.java b/designer_form/src/com/fr/design/mainframe/ShareWidgetButton.java index 12e5302b05..1c0e8603fa 100644 --- a/designer_form/src/com/fr/design/mainframe/ShareWidgetButton.java +++ b/designer_form/src/com/fr/design/mainframe/ShareWidgetButton.java @@ -64,7 +64,7 @@ public class ShareWidgetButton extends JPanel implements MouseListener, MouseMot Graphics2D g2d = (Graphics2D) g; Composite oldComposite = g2d.getComposite(); g2d.setComposite(composite); - g2d.setColor(Color.white); + g2d.setColor(Color.WHITE); g2d.fillRect(0, 0, getWidth(), getHeight()); g2d.setComposite(oldComposite); super.paint(g); diff --git a/designer_form/src/com/fr/design/mainframe/widget/editors/ColorTextField.java b/designer_form/src/com/fr/design/mainframe/widget/editors/ColorTextField.java index 70c12b5393..314a708dc0 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/editors/ColorTextField.java +++ b/designer_form/src/com/fr/design/mainframe/widget/editors/ColorTextField.java @@ -36,7 +36,7 @@ public class ColorTextField extends JComponent implements ITextComponent { public void paintComponent(Graphics g) { int width = getWidth(); int height = getHeight(); - g.setColor(Color.white); + g.setColor(Color.WHITE); g.fillRect(0, 0, width, height); int x = LEFT; int y = (height - BOX) / 2; @@ -110,7 +110,7 @@ public class ColorTextField extends JComponent implements ITextComponent { @Override public void setEditable(boolean editable) { textField.setEditable(editable); - textField.setBackground(Color.white); + textField.setBackground(Color.WHITE); } @Override diff --git a/designer_form/src/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java b/designer_form/src/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java index 624dc956ab..f25ed791a2 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java +++ b/designer_form/src/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java @@ -131,10 +131,10 @@ public class ElementCaseToolBarPane extends BasicBeanPane initLayoutTable(); JPanel center = FRGUIPaneFactory.createBorderLayout_S_Pane(); - center.setBackground(Color.white); + center.setBackground(Color.WHITE); center.add(topButton, BorderLayout.NORTH); JPanel small = FRGUIPaneFactory.createBorderLayout_S_Pane(); - small.setBackground(Color.white); + small.setBackground(Color.WHITE); small.add(new UILabel(StringUtils.BLANK), BorderLayout.NORTH); small.add(layoutTable, BorderLayout.CENTER); center.add(small, BorderLayout.CENTER); @@ -170,7 +170,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane layoutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); layoutTable.setColumnSelectionAllowed(false); layoutTable.setRowSelectionAllowed(false); - layoutTable.setBackground(Color.white); + layoutTable.setBackground(Color.WHITE); int columnWidth = Integer.parseInt(Inter.getLocText("FR-Designer_LayoutTable_Column_Width")); for (int i = 0; i < layoutTable.getColumnModel().getColumnCount(); i++) { layoutTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidth); diff --git a/designer_form/src/com/fr/design/mainframe/widget/editors/TextField.java b/designer_form/src/com/fr/design/mainframe/widget/editors/TextField.java index ec707037dd..f6b0b5cef2 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/editors/TextField.java +++ b/designer_form/src/com/fr/design/mainframe/widget/editors/TextField.java @@ -22,6 +22,6 @@ public class TextField extends UITextField implements ITextComponent { @Override public void setEditable(boolean b) { super.setEditable(b); - setBackground(Color.white); + setBackground(Color.WHITE); } } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/mainframe/widget/wrappers/ColorWrapper.java b/designer_form/src/com/fr/design/mainframe/widget/wrappers/ColorWrapper.java index efab85e91c..859b303986 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/wrappers/ColorWrapper.java +++ b/designer_form/src/com/fr/design/mainframe/widget/wrappers/ColorWrapper.java @@ -41,7 +41,7 @@ public class ColorWrapper implements Encoder, Decoder { } else if (txt.equals("red")) { return Color.red; } else if (txt.equals("white")) { - return Color.white; + return Color.WHITE; } else if (txt.equals("yellow")) { return Color.yellow; } @@ -82,7 +82,7 @@ public class ColorWrapper implements Encoder, Decoder { return "pink"; } else if (c.equals(Color.red)) { return "red"; - } else if (c.equals(Color.white)) { + } else if (c.equals(Color.WHITE)) { return "white"; } else if (c.equals(Color.yellow)) { return "yellow";