Attachment #130412 for bug #216558

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 216558
Collapse All | Expand All

Lines 62-67 Link Here

(-)a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java (-3 / +10 lines)
62	import javax.swing.JPopupMenu;	62	import javax.swing.JPopupMenu;
63	import javax.swing.JTable;	63	import javax.swing.JTable;
64	import javax.swing.RowFilter;	64	import javax.swing.RowFilter;
		65	import javax.swing.UIManager;
65	import javax.swing.border.LineBorder;	66	import javax.swing.border.LineBorder;
66	import javax.swing.event.ListSelectionEvent;	67	import javax.swing.event.ListSelectionEvent;
67	import javax.swing.event.ListSelectionListener;	68	import javax.swing.event.ListSelectionListener;
Lines 176-192 Link Here
176		177
177	if (isSelected) {	178	if (isSelected) {
178	if ((obj == null && value == null) \|\| (obj != null && value != null && value.equals(obj))) {	179	if ((obj == null && value == null) \|\| (obj != null && value != null && value.equals(obj))) {
179	color = gray;	180	color = UIManager.getColor("nb.dataview.tablecell.edited.selected.emptyNull.foreground") != null ?
		181	UIManager.getColor("nb.dataview.tablecell.edited.selected.emptyNull.foreground"):
		182	gray;
180	override = true;	183	override = true;
181	} else {	184	} else {
182	color = Color.ORANGE;	185	color = UIManager.getColor("nb.dataview.tablecell.edited.selected.foreground") != null ?
		186	UIManager.getColor("nb.dataview.tablecell.edited.selected.foreground") :
		187	Color.ORANGE;
183	override = true;	188	override = true;
184	}	189	}
185	} else {	190	} else {
186	if ((obj == null && value == null) \|\| (obj != null && value != null && value.equals(obj))) {	191	if ((obj == null && value == null) \|\| (obj != null && value != null && value.equals(obj))) {
187	color = table.getForeground();	192	color = table.getForeground();
188	} else {	193	} else {
189	color = green;	194	color = UIManager.getColor("nb.dataview.tablecell.edited.unselected.foreground") != null ?
		195	UIManager.getColor("nb.dataview.tablecell.edited.unselected.foreground") :
		196	green;
190	override = true;	197	override = true;
191	}	198	}
192	}	199	}

Lines 60-66 Link Here

