Browse Source

color

master
hzzz 7 years ago
parent
commit
e14f337294
  1. 2
      designer/src/com/fr/design/condition/BackPane.java
  2. 2
      designer/src/com/fr/design/mainframe/SheetNameTabPane.java
  3. 2
      designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java
  4. 10
      designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
  5. 2
      designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java
  6. 6
      designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java
  7. 2
      designer/src/com/fr/design/present/BarCodePane.java
  8. 2
      designer/src/com/fr/design/present/CurrencyLinePane.java
  9. 6
      designer/src/com/fr/design/webattr/ToolBarDragPane.java
  10. 6
      designer/src/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
  11. 8
      designer/src/com/fr/grid/DrawFlowRect.java
  12. 2
      designer/src/com/fr/grid/Grid.java
  13. 4
      designer/src/com/fr/grid/GridColumnUI.java
  14. 4
      designer/src/com/fr/grid/GridRowUI.java
  15. 2
      designer/src/com/fr/poly/PolyDesignUI.java
  16. 2
      designer/src/com/fr/poly/PolyDesigner.java
  17. 2
      designer/src/com/fr/poly/creator/BlockEditor.java
  18. 2
      designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java
  19. 6
      designer/src/com/fr/start/Designer.java
  20. 2
      designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java
  21. 6
      designer_base/src/com/fr/design/constants/UIConstants.java
  22. 2
      designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java
  23. 2
      designer_base/src/com/fr/design/gui/controlpane/UINameableListCellRenderer.java
  24. 4
      designer_base/src/com/fr/design/gui/date/UICalendarPanel.java
  25. 2
      designer_base/src/com/fr/design/gui/frpane/UITitlePanel.java
  26. 2
      designer_base/src/com/fr/design/gui/ibutton/UITabButton.java
  27. 2
      designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java
  28. 2
      designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java
  29. 7
      designer_base/src/com/fr/design/gui/iscrollbar/UIScrollButton.java
  30. 2
      designer_base/src/com/fr/design/gui/ispinner/UISpinner.java
  31. 2
      designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java
  32. 2
      designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java
  33. 4
      designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/ConfigurableCaret.java
  34. 4
      designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/FoldIndicator.java
  35. 4
      designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
  36. 2
      designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
  37. 2
      designer_base/src/com/fr/design/style/BorderPane.java
  38. 4
      designer_base/src/com/fr/design/style/background/BackgroundCustomJComponent.java
  39. 6
      designer_base/src/com/fr/design/style/background/gradient/GradientSelectBox.java
  40. 2
      designer_base/src/com/fr/design/style/background/impl/ColorBackgroundPane.java
  41. 2
      designer_base/src/com/fr/design/style/color/ColorCell.java
  42. 14
      designer_base/src/com/fr/design/style/color/ColorChooserPreview.java
  43. 2
      designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java
  44. 2
      designer_base/src/com/fr/design/style/color/DetailColorSelectPane.java
  45. 2
      designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java
  46. 2
      designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java
  47. 2
      designer_chart/src/com/fr/design/chart/gui/ChartComponent.java
  48. 2
      designer_chart/src/com/fr/design/chart/gui/active/ActiveGlyph.java
  49. 2
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java
  50. 4
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartAccColorPane.java
  51. 2
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java
  52. 2
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java
  53. 2
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartPreFillStylePane.java
  54. 4
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java
  55. 2
      designer_form/src/com/fr/design/designer/creator/FormCardPane.java
  56. 2
      designer_form/src/com/fr/design/designer/creator/XIframeEditor.java
  57. 2
      designer_form/src/com/fr/design/form/util/XCreatorConstants.java
  58. 2
      designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java
  59. 2
      designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java
  60. 2
      designer_form/src/com/fr/design/gui/xpane/ToolTipEditor.java
  61. 2
      designer_form/src/com/fr/design/mainframe/CoverPane.java
  62. 2
      designer_form/src/com/fr/design/mainframe/FormArea.java
  63. 2
      designer_form/src/com/fr/design/mainframe/ShareWidgetButton.java
  64. 4
      designer_form/src/com/fr/design/mainframe/widget/editors/ColorTextField.java
  65. 6
      designer_form/src/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java
  66. 2
      designer_form/src/com/fr/design/mainframe/widget/editors/TextField.java
  67. 4
      designer_form/src/com/fr/design/mainframe/widget/wrappers/ColorWrapper.java

2
designer/src/com/fr/design/condition/BackPane.java

@ -55,7 +55,7 @@ public class BackPane extends ConditionAttrSingleConditionPane<HighlightAction>
this.add(backgroundPreviewPane); this.add(backgroundPreviewPane);
this.add(editBackgroundButton); this.add(editBackgroundButton);
this.add(this.backScopeComboBox); this.add(this.backScopeComboBox);
this.backgroundPreviewPane.setBackgroundObject(ColorBackground.getInstance(Color.white)); this.backgroundPreviewPane.setBackgroundObject(ColorBackground.getInstance(Color.WHITE));
} }
@Override @Override

2
designer/src/com/fr/design/mainframe/SheetNameTabPane.java

