summaryrefslogtreecommitdiff
path: root/src/swing
diff options
context:
space:
mode:
authorIngo Maier <ingo.maier@epfl.ch>2008-07-16 12:50:22 +0000
committerIngo Maier <ingo.maier@epfl.ch>2008-07-16 12:50:22 +0000
commit84806c6a632aefa1a485da3582eeb340761b5b26 (patch)
treed4e9d73ec2257036a8fd3995736239c39782c07f /src/swing
parent0a49cecf826a215cdccdc4b8fb7e568aa7d2730f (diff)
downloadscala-84806c6a632aefa1a485da3582eeb340761b5b26.tar.gz
scala-84806c6a632aefa1a485da3582eeb340761b5b26.tar.bz2
scala-84806c6a632aefa1a485da3582eeb340761b5b26.zip
renderer renamed to rendererComponent
Diffstat (limited to 'src/swing')
-rw-r--r--src/swing/scala/swing/Table.scala4
-rw-r--r--src/swing/scala/swing/test/TableSelection.scala4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/swing/scala/swing/Table.scala b/src/swing/scala/swing/Table.scala
index 219b567526..fbd4904c5f 100644
--- a/src/swing/scala/swing/Table.scala
+++ b/src/swing/scala/swing/Table.scala
@@ -90,7 +90,7 @@ class Table extends Component with Scrollable with Publisher {
def tableWrapper = Table.this
override def getCellRenderer(r: Int, c: Int) = new TableCellRenderer {
def getTableCellRendererComponent(table: JTable, value: AnyRef, isSelected: Boolean, hasFocus: Boolean, row: Int, column: Int) =
- Table.this.renderer(isSelected, hasFocus, row, column).peer
+ Table.this.rendererComponent(isSelected, hasFocus, row, column).peer
}
override def getCellEditor(r: Int, c: Int) = editor(r, c)
override def getValueAt(r: Int, c: Int) = Table.this.apply(r,c).asInstanceOf[AnyRef]
@@ -223,7 +223,7 @@ class Table extends Component with Scrollable with Publisher {
/**
* Supplies a renderer component for a given cell.
*/
- def renderer(isSelected: Boolean, hasFocus: Boolean, row: Int, column: Int): Component =
+ protected def rendererComponent(isSelected: Boolean, hasFocus: Boolean, row: Int, column: Int): Component =
new Component {
override lazy val peer = {
val v = Table.this.peer.getValueAt(row, column)
diff --git a/src/swing/scala/swing/test/TableSelection.scala b/src/swing/scala/swing/test/TableSelection.scala
index 7cb7c45755..4d5ce47da3 100644
--- a/src/swing/scala/swing/test/TableSelection.scala
+++ b/src/swing/scala/swing/test/TableSelection.scala
@@ -15,10 +15,10 @@ object TableSelection extends SimpleGUIApplication {
val table = new Table(model, Array("First Name", "Last Name", "Sport", "# of Years", "Vegetarian")) {
preferredViewportSize = new Dimension(500, 70)
val l = new Table.LabelRenderer[String](a => (null,a))
- override def renderer(isSelected: Boolean, hasFocus: Boolean, row: Int, column: Int): Component =
+ override def rendererComponent(isSelected: Boolean, hasFocus: Boolean, row: Int, column: Int): Component =
TableSelection.model(row)(column) match {
case s: String => l.componentFor(this, isSelected, hasFocus, s, row, column)
- case _ => super.renderer(isSelected, hasFocus, row, column)
+ case _ => super.rendererComponent(isSelected, hasFocus, row, column)
}
}
//1.6:table.fillsViewportHeight = true