Mercurial > hg > openjdk > jdk6 > jdk
changeset 299:9f596519c6cc jdk6-b18
6737700: api/javax_swing/table/DefaultTableCellRenderer/index.html#getset:DefaultTableCellRenderer
Reviewed-by: alexp
author | malenkov |
---|---|
date | Wed, 24 Jun 2009 17:45:19 +0400 |
parents | a3cd817dcc2e |
children | fa2068c8ea20 |
files | src/share/classes/javax/swing/table/DefaultTableCellRenderer.java |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java Fri Feb 12 14:38:16 2010 +0900 +++ b/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java Wed Jun 24 17:45:19 2009 +0400 @@ -1,5 +1,5 @@ /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -118,12 +118,12 @@ if (System.getSecurityManager() != null) { if (border != null) return border; return SAFE_NO_FOCUS_BORDER; - } else { + } else if (border != null) { if (noFocusBorder == null || noFocusBorder == DEFAULT_NO_FOCUS_BORDER) { return border; } - return noFocusBorder; } + return noFocusBorder; } /**