@ -384,7 +384,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
if (isNeedPaintAuthority) { if (isNeedPaintAuthority) {
g2d.setPaint(new GradientPaint(1, 1, UIConstants.AUTHORITY_SHEET_LIGHT, 1, getHeight() - 1, UIConstants.AUTHORITY_SHEET_DARK)); g2d.setPaint(new GradientPaint(1, 1, UIConstants.AUTHORITY_SHEET_LIGHT, 1, getHeight() - 1, UIConstants.AUTHORITY_SHEET_DARK));
} else { } 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 generalPath = new GeneralPath(Path2D.WIND_EVEN_ODD, x.length);
generalPath.moveTo((float) x[0], (float) y[0]); generalPath.moveTo((float) x[0], (float) y[0]);

2
designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java

@ -32,7 +32,7 @@ public class ContentCellRender implements ListCellRenderer<Object> {
if (isSelected) { if (isSelected) {
String iconUrl = "/com/fr/design/mainframe/alphafine/images/selected" + model.getType().getTypeValue() + ".png"; String iconUrl = "/com/fr/design/mainframe/alphafine/images/selected" + model.getType().getTypeValue() + ".png";
panel.setBackground(AlphaFineConstants.BLUE); panel.setBackground(AlphaFineConstants.BLUE);
titleLabel.setForeground(Color.white); titleLabel.setForeground(Color.WHITE);
titleLabel.setIcon(new ImageIcon(IOUtils.readImage(iconUrl))); titleLabel.setIcon(new ImageIcon(IOUtils.readImage(iconUrl)));
} else { } else {
String iconUrl = "/com/fr/design/mainframe/alphafine/images/alphafine" + model.getType().getTypeValue() + ".png"; String iconUrl = "/com/fr/design/mainframe/alphafine/images/alphafine" + model.getType().getTypeValue() + ".png";

10
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"))); UILabel iconLabel = new UILabel(new ImageIcon(getClass().getResource("/com/fr/design/mainframe/alphafine/images/bigsearch.png")));
iconLabel.setPreferredSize(AlphaFineConstants.ICON_LABEL_SIZE); iconLabel.setPreferredSize(AlphaFineConstants.ICON_LABEL_SIZE);
iconLabel.setOpaque(true); iconLabel.setOpaque(true);
iconLabel.setBackground(Color.white); iconLabel.setBackground(Color.WHITE);
topPane.add(iconLabel, BorderLayout.WEST); topPane.add(iconLabel, BorderLayout.WEST);
topPane.add(searchTextField, BorderLayout.CENTER); topPane.add(searchTextField, BorderLayout.CENTER);
closeButton = new UIButton() { closeButton = new UIButton() {
@Override @Override
public void paintComponent(Graphics g) { public void paintComponent(Graphics g) {
g.setColor(Color.white); g.setColor(Color.WHITE);
g.fillRect(0, 0, getSize().width, getSize().height); g.fillRect(0, 0, getSize().width, getSize().height);
super.paintComponent(g); super.paintComponent(g);
} }
@ -171,7 +171,7 @@ public class AlphaFineDialog extends UIDialog {
searchTextField = new AlphaFineTextField(PLACE_HOLDER); searchTextField = new AlphaFineTextField(PLACE_HOLDER);
initTextFieldKeyListener(); initTextFieldKeyListener();
searchTextField.setFont(AlphaFineConstants.GREATER_FONT); searchTextField.setFont(AlphaFineConstants.GREATER_FONT);
searchTextField.setBackground(Color.white); searchTextField.setBackground(Color.WHITE);
searchTextField.setBorderPainted(false); searchTextField.setBorderPainted(false);
} }
@ -294,11 +294,11 @@ public class AlphaFineDialog extends UIDialog {
searchResultList.setCellRenderer(new ContentCellRender()); searchResultList.setCellRenderer(new ContentCellRender());
leftSearchResultPane = new UIScrollPane(searchResultList); leftSearchResultPane = new UIScrollPane(searchResultList);
leftSearchResultPane.setBackground(Color.white); leftSearchResultPane.setBackground(Color.WHITE);
leftSearchResultPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); leftSearchResultPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
leftSearchResultPane.setPreferredSize(new Dimension(AlphaFineConstants.LEFT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT)); leftSearchResultPane.setPreferredSize(new Dimension(AlphaFineConstants.LEFT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT));
rightSearchResultPane = new JPanel(); rightSearchResultPane = new JPanel();
rightSearchResultPane.setBackground(Color.white); rightSearchResultPane.setBackground(Color.WHITE);
UILabel splitLine = new UILabel(); UILabel splitLine = new UILabel();
splitLine.setBackground(AlphaFineConstants.GRAY); splitLine.setBackground(AlphaFineConstants.GRAY);
splitLine.setPreferredSize(new Dimension(1, AlphaFineConstants.CONTENT_HEIGHT)); splitLine.setPreferredSize(new Dimension(1, AlphaFineConstants.CONTENT_HEIGHT));

2
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) { public DocumentPreviewPane(String title, String summary) {
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBackground(Color.white); this.setBackground(Color.WHITE);
UITextArea titleArea = new UITextArea(title); UITextArea titleArea = new UITextArea(title);
UITextArea contentArea = new UITextArea(summary); UITextArea contentArea = new UITextArea(summary);
titleArea.setOpaque(false); titleArea.setOpaque(false);

6
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) { public PluginPreviewPane(String title, Image image, String version, String jartime, CellType type, int price) {
setLayout(new BorderLayout()); setLayout(new BorderLayout());
setBorder(BorderFactory.createEmptyBorder(50, 0, 0, 0)); setBorder(BorderFactory.createEmptyBorder(50, 0, 0, 0));
setBackground(Color.white); setBackground(Color.WHITE);
UILabel imageLabel = new UILabel(); UILabel imageLabel = new UILabel();
image = image.getScaledInstance(200, 200, Image.SCALE_SMOOTH); image = image.getScaledInstance(200, 200, Image.SCALE_SMOOTH);
imageLabel.setIcon(new ImageIcon(image)); imageLabel.setIcon(new ImageIcon(image));
@ -29,9 +29,9 @@ public class PluginPreviewPane extends JPanel {
line.setPreferredSize(new Dimension(200, 1)); line.setPreferredSize(new Dimension(200, 1));
line.setBackground(AlphaFineConstants.GRAY); line.setBackground(AlphaFineConstants.GRAY);
JPanel panel = new JPanel(new BorderLayout()); JPanel panel = new JPanel(new BorderLayout());
panel.setBackground(Color.white); panel.setBackground(Color.WHITE);
JPanel bottomPane = new JPanel(new BorderLayout()); JPanel bottomPane = new JPanel(new BorderLayout());
bottomPane.setBackground(Color.white); bottomPane.setBackground(Color.WHITE);
bottomPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); bottomPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
if (type == CellType.PLUGIN) { if (type == CellType.PLUGIN) {
UILabel versionLabel = new UILabel("V" + version); UILabel versionLabel = new UILabel("V" + version);

2
designer/src/com/fr/design/present/BarCodePane.java

@ -302,7 +302,7 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
private Object obj; private Object obj;
public BarCodePreviewPane() { public BarCodePreviewPane() {
// setBackground(Color.white); // setBackground(Color.WHITE);
} }
/** /**

2
designer/src/com/fr/design/present/CurrencyLinePane.java

@ -154,7 +154,7 @@ public class CurrencyLinePane extends FurtherBasicBeanPane<CurrencyLinePresent>
CurrencyLineAttr currencyLineAttr; CurrencyLineAttr currencyLineAttr;
public CurrencyLinePreviewPane() { public CurrencyLinePreviewPane() {
// setBackground(Color.white); // setBackground(Color.WHITE);
} }
public void setObject(String text, CurrencyLineAttr currencyLineAttr) { public void setObject(String text, CurrencyLineAttr currencyLineAttr) {

6
designer/src/com/fr/design/webattr/ToolBarDragPane.java

@ -130,10 +130,10 @@ public class ToolBarDragPane extends WidgetToolBarPane {
initLayoutTable(); initLayoutTable();
JPanel center = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel center = FRGUIPaneFactory.createBorderLayout_S_Pane();
center.setBackground(Color.white); center.setBackground(Color.WHITE);
center.add(topButton, BorderLayout.NORTH); center.add(topButton, BorderLayout.NORTH);
JPanel small = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel small = FRGUIPaneFactory.createBorderLayout_S_Pane();
small.setBackground(Color.white); small.setBackground(Color.WHITE);
small.add(new UILabel(StringUtils.BLANK), BorderLayout.NORTH); small.add(new UILabel(StringUtils.BLANK), BorderLayout.NORTH);
small.add(layoutTable, BorderLayout.CENTER); small.add(layoutTable, BorderLayout.CENTER);
center.add(small, BorderLayout.CENTER); center.add(small, BorderLayout.CENTER);
@ -168,7 +168,7 @@ public class ToolBarDragPane extends WidgetToolBarPane {
layoutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); layoutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
layoutTable.setColumnSelectionAllowed(false); layoutTable.setColumnSelectionAllowed(false);
layoutTable.setRowSelectionAllowed(false); layoutTable.setRowSelectionAllowed(false);
layoutTable.setBackground(Color.white); layoutTable.setBackground(Color.WHITE);
int columnWidth = Integer.parseInt(Inter.getLocText("FR-Designer_LayoutTable_Column_Width")); int columnWidth = Integer.parseInt(Inter.getLocText("FR-Designer_LayoutTable_Column_Width"));
for (int i = 0; i < layoutTable.getColumnModel().getColumnCount(); i++) { for (int i = 0; i < layoutTable.getColumnModel().getColumnCount(); i++) {
layoutTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidth); layoutTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidth);

6
designer/src/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@ -517,7 +517,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
if (row == SmartJTablePane4DB.this.editingRowIndex) { if (row == SmartJTablePane4DB.this.editingRowIndex) {
this.setBackground(java.awt.Color.cyan); this.setBackground(java.awt.Color.cyan);
} else { } else {
this.setBackground(java.awt.Color.white); this.setBackground(java.awt.Color.WHITE);
} }
return this; return this;
@ -550,7 +550,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
if (row == SmartJTablePane4DB.this.editingRowIndex) { if (row == SmartJTablePane4DB.this.editingRowIndex) {
pane.setBackground(java.awt.Color.cyan); pane.setBackground(java.awt.Color.cyan);
} else { } else {
pane.setBackground(java.awt.Color.white); pane.setBackground(java.awt.Color.WHITE);
} }
pane.setToolTipText(tip); pane.setToolTipText(tip);
@ -585,7 +585,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
if (row == SmartJTablePane4DB.this.editingRowIndex) { if (row == SmartJTablePane4DB.this.editingRowIndex) {
this.setBackground(java.awt.Color.cyan); this.setBackground(java.awt.Color.cyan);
} else { } else {
this.setBackground(java.awt.Color.white); this.setBackground(java.awt.Color.WHITE);
} }
return this; return this;

8
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, y, width, y);
//第二根线同上 //第二根线同上
g.drawLine(x-1, y-1, width, y-1); g.drawLine(x-1, y-1, width, y-1);
g.setColor(Color.white); g.setColor(Color.WHITE);
//第一根白色虚线 //第一根白色虚线
drawFlowLine(g, x, y, width, y); drawFlowLine(g, x, y, width, y);
isReal = oldisReal; //还原 数据 isReal = oldisReal; //还原 数据
@ -101,7 +101,7 @@ public class DrawFlowRect implements Runnable {
g.setColor(Color.black); //右 g.setColor(Color.black); //右
g.drawLine(width, y, width, height); g.drawLine(width, y, width, height);
g.drawLine(width-1, y-1, width-1, height); g.drawLine(width-1, y-1, width-1, height);
g.setColor(Color.white); g.setColor(Color.WHITE);
isReal = oldisReal; //还原 数据 isReal = oldisReal; //还原 数据
lenReal = oldlenReal; lenReal = oldlenReal;
drawFlowLine(g, width, y, width, height); drawFlowLine(g, width, y, width, height);
@ -115,7 +115,7 @@ public class DrawFlowRect implements Runnable {
g.setColor(Color.black); //左 g.setColor(Color.black); //左
g.drawLine(x, height, x, y); g.drawLine(x, height, x, y);
g.drawLine(x+1, height-1, x+1, y); g.drawLine(x+1, height-1, x+1, y);
g.setColor(Color.white); g.setColor(Color.WHITE);
isReal = oldisReal; //还原 数据 isReal = oldisReal; //还原 数据
lenReal = oldlenReal; lenReal = oldlenReal;
drawFlowLine(g, x, height, x, y ); drawFlowLine(g, x, height, x, y );
@ -128,7 +128,7 @@ public class DrawFlowRect implements Runnable {
g.setColor(Color.black); //下 g.setColor(Color.black); //下
g.drawLine(width, height, x, height); g.drawLine(width, height, x, height);
g.drawLine(width+1, height+1, x, height+1); g.drawLine(width+1, height+1, x, height+1);
g.setColor(Color.white); g.setColor(Color.WHITE);
isReal = oldisReal; //还原 数据 isReal = oldisReal; //还原 数据
lenReal = oldlenReal; lenReal = oldlenReal;
drawFlowLine(g, width, height, x, height); drawFlowLine(g, width, height, x, height);

2
designer/src/com/fr/grid/Grid.java

@ -57,7 +57,7 @@ public class Grid extends BaseGridComponent {
transient private TemplateCellElement editingCellElement; transient private TemplateCellElement editingCellElement;
private boolean showGridLine = true; 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 boolean isShowPaginateLine = true;
private Color paginationLineColor = Color.RED; // line color of paper private Color paginationLineColor = Color.RED; // line color of paper

4
designer/src/com/fr/grid/GridColumnUI.java

@ -27,7 +27,7 @@ import com.fr.report.elementcase.ElementCase;
* @since 2012-3-22下午5:51:10 * @since 2012-3-22下午5:51:10
*/ */
public class GridColumnUI extends ComponentUI { public class GridColumnUI extends ComponentUI {
protected Color withoutDetailsBackground = new Color(0xF0F0F3); protected Color withoutDetailsBackground = new Color(0xf0f0f3);
private int resolution ; private int resolution ;
public GridColumnUI(int resolution){ public GridColumnUI(int resolution){
@ -70,7 +70,7 @@ public class GridColumnUI extends ComponentUI {
if (gridColumn.getBackground() != null) { if (gridColumn.getBackground() != null) {
g2d.setPaint(this.withoutDetailsBackground); g2d.setPaint(this.withoutDetailsBackground);
GraphHelper.fill(g2d, new Rectangle2D.Double(0, 0, columnLeftWidth, size.getHeight())); 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())); GraphHelper.fill(g2d, new Rectangle2D.Double(columnLeftWidth, 0, size.getWidth() - columnLeftWidth, size.getHeight()));
} }
// draw left border line. // draw left border line.

4
designer/src/com/fr/grid/GridRowUI.java

@ -26,7 +26,7 @@ import com.fr.report.elementcase.ElementCase;
* @since 2012-3-22下午5:54:21 * @since 2012-3-22下午5:54:21
*/ */
public class GridRowUI extends ComponentUI { public class GridRowUI extends ComponentUI {
private Color detailsBackground = new Color(0xF0F0F3); private Color detailsBackground = new Color(0xf0f0f3);
private int resolution ; private int resolution ;
GridRowUI(int resolution){ GridRowUI(int resolution){
@ -69,7 +69,7 @@ public class GridRowUI extends ComponentUI {
if (gridRow.getBackground() != null) { if (gridRow.getBackground() != null) {
g2d.setPaint(this.detailsBackground); g2d.setPaint(this.detailsBackground);
GraphHelper.fill(g2d, new Rectangle2D.Double(0, 0, size.getWidth(), rowTopHeight)); 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)); GraphHelper.fill(g2d, new Rectangle2D.Double(0, rowTopHeight, size.getHeight(), size.getHeight() - rowTopHeight));
} }
// draw top border line. // draw top border line.

2
designer/src/com/fr/poly/PolyDesignUI.java

@ -76,7 +76,7 @@ public class PolyDesignUI extends ComponentUI {
Graphics2D g2d = (Graphics2D) g; Graphics2D g2d = (Graphics2D) g;
Dimension d = c.getSize(); Dimension d = c.getSize();
TemplateReport report = designer.getTemplateReport(); TemplateReport report = designer.getTemplateReport();
g2d.setPaint(Color.white); g2d.setPaint(Color.WHITE);
GraphHelper.fillRect(g, 0, 0, d.width, d.height); GraphHelper.fillRect(g, 0, 0, d.width, d.height);
ReportSettingsProvider rs = report.getReportSettings(); ReportSettingsProvider rs = report.getReportSettings();
if (rs != null) { if (rs != null) {

2
designer/src/com/fr/poly/PolyDesigner.java

@ -152,7 +152,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
ployareaPane.add(PolyDesignerLayout.VRuler, new VerticalRuler(this)); ployareaPane.add(PolyDesignerLayout.VRuler, new VerticalRuler(this));
ployareaPane.add(PolyDesignerLayout.HRuler, new HorizontalRuler(this)); ployareaPane.add(PolyDesignerLayout.HRuler, new HorizontalRuler(this));
ployareaPane.setBackground(Color.white); ployareaPane.setBackground(Color.WHITE);
this.add(ployareaPane, BorderLayout.CENTER); this.add(ployareaPane, BorderLayout.CENTER);
this.add(polyComponetsBar, BorderLayout.WEST); this.add(polyComponetsBar, BorderLayout.WEST);
this.addKeyListener(showValSpinnerKeyListener); this.addKeyListener(showValSpinnerKeyListener);

2
designer/src/com/fr/poly/creator/BlockEditor.java

@ -59,7 +59,7 @@ public abstract class BlockEditor<T extends JComponent,U extends TemplateBlock>
this.initDataChangeListener(); this.initDataChangeListener();
} }
protected void initComponets(){ protected void initComponets(){
this.setBackground(Color.white); this.setBackground(Color.WHITE);
this.setOpaque(false); this.setOpaque(false);
this.setLayout(new BlockEditorLayout()); this.setLayout(new BlockEditorLayout());
editComponent = createEffective(); editComponent = createEffective();

2
designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java

@ -50,7 +50,7 @@ public class FloatStringQuickEditor extends FloatQuickEditor {
stringTextField.setWrapStyleWord(true); stringTextField.setWrapStyleWord(true);
stringTextField.setMargin(new Insets(5, 5, 5, 5)); stringTextField.setMargin(new Insets(5, 5, 5, 5));
stringTextField.setBorder(BorderFactory.createLineBorder(Color.gray)); stringTextField.setBorder(BorderFactory.createLineBorder(Color.gray));
stringTextField.setBackground(Color.white); stringTextField.setBackground(Color.WHITE);
} }
ActionListener getFormulaActionListener = new ActionListener() { ActionListener getFormulaActionListener = new ActionListener() {

6
designer/src/com/fr/start/Designer.java

@ -139,7 +139,7 @@ public class Designer extends BaseDesigner {
return dim; return dim;
} }
}; };
templeJpanel.setBackground(Color.white); templeJpanel.setBackground(Color.WHITE);
largeToolbar.add(templeJpanel); largeToolbar.add(templeJpanel);
createRunButton(largeToolbar); createRunButton(largeToolbar);
largeToolbar.add(run); largeToolbar.add(run);
@ -150,7 +150,7 @@ public class Designer extends BaseDesigner {
return dim; return dim;
} }
}; };
templeJpanel.setBackground(Color.white); templeJpanel.setBackground(Color.WHITE);
largeToolbar.add(templeJpanel); largeToolbar.add(templeJpanel);
largeToolbar.setBorder(new MatteBorder(new Insets(0, 0, 1, 0), UIConstants.LINE_COLOR)); largeToolbar.setBorder(new MatteBorder(new Insets(0, 0, 1, 0), UIConstants.LINE_COLOR));
return largeToolbar; return largeToolbar;
@ -263,7 +263,7 @@ public class Designer extends BaseDesigner {
run.set4Toolbar(); run.set4Toolbar();
run.getUpButton().setToolTipText(Inter.getLocText("FR-Designer_Preview")); run.getUpButton().setToolTipText(Inter.getLocText("FR-Designer_Preview"));
run.getDownButton().setToolTipText(Inter.getLocText("FR-Designer_Dropdown-More-Preview")); run.getDownButton().setToolTipText(Inter.getLocText("FR-Designer_Dropdown-More-Preview"));
run.setBackground(Color.white); run.setBackground(Color.WHITE);
} }
@Override @Override

2
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 = new UILabel(Inter.getLocText("FR-Designer-Alphafine_No_Remind"));
noRemindLabel.setFont(MEDIUM_FONT); noRemindLabel.setFont(MEDIUM_FONT);
noRemindLabel.setForeground(Color.white); noRemindLabel.setForeground(Color.WHITE);
checkLabel = new UILabel(); checkLabel = new UILabel();
checkLabel.setIcon(unCheckIcon); checkLabel.setIcon(unCheckIcon);
checkLabel.addMouseListener(new MouseAdapter() { checkLabel.addMouseListener(new MouseAdapter() {

6
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_DARK = new Color(86, 120, 143);
public static final Color AUTHORITY_SHEET_LIGHT = new Color(156, 204, 238); 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 AUTHORITY_SHEET_UNSELECTED = new Color(146, 192, 225);
public static final Color ATTRIBUTE_PRESS = new Color(0xdfecfc); public static final Color ATTRIBUTE_PRESS = new Color(0xD8F2FD);
public static final Color ATTRIBUTE_NORMAL = new Color(0xe2e2e2); public static final Color ATTRIBUTE_NORMAL = new Color(0xDADADD);
public static final Color ATTRIBUTE_HOVER = new Color(0xd3d3d3); public static final Color ATTRIBUTE_HOVER = new Color(0xC9C9CD);
public static final Color CHECKBOX_HOVER_SELECTED = new Color(0x3394f0); 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 TEXT_FILED_BORDER_SELECTED = new Color(0x3384f0);
public static final Color SHEET_NORMAL = new Color(0xc8c8ca); public static final Color SHEET_NORMAL = new Color(0xc8c8ca);

2
designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java

@ -142,7 +142,7 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
@Override @Override
public void paint(Graphics g, JComponent c) { public void paint(Graphics g, JComponent c) {
Graphics2D g2 = (Graphics2D) g; Graphics2D g2 = (Graphics2D) g;
g2.setColor(Color.white); g2.setColor(Color.WHITE);
g2.fillRect(0, 0, c.getWidth(), c.getHeight()); g2.fillRect(0, 0, c.getWidth(), c.getHeight());
} }
}); });

2
designer_base/src/com/fr/design/gui/controlpane/UINameableListCellRenderer.java

@ -90,7 +90,7 @@ public class UINameableListCellRenderer extends
if (isSelected) { if (isSelected) {
setBackground(bg == null ? list.getSelectionBackground() : bg); setBackground(bg == null ? list.getSelectionBackground() : bg);
setForeground(fg == null ? list.getSelectionForeground() : fg); setForeground(fg == null ? list.getSelectionForeground() : fg);
label.setForeground(Color.white); label.setForeground(Color.WHITE);
editButton.setIcon(UIConstants.LIST_EDIT_WHITE_ICON); editButton.setIcon(UIConstants.LIST_EDIT_WHITE_ICON);
} }
else { else {

4
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); this.getComponent(selectedIndex).setForeground(Color.black);
} }
if (index != -1 && index < getComponentCount()) { if (index != -1 && index < getComponentCount()) {
this.getComponent(index).setForeground(Color.white); this.getComponent(index).setForeground(Color.WHITE);
} }
this.selectedIndex = index; this.selectedIndex = index;
repaint(); repaint();
@ -716,7 +716,7 @@ public class UICalendarPanel extends JPanel {
Graphics2D g2d = (Graphics2D)g; Graphics2D g2d = (Graphics2D)g;
if (isRolOver) { if (isRolOver) {
Shape shape = new RoundRectangle2D.Double(1, 1, 86, 15, UIConstants.ARC, UIConstants.ARC); 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 { } else {
GUIPaintUtils.drawBorder(g2d, 0, 0, 101, 18, true, 3); GUIPaintUtils.drawBorder(g2d, 0, 0, 101, 18, true, 3);
} }

2
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) { public UITitlePanel(JPanel contentPanel, String title) {
JPanel TitleBar = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel TitleBar = FRGUIPaneFactory.createBorderLayout_S_Pane();
TitleBar.setBackground(new Color(148, 148, 148)); 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))); TitleBar.setBorder(BorderFactory.createMatteBorder(1, 0, 1, 0, new Color(85, 85, 85)));
UILabel titlelabel = new UILabel(" " + title); UILabel titlelabel = new UILabel(" " + title);

2
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); GradientPaint gp = new GradientPaint(1, 1, darkColor, 1, 5, lightColor);
g2d.setPaint(gp); g2d.setPaint(gp);
g2d.fillRect(0, 0, w - 1, h); g2d.fillRect(0, 0, w - 1, h);
this.setForeground(Color.white); this.setForeground(Color.WHITE);
} else if (!isSelected() && isRollover) { } else if (!isSelected() && isRollover) {
Color blue = UIConstants.LIGHT_BLUE; Color blue = UIConstants.LIGHT_BLUE;
g2d.setColor(blue); g2d.setColor(blue);

2
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 (hasFocus && !isPopupVisible(comboBox)) {
if (comboBox.isEnabled()) { if (comboBox.isEnabled()) {
c.setForeground(Color.black); c.setForeground(Color.black);
c.setBackground(Color.white); c.setBackground(Color.WHITE);
} else { } else {
c.setForeground(DefaultLookup.getColor( c.setForeground(DefaultLookup.getColor(
comboBox, this, "ComboBox.disabledForeground", comboBox.getForeground())); comboBox, this, "ComboBox.disabledForeground", comboBox.getForeground()));

2
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); UIEastResizableContainer bb = new UIEastResizableContainer(leftPane, rightPane);
JPanel cc = new JPanel(); JPanel cc = new JPanel();
cc.setBackground(Color.white); cc.setBackground(Color.WHITE);
content.add(bb, BorderLayout.EAST); content.add(bb, BorderLayout.EAST);
content.add(cc, BorderLayout.CENTER); content.add(cc, BorderLayout.CENTER);

7
designer_base/src/com/fr/design/gui/iscrollbar/UIScrollButton.java

@ -110,15 +110,8 @@ public class UIScrollButton extends BasicArrowButton {
} else { } else {
scrollBarBg = new GradientPaint(1, 1, new Color(0xffffff), 1, 16, new Color(0xffffff)); 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.setPaint(scrollBarBg);
g2.fillRoundRect(1, 1, 16, 16, 0, 0); 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; break;
} }
// dispose of image graphics // dispose of image graphics

2
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); g2d.fillRoundRect(1, 1, width - 2, height - 2, UIConstants.ARC, UIConstants.ARC);
if (isRollOver && isEnabled()) { if (isRollOver && isEnabled()) {
Shape shape = new RoundRectangle2D.Double(1, 1, width - 3, height - 3, UIConstants.ARC, UIConstants.ARC); 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 { } else {
g2d.setColor(UIConstants.LINE_COLOR); g2d.setColor(UIConstants.LINE_COLOR);
g2d.drawRoundRect(1, 1, width - 2, height - 2, UIConstants.ARC, UIConstants.ARC); g2d.drawRoundRect(1, 1, width - 2, height - 2, UIConstants.ARC, UIConstants.ARC);

2
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); g2d.clearRect(0, 0, width, height);
if(isRollOver && textField.isEnabled() && ((UITextArea)textField).isEditable()) { if(isRollOver && textField.isEnabled() && ((UITextArea)textField).isEditable()) {
Shape shape = new RoundRectangle2D.Double(1, 1, width - 3, height - 3, UIConstants.ARC, UIConstants.ARC); 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 { } else {
g2d.setColor(UIConstants.LINE_COLOR); g2d.setColor(UIConstants.LINE_COLOR);
g2d.drawRoundRect(1, 1, width - 2, height - 2, UIConstants.ARC, UIConstants.ARC); g2d.drawRoundRect(1, 1, width - 2, height - 2, UIConstants.ARC, UIConstants.ARC);

2
designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java

@ -20,7 +20,7 @@ public class UITextFieldUI extends BasicTextFieldUI {
protected boolean isRollOver; protected boolean isRollOver;
private JComponent textField; private JComponent textField;
private Color backgroundColor = Color.white; private Color backgroundColor = Color.WHITE;
public UITextFieldUI(final JComponent textField) { public UITextFieldUI(final JComponent textField) {
super(); super();

4
designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/ConfigurableCaret.java

@ -422,7 +422,7 @@ public class ConfigurableCaret extends DefaultCaret {
case BLOCK_STYLE: case BLOCK_STYLE:
Color textAreaBg = textArea.getBackground(); Color textAreaBg = textArea.getBackground();
if (textAreaBg==null) { if (textAreaBg==null) {
textAreaBg = Color.white; textAreaBg = Color.WHITE;
} }
g.setXORMode(textAreaBg); g.setXORMode(textAreaBg);
// fills x==r.x to x==(r.x+(r.width)-1), inclusive. // fills x==r.x to x==(r.x+(r.width)-1), inclusive.
@ -439,7 +439,7 @@ public class ConfigurableCaret extends DefaultCaret {
case UNDERLINE_STYLE: case UNDERLINE_STYLE:
textAreaBg = textArea.getBackground(); textAreaBg = textArea.getBackground();
if (textAreaBg==null) { if (textAreaBg==null) {
textAreaBg = Color.white; textAreaBg = Color.WHITE;
} }
g.setXORMode(textAreaBg); g.setXORMode(textAreaBg);
int y = r.y + r.height; int y = r.y + r.height;

4
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. * 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. * Listens for events in this component.
@ -128,7 +128,7 @@ public class FoldIndicator extends AbstractGutterComponent {
public JToolTip createToolTip() { public JToolTip createToolTip() {
JToolTip tip = super.createToolTip(); JToolTip tip = super.createToolTip();
Color textAreaBG = textArea.getBackground(); Color textAreaBG = textArea.getBackground();
if (textAreaBG!=null && !Color.white.equals(textAreaBG)) { if (textAreaBG!=null && !Color.WHITE.equals(textAreaBG)) {
Color bg = TipUtil.getToolTipBackground(); Color bg = TipUtil.getToolTipBackground();
// If current L&F's tool tip color is close enough to "yellow", // 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 // and we're not using the default text background of white, use

4
designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

@ -337,7 +337,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
JPanel cc = new JPanel(); JPanel cc = new JPanel();
cc.setBackground(Color.white); cc.setBackground(Color.WHITE);
// JPanel leftPane = new JPanel(); // JPanel leftPane = new JPanel();
// leftPane.setBackground(Color.yellow); // leftPane.setBackground(Color.yellow);
// JPanel rightPane = new JPanel(); // JPanel rightPane = new JPanel();
@ -812,7 +812,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
super(); super();
this.propertyItem = propertyItem; this.propertyItem = propertyItem;
this.title = propertyItem.getTitle(); this.title = propertyItem.getTitle();
originColor = Color.white; originColor = Color.WHITE;
setBackground(originColor); setBackground(originColor);
setLayout(new BorderLayout()); setLayout(new BorderLayout());
UILabel label = new UILabel(title); UILabel label = new UILabel(title);

2
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)); this.setPreferredSize(new Dimension(super.getPreferredSize().width, 150));
jTextArea.setEditable(false); jTextArea.setEditable(false);
jTextArea.setBackground(Color.white); jTextArea.setBackground(Color.WHITE);
popup = new JPopupMenu(); popup = new JPopupMenu();
selectAll = new UIMenuItem(Inter.getLocText("FR-Designer_Select_All")); selectAll = new UIMenuItem(Inter.getLocText("FR-Designer_Select_All"));

2
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 // Paint the background component which depends on cell set case
public void paint(Graphics g) { public void paint(Graphics g) {
// background // background
g.setColor(Color.white); g.setColor(Color.WHITE);
g.fillRect(0, 0, getWidth() - 1, getHeight() - 1); g.fillRect(0, 0, getWidth() - 1, getHeight() - 1);
// borders // borders

4
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(13, 12);
path.lineTo(19, 7); path.lineTo(19, 7);
path.closePath(); path.closePath();
g2d.setColor(Color.white); g2d.setColor(Color.WHITE);
g2d.fill(path); g2d.fill(path);
g2d.setColor(Color.gray); g2d.setColor(Color.gray);
g2d.draw(path); g2d.draw(path);
@ -54,7 +54,7 @@ public class BackgroundCustomJComponent extends BackgroundJComponent {
path.lineTo(7, 12); path.lineTo(7, 12);
path.lineTo(1, 7); path.lineTo(1, 7);
path.closePath(); path.closePath();
g2d.setColor(Color.white); g2d.setColor(Color.WHITE);
g2d.fill(path); g2d.fill(path);
g2d.setColor(Color.gray); g2d.setColor(Color.gray);
g2d.draw(path); g2d.draw(path);

6
designer_base/src/com/fr/design/style/background/gradient/GradientSelectBox.java

@ -26,7 +26,7 @@ public class GradientSelectBox extends BasicPane {
private BackgroundJComponent displayComponent; private BackgroundJComponent displayComponent;
private Color startColor = Color.black; private Color startColor = Color.black;
private Color endColor = Color.white; private Color endColor = Color.WHITE;
public GradientSelectBox() { public GradientSelectBox() {
this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0)); this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
@ -35,11 +35,11 @@ public class GradientSelectBox extends BasicPane {
startBox.setSelectObject(Color.black); startBox.setSelectObject(Color.black);
this.add(displayComponent = new BackgroundJComponent()); 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)); displayComponent.setPreferredSize(new Dimension(80, 15));
this.add(endBox = new CustomSelectBox(Constants.RIGHT)); this.add(endBox = new CustomSelectBox(Constants.RIGHT));
endBox.setSelectObject(Color.white); endBox.setSelectObject(Color.WHITE);
startBox.addSelectChangeListener(new ChangeListener() { startBox.addSelectChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {

2
designer_base/src/com/fr/design/style/background/impl/ColorBackgroundPane.java

@ -28,7 +28,7 @@ public class ColorBackgroundPane extends BackgroundDetailPane {
ColorBackground colorBackgroud = (ColorBackground) background; ColorBackground colorBackgroud = (ColorBackground) background;
this.detailColorSelectPane.populate(colorBackgroud.getColor()); this.detailColorSelectPane.populate(colorBackgroud.getColor());
} else { } else {
this.detailColorSelectPane.populate(Color.white); this.detailColorSelectPane.populate(Color.WHITE);
} }
} }

2
designer_base/src/com/fr/design/style/color/ColorCell.java

@ -65,7 +65,7 @@ public class ColorCell extends JComponent implements ColorSelectable {
// transparent // transparent
if (color == null) { if (color == null) {
g.setColor(Color.white); g.setColor(Color.WHITE);
g.fillRect(b.left, b.top, d.width - b.left - b.right, g.fillRect(b.left, b.top, d.width - b.left - b.right,
d.height - b.top - b.bottom); d.height - b.top - b.bottom);
g.setColor(Color.gray); g.setColor(Color.gray);

14
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) { private int paintSwatch(Graphics g, int offsetX) {
int swatchX = offsetX; int swatchX = offsetX;
g.setColor(Color.white); g.setColor(Color.WHITE);
g.fillRect(swatchX, 0, SWATH_WIDTH, (SQUARE_SIZE) + (SQUARE_GAP / 2)); g.fillRect(swatchX, 0, SWATH_WIDTH, (SQUARE_SIZE) + (SQUARE_GAP / 2));
g.setColor(myColor); g.setColor(myColor);
g.fillRect(swatchX, (SQUARE_SIZE) + (SQUARE_GAP / 2), SWATH_WIDTH, (SQUARE_SIZE) + (SQUARE_GAP / 2) ); 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); 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); g.fillRect(textXOffset, (height + TEXT_GAP) * 2, width + TEXT_GAP, height + 2);
@ -149,11 +149,11 @@ public class ColorChooserPreview extends JPanel {
int squareXOffset = offsetX; int squareXOffset = offsetX;
Color color = myColor; Color color = myColor;
/** 方形预览框第1列第1行:从外到内(white,color,white) */ /** 方形预览框第1列第1行:从外到内(white,color,white) */
g.setColor(Color.white); g.setColor(Color.WHITE);
g.fillRect(squareXOffset, 0, SQUARE_SIZE, SQUARE_SIZE); g.fillRect(squareXOffset, 0, SQUARE_SIZE, SQUARE_SIZE);
g.setColor(color); g.setColor(color);
g.fillRect(squareXOffset + INNER_GAP, INNER_GAP, SQUARE_SIZE - INNER_GAP2, SQUARE_SIZE - INNER_GAP2); 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.fillRect(squareXOffset+INNER_GAP2, INNER_GAP2, SQUARE_SIZE - INNER_GAP3, SQUARE_SIZE - INNER_GAP3);
/** 方形预览框第1列第2行:color全色 */ /** 方形预览框第1列第2行:color全色 */
g.setColor(color); g.setColor(color);
@ -164,19 +164,19 @@ public class ColorChooserPreview extends JPanel {
g.fillRect(squareXOffset, 0, SQUARE_SIZE, SQUARE_SIZE); g.fillRect(squareXOffset, 0, SQUARE_SIZE, SQUARE_SIZE);
g.setColor(color); g.setColor(color);
g.fillRect(squareXOffset + INNER_GAP, INNER_GAP, SQUARE_SIZE - INNER_GAP2, SQUARE_SIZE - INNER_GAP2); 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.fillRect(squareXOffset + INNER_GAP2, INNER_GAP2, SQUARE_SIZE - INNER_GAP3, SQUARE_SIZE - INNER_GAP3);
g.translate(-(SQUARE_SIZE + SQUARE_GAP), 0); g.translate(-(SQUARE_SIZE + SQUARE_GAP), 0);
/** 方形预览框第2列第2行:从外到内(white,color) */ /** 方形预览框第2列第2行:从外到内(white,color) */
g.translate(SQUARE_SIZE + SQUARE_GAP, SQUARE_SIZE + SQUARE_GAP); 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.fillRect(squareXOffset,0,SQUARE_SIZE,SQUARE_SIZE);
g.setColor(color); g.setColor(color);
g.fillRect(squareXOffset + INNER_GAP, INNER_GAP, SQUARE_SIZE - INNER_GAP2, SQUARE_SIZE - INNER_GAP2); 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)); g.translate(-(SQUARE_SIZE + SQUARE_GAP), -(SQUARE_SIZE + SQUARE_GAP));
/** 方形预览框第3列第1行:从外到内(white,color,black) */ /** 方形预览框第3列第1行:从外到内(white,color,black) */
g.translate((SQUARE_SIZE + SQUARE_GAP) * 2, 0); 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.fillRect(squareXOffset, 0, SQUARE_SIZE,SQUARE_SIZE);
g.setColor(color); g.setColor(color);
g.fillRect(squareXOffset + INNER_GAP, INNER_GAP, SQUARE_SIZE - INNER_GAP2, SQUARE_SIZE - INNER_GAP2); g.fillRect(squareXOffset + INNER_GAP, INNER_GAP, SQUARE_SIZE - INNER_GAP2, SQUARE_SIZE - INNER_GAP2);

2
designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java

@ -48,7 +48,7 @@ public class ColorSelectDetailPane extends BasicPane {
public ColorSelectDetailPane(Color color) { public ColorSelectDetailPane(Color color) {
if (color == null) { if (color == null) {
color = Color.white; color = Color.WHITE;
} }
this.color = color; this.color = color;
initComponents(); initComponents();

2
designer_base/src/com/fr/design/style/color/DetailColorSelectPane.java

@ -78,7 +78,7 @@ public class DetailColorSelectPane extends BasicPane {
this.addChangeListener(colorPreviewLabelChangeListener); this.addChangeListener(colorPreviewLabelChangeListener);
//use the white as the default color. //use the white as the default color.
this.populate(Color.white); this.populate(Color.WHITE);
} }
@Override @Override

2
designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java

@ -57,7 +57,7 @@ public class PickColorButtonFactory {
public void paint(Graphics g, JComponent c) { public void paint(Graphics g, JComponent c) {
super.paint(g, c); super.paint(g, c);
Dimension size = c.getSize(); 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.fillRoundRect(0, 0, size.width - 1, size.height - 1, 1, 1);
g.setColor(new Color(153, 153, 153)); // #999999 g.setColor(new Color(153, 153, 153)); // #999999
g.drawRoundRect(0, 0, size.width - 1, size.height - 1, 1, 1); g.drawRoundRect(0, 0, size.width - 1, size.height - 1, 1, 1);

2
designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java

@ -131,7 +131,7 @@ public abstract class GUICoreUtils{
if (style.getBackground() instanceof ColorBackground) { if (style.getBackground() instanceof ColorBackground) {
textField.setBackground(((ColorBackground) style.getBackground()).getColor()); textField.setBackground(((ColorBackground) style.getBackground()).getColor());
} else { } else {
textField.setBackground(Color.white); textField.setBackground(Color.WHITE);
} }
} }

2
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(); Paint oldPaint = g2d.getPaint();
g2d.setPaint(Color.white); g2d.setPaint(Color.WHITE);
g2d.fillRect(0, 0, this.getBounds().width, this.getBounds().height); g2d.fillRect(0, 0, this.getBounds().width, this.getBounds().height);
g2d.setPaint(oldPaint); g2d.setPaint(oldPaint);

2
designer_chart/src/com/fr/design/chart/gui/active/ActiveGlyph.java

@ -64,7 +64,7 @@ public abstract class ActiveGlyph {
Paint oldPaint = g2d.getPaint(); Paint oldPaint = g2d.getPaint();
Composite oldComposite = g2d.getComposite(); Composite oldComposite = g2d.getComposite();
g2d.setPaint(Color.white); g2d.setPaint(Color.WHITE);
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f)); g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f));
g2d.fill(chartGlyph.getShape()); g2d.fill(chartGlyph.getShape());

2
designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java

@ -56,7 +56,7 @@ public class LabelBackgroundPane extends ConditionAttrSingleConditionPane<DataSe
this.add(backgroundLabel); this.add(backgroundLabel);
this.add(backgroundPreviewPane); this.add(backgroundPreviewPane);
this.add(editBackgroundButton); this.add(editBackgroundButton);
this.backgroundPreviewPane.setBackgroundObject(ColorBackground.getInstance(Color.white)); this.backgroundPreviewPane.setBackgroundObject(ColorBackground.getInstance(Color.WHITE));
} }
@Override @Override

4
designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartAccColorPane.java

@ -80,7 +80,7 @@ public class ChartAccColorPane extends BasicPane implements MouseListener, UIObs
int x = 0; int x = 0;
for(int i = 0; i < colors.length; i++) { for(int i = 0; i < colors.length; i++) {
Color color = colors[i]; Color color = colors[i];
g2d.setColor(color != null ? color : Color.white); g2d.setColor(color != null ? color : Color.WHITE);
if(i % ROWCOUNT == 0 && i != 0) { if(i % ROWCOUNT == 0 && i != 0) {
y += WIDTH; y += WIDTH;
@ -170,7 +170,7 @@ public class ChartAccColorPane extends BasicPane implements MouseListener, UIObs
if(i < values.length) { if(i < values.length) {
colors[i] = values[i]; colors[i] = values[i];
} else { } else {
colors[i] = Color.white; colors[i] = Color.WHITE;
} }
} }
this.repaint(); this.repaint();

2
designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java

@ -98,7 +98,7 @@ public class ChartDataPointLabel4GisPane extends ChartDatapointLabelPane{
textFontPane.populate(((AttrContents)attr).getTextAttr()); textFontPane.populate(((AttrContents)attr).getTextAttr());
} else { } else {
FRFont tmpFont = FRFont.getInstance(); FRFont tmpFont = FRFont.getInstance();
tmpFont.setForeground(Color.white); tmpFont.setForeground(Color.WHITE);
textFontPane.populate(tmpFont); textFontPane.populate(tmpFont);
} }
} }

2
designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java

@ -148,7 +148,7 @@ public class ChartFillStylePane extends BasicBeanPane<AttrFillStyle>{
gradientButton.setSelected(false); gradientButton.setSelected(false);
cardLayout.show(changeColorSetPane, "acc"); cardLayout.show(changeColorSetPane, "acc");
colorGradient.getSelectColorPointBtnP1().setColorInner(Color.white); colorGradient.getSelectColorPointBtnP1().setColorInner(Color.WHITE);
colorGradient.getSelectColorPointBtnP2().setColorInner(Color.black);// 控件中的位置无效. colorGradient.getSelectColorPointBtnP2().setColorInner(Color.black);// 控件中的位置无效.
} else { } else {
styleSelectBox.setSelectedIndex(styleSelectBox.getItemCount() - 1); styleSelectBox.setSelectedIndex(styleSelectBox.getItemCount() - 1);

2
designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartPreFillStylePane.java

@ -44,7 +44,7 @@ public class ChartPreFillStylePane extends ChartFillStylePane {
gradientButton.setSelected(false); gradientButton.setSelected(false);
cardLayout.show(changeColorSetPane, "acc"); cardLayout.show(changeColorSetPane, "acc");
colorGradient.getSelectColorPointBtnP1().setColorInner(Color.white); colorGradient.getSelectColorPointBtnP1().setColorInner(Color.WHITE);
colorGradient.getSelectColorPointBtnP2().setColorInner(Color.black);// 控件中的位置无效. colorGradient.getSelectColorPointBtnP2().setColorInner(Color.black);// 控件中的位置无效.
} else { } else {
int colorStyle = condition.getColorStyle(); int colorStyle = condition.getColorStyle();

4
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) { if(number != null) {
double value = number.doubleValue(); double value = number.doubleValue();
if(value < forValue && value > backValue) { if(value < forValue && value > backValue) {
setBackgroundUIColor(i,Color.white); setBackgroundUIColor(i,Color.WHITE);
} else { } else {
setBackgroundUIColor(i, Color.red); setBackgroundUIColor(i, Color.red);
} }
forValue = value; forValue = value;
}else{ }else{
//公式类型 //公式类型
setBackgroundUIColor(i,Color.white); setBackgroundUIColor(i,Color.WHITE);
} }
} }
this.repaint(); this.repaint();

2
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 = new JPanel();
tabPane.setOpaque(true); tabPane.setOpaque(true);
tabPane.setBorder(BorderFactory.createLineBorder(Color.pink)); tabPane.setBorder(BorderFactory.createLineBorder(Color.pink));
tabPane.setBackground(Color.white); tabPane.setBackground(Color.WHITE);
} }
private void initCardComponent() { private void initCardComponent() {

2
designer_form/src/com/fr/design/designer/creator/XIframeEditor.java

@ -62,7 +62,7 @@ public class XIframeEditor extends XWidgetCreator {
UITextField address = new UITextField(); UITextField address = new UITextField();
editor.add(address, BorderLayout.NORTH); editor.add(address, BorderLayout.NORTH);
JPanel contentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel contentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
contentPane.setBackground(Color.white); contentPane.setBackground(Color.WHITE);
editor.add(contentPane, BorderLayout.CENTER); editor.add(contentPane, BorderLayout.CENTER);
} }
return editor; return editor;

2
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 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); public static final Color RESIZE_BOX_BORDER_COLOR = new Color(143, 171, 196);
// 当前选取的组件的边框线着色 // 当前选取的组件的边框线着色

2
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.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setColor(lineColor); g2d.setColor(lineColor);
g2d.drawRoundRect(0, 0, width - 1, height - 1, 5, 5); 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.drawRoundRect(1, 1, width - 3, height - 3, 5, 5);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
} }

2
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); Shape shape = new Rectangle2D.Double(smallGAP, smallGAP, this.getWidth() - GAP, this.getHeight() - GAP);
background.paint(g, shape); background.paint(g, shape);
} else { } else {
g.setColor(Color.white); g.setColor(Color.WHITE);
g.fillRect(smallGAP, smallGAP, this.getWidth() - GAP, this.getHeight() - GAP); g.fillRect(smallGAP, smallGAP, this.getWidth() - GAP, this.getHeight() - GAP);
} }

2
designer_form/src/com/fr/design/gui/xpane/ToolTipEditor.java

@ -144,7 +144,7 @@ public class ToolTipEditor extends JWindow {
public EditorChoosePane() { public EditorChoosePane() {
super(); 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.setLayout(new EditorLayout());
this.initComponents(); this.initComponents();
} }

2
designer_form/src/com/fr/design/mainframe/CoverPane.java

@ -89,7 +89,7 @@ public class CoverPane extends JPanel {
Graphics2D g2d = (Graphics2D) g; Graphics2D g2d = (Graphics2D) g;
Composite oldComposite = g2d.getComposite(); Composite oldComposite = g2d.getComposite();
g2d.setComposite(composite); g2d.setComposite(composite);
g2d.setColor(Color.white); g2d.setColor(Color.WHITE);
g2d.fillRect(0, 0, getWidth(), getHeight()); g2d.fillRect(0, 0, getWidth(), getHeight());
g2d.setComposite(oldComposite); g2d.setComposite(oldComposite);
super.paint(g); super.paint(g);

2
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.addMouseWheelListener(showValSpinnerMouseWheelListener);
this.designer.addKeyListener(showValSpinnerKeyListener); this.designer.addKeyListener(showValSpinnerKeyListener);
this.setOpaque(true); this.setOpaque(true);
this.setBackground(Color.white); this.setBackground(Color.WHITE);
} }

2
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; Graphics2D g2d = (Graphics2D) g;
Composite oldComposite = g2d.getComposite(); Composite oldComposite = g2d.getComposite();
g2d.setComposite(composite); g2d.setComposite(composite);
g2d.setColor(Color.white); g2d.setColor(Color.WHITE);
g2d.fillRect(0, 0, getWidth(), getHeight()); g2d.fillRect(0, 0, getWidth(), getHeight());
g2d.setComposite(oldComposite); g2d.setComposite(oldComposite);
super.paint(g); super.paint(g);

4
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) { public void paintComponent(Graphics g) {
int width = getWidth(); int width = getWidth();
int height = getHeight(); int height = getHeight();
g.setColor(Color.white); g.setColor(Color.WHITE);
g.fillRect(0, 0, width, height); g.fillRect(0, 0, width, height);
int x = LEFT; int x = LEFT;
int y = (height - BOX) / 2; int y = (height - BOX) / 2;
@ -110,7 +110,7 @@ public class ColorTextField extends JComponent implements ITextComponent {
@Override @Override
public void setEditable(boolean editable) { public void setEditable(boolean editable) {
textField.setEditable(editable); textField.setEditable(editable);
textField.setBackground(Color.white); textField.setBackground(Color.WHITE);
} }
@Override @Override

6
designer_form/src/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java

@ -131,10 +131,10 @@ public class ElementCaseToolBarPane extends BasicBeanPane<FormToolBarManager[]>
initLayoutTable(); initLayoutTable();
JPanel center = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel center = FRGUIPaneFactory.createBorderLayout_S_Pane();
center.setBackground(Color.white); center.setBackground(Color.WHITE);
center.add(topButton, BorderLayout.NORTH); center.add(topButton, BorderLayout.NORTH);
JPanel small = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel small = FRGUIPaneFactory.createBorderLayout_S_Pane();
small.setBackground(Color.white); small.setBackground(Color.WHITE);
small.add(new UILabel(StringUtils.BLANK), BorderLayout.NORTH); small.add(new UILabel(StringUtils.BLANK), BorderLayout.NORTH);
small.add(layoutTable, BorderLayout.CENTER); small.add(layoutTable, BorderLayout.CENTER);
center.add(small, BorderLayout.CENTER); center.add(small, BorderLayout.CENTER);
@ -170,7 +170,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane<FormToolBarManager[]>
layoutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); layoutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
layoutTable.setColumnSelectionAllowed(false); layoutTable.setColumnSelectionAllowed(false);
layoutTable.setRowSelectionAllowed(false); layoutTable.setRowSelectionAllowed(false);
layoutTable.setBackground(Color.white); layoutTable.setBackground(Color.WHITE);
int columnWidth = Integer.parseInt(Inter.getLocText("FR-Designer_LayoutTable_Column_Width")); int columnWidth = Integer.parseInt(Inter.getLocText("FR-Designer_LayoutTable_Column_Width"));
for (int i = 0; i < layoutTable.getColumnModel().getColumnCount(); i++) { for (int i = 0; i < layoutTable.getColumnModel().getColumnCount(); i++) {
layoutTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidth); layoutTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidth);

2
designer_form/src/com/fr/design/mainframe/widget/editors/TextField.java

@ -22,6 +22,6 @@ public class TextField extends UITextField implements ITextComponent {
@Override @Override
public void setEditable(boolean b) { public void setEditable(boolean b) {
super.setEditable(b); super.setEditable(b);
setBackground(Color.white); setBackground(Color.WHITE);
} }
} }

4
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")) { } else if (txt.equals("red")) {
return Color.red; return Color.red;
} else if (txt.equals("white")) { } else if (txt.equals("white")) {
return Color.white; return Color.WHITE;
} else if (txt.equals("yellow")) { } else if (txt.equals("yellow")) {
return Color.yellow; return Color.yellow;
} }
@ -82,7 +82,7 @@ public class ColorWrapper implements Encoder, Decoder {
return "pink"; return "pink";
} else if (c.equals(Color.red)) { } else if (c.equals(Color.red)) {
return "red"; return "red";
} else if (c.equals(Color.white)) { } else if (c.equals(Color.WHITE)) {
return "white"; return "white";
} else if (c.equals(Color.yellow)) { } else if (c.equals(Color.yellow)) {
return "yellow"; return "yellow";

Loading…
Cancel
Save