(-)a/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableDecorator.java (-1 / +1 lines)
60	public static final Color ROW_COLOR = UIManager.getColor("nb.dataview.table.background") != null ? UIManager.getColor("nb.dataview.table.background") : Color.WHITE;	60	public static final Color ROW_COLOR = UIManager.getColor("nb.dataview.table.background") != null ? UIManager.getColor("nb.dataview.table.background") : Color.WHITE;
61	public static final Color ALTERNATE_ROW_COLOR = UIManager.getColor("nb.dataview.table.altbackground") != null ? UIManager.getColor("nb.dataview.table.altbackground") : new Color(0.92F, 0.95F, 0.99F);	61	public static final Color ALTERNATE_ROW_COLOR = UIManager.getColor("nb.dataview.table.altbackground") != null ? UIManager.getColor("nb.dataview.table.altbackground") : new Color(0.92F, 0.95F, 0.99F);
62	public static final Color GRID_COLOR = UIManager.getColor("nb.dataview.table.gridbackground") != null ? UIManager.getColor("nb.dataview.table.gridbackground") : new Color(14277081);	62	public static final Color GRID_COLOR = UIManager.getColor("nb.dataview.table.gridbackground") != null ? UIManager.getColor("nb.dataview.table.gridbackground") : new Color(14277081);
63	public static final Color ROLLOVER_ROW_COLOR = UIManager.getColor("nb.dataview.table.altbackground") != null ? UIManager.getColor("nb.dataview.table.altbackground") : new Color(0.94F, 0.96F, 0.96F);	63	public static final Color ROLLOVER_ROW_COLOR = UIManager.getColor("nb.dataview.table.rollOverRowBackground") != null ? UIManager.getColor("nb.dataview.table.rollOverRowBackground") : new Color(0.94F, 0.96F, 0.96F);
64		64
65	JXTableDecorator() {	65	JXTableDecorator() {
66	super();	66	super();

Lines 124-130 Link Here

(-)a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java (-1 / +1 lines)
124	setAutoResizeMode(JXTable.AUTO_RESIZE_OFF);	124	setAutoResizeMode(JXTable.AUTO_RESIZE_OFF);
125	setFillsViewportHeight(true);	125	setFillsViewportHeight(true);
126		126
127	setHighlighters(HighlighterFactory.createAlternateStriping(Color.WHITE, ALTERNATE_ROW_COLOR));	127	setHighlighters(HighlighterFactory.createAlternateStriping(ROW_COLOR, ALTERNATE_ROW_COLOR));
128	addHighlighter(new ColorHighlighter(HighlightPredicate.ROLLOVER_ROW, ROLLOVER_ROW_COLOR, null));	128	addHighlighter(new ColorHighlighter(HighlightPredicate.ROLLOVER_ROW, ROLLOVER_ROW_COLOR, null));
129		129
130	setDefaultCellRenderers();	130	setDefaultCellRenderers();




    static {
        LookAndFeelAddons.contribute(new DatePickerAddon());
    }
    
    /**
     * UI Class ID
     */

        _monthView = new JXMonthView();
//        _monthView.setSelectionModel(new SingleDaySelectionModel());
        _monthView.setTraversable(true);
        
        if(UIManager.getColor("nb.dataview.jxdatetimepicker.background") != null){
            _monthView.setBackground(UIManager.getColor("nb.dataview.jxdatetimepicker.background"));
        }
        if(UIManager.getColor("nb.dataview.jxdatetimepicker.foreground") != null){
            _monthView.setForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.foreground"));
        }
        if(UIManager.getColor("nb.dataview.jxdatetimepicker.selectedBackground") != null){
            _monthView.setSelectionBackground(UIManager.getColor("nb.dataview.jxdatetimepicker.selectedBackground"));
        }
        if(UIManager.getColor("nb.dataview.jxdatetimepicker.selectedForeground") != null){
            _monthView.setSelectionForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.selectedForeground"));
        }
        if(UIManager.getColor("nb.dataview.jxdatetimepicker.monthStringBackground") != null){
            _monthView.setMonthStringBackground(UIManager.getColor("nb.dataview.jxdatetimepicker.monthStringBackground"));
        }
        if(UIManager.getColor("nb.dataview.jxdatetimepicker.monthStringForeground") != null){
            _monthView.setMonthStringForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.monthStringForeground"));
        }
        if(UIManager.getColor("nb.dataview.jxdatetimepicker.daysOfTheWeekForeground") != null){
            _monthView.setMonthStringForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.daysOfTheWeekForeground"));
        }
        if(UIManager.getColor("nb.dataview.jxdatetimepicker.todayBackground") != null){
            _monthView.setMonthStringForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.todayBackground"));
        }
        
        _monthView.addPropertyChangeListener(getMonthViewListener());
    }


        @SuppressWarnings("rawtypes")
        TodayPanel() {
            super(new FlowLayout());
            Color gradientStart = UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.background.gradient.start") != null
                    ? UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.background.gradient.start") 
                    : new Color(238, 238, 238);
            Color gradientEnd = UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.background.gradient.end") != null
                    ? UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.background.gradient.end") 
                    : Color.WHITE;
            setBackgroundPainter(new MattePainter(new GradientPaint(0, 0, gradientStart, 0, 1, gradientEnd)));
            todayAction = new TodayAction();
            todayLink = new JXHyperlink(todayAction);
            todayLink.addMouseListener(createDoubleClickListener());
            Color textColor = UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.linkForeground") != null ?
                                UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.linkForeground") : 
                                new Color(16, 66, 104);
            todayLink.setUnclickedColor(textColor);
            todayLink.setClickedColor(textColor);
            add(todayLink);

Return to bug 216558

Lines 140-146 Link Here

(-)a/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java (-3 / +37 lines)
140	static {	140	static {
141	LookAndFeelAddons.contribute(new DatePickerAddon());	141	LookAndFeelAddons.contribute(new DatePickerAddon());
142	}	142	}
143		143
144	/**	144	/**
145	* UI Class ID	145	* UI Class ID
146	*/	146	*/
Lines 358-363 Link Here
358	_monthView = new JXMonthView();	358	_monthView = new JXMonthView();
359	// _monthView.setSelectionModel(new SingleDaySelectionModel());	359	// _monthView.setSelectionModel(new SingleDaySelectionModel());
360	_monthView.setTraversable(true);	360	_monthView.setTraversable(true);
		361
		362	if(UIManager.getColor("nb.dataview.jxdatetimepicker.background") != null){
		363	_monthView.setBackground(UIManager.getColor("nb.dataview.jxdatetimepicker.background"));
		364	}
		365	if(UIManager.getColor("nb.dataview.jxdatetimepicker.foreground") != null){
		366	_monthView.setForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.foreground"));
		367	}
		368	if(UIManager.getColor("nb.dataview.jxdatetimepicker.selectedBackground") != null){
		369	_monthView.setSelectionBackground(UIManager.getColor("nb.dataview.jxdatetimepicker.selectedBackground"));
		370	}
		371	if(UIManager.getColor("nb.dataview.jxdatetimepicker.selectedForeground") != null){
		372	_monthView.setSelectionForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.selectedForeground"));
		373	}
		374	if(UIManager.getColor("nb.dataview.jxdatetimepicker.monthStringBackground") != null){
		375	_monthView.setMonthStringBackground(UIManager.getColor("nb.dataview.jxdatetimepicker.monthStringBackground"));
		376	}
		377	if(UIManager.getColor("nb.dataview.jxdatetimepicker.monthStringForeground") != null){
		378	_monthView.setMonthStringForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.monthStringForeground"));
		379	}
		380	if(UIManager.getColor("nb.dataview.jxdatetimepicker.daysOfTheWeekForeground") != null){
		381	_monthView.setMonthStringForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.daysOfTheWeekForeground"));
		382	}
		383	if(UIManager.getColor("nb.dataview.jxdatetimepicker.todayBackground") != null){
		384	_monthView.setMonthStringForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.todayBackground"));
		385	}
		386
361	_monthView.addPropertyChangeListener(getMonthViewListener());	387	_monthView.addPropertyChangeListener(getMonthViewListener());
362	}	388	}
363		389
Lines 918-928 Link Here
918	@SuppressWarnings("rawtypes")	944	@SuppressWarnings("rawtypes")
919	TodayPanel() {	945	TodayPanel() {
920	super(new FlowLayout());	946	super(new FlowLayout());
921	setBackgroundPainter(new MattePainter(new GradientPaint(0, 0, new Color(238, 238, 238), 0, 1, Color.WHITE)));	947	Color gradientStart = UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.background.gradient.start") != null
		948	? UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.background.gradient.start")
		949	: new Color(238, 238, 238);
		950	Color gradientEnd = UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.background.gradient.end") != null
		951	? UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.background.gradient.end")
		952	: Color.WHITE;
		953	setBackgroundPainter(new MattePainter(new GradientPaint(0, 0, gradientStart, 0, 1, gradientEnd)));
922	todayAction = new TodayAction();	954	todayAction = new TodayAction();
923	todayLink = new JXHyperlink(todayAction);	955	todayLink = new JXHyperlink(todayAction);
924	todayLink.addMouseListener(createDoubleClickListener());	956	todayLink.addMouseListener(createDoubleClickListener());
925	Color textColor = new Color(16, 66, 104);	957	Color textColor = UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.linkForeground") != null ?
		958	UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.linkForeground") :
		959	new Color(16, 66, 104);
926	todayLink.setUnclickedColor(textColor);	960	todayLink.setUnclickedColor(textColor);
927	todayLink.setClickedColor(textColor);	961	todayLink.setClickedColor(textColor);
928	add(todayLink);	962	add(todayLink);