Fixed #3258

2 files changed, 4 insertions, 8 deletions

diff --git a/src/swing/scala/swing/Table.scala b/src/swing/scala/swing/Table.scala
index 8030c5043a..9370ea7eb1 100644
--- a/src/swing/scala/swing/Table.scala
+++ b/src/swing/scala/swing/Table.scala
@@ -124,7 +124,7 @@ class Table extends Component with Scrollable.Wrapper {
   // TODO: use IndexedSeq[_ <: IndexedSeq[Any]], see ticket #2005
   def this(rowData: Array[Array[Any]], columnNames: Seq[_]) = {
     this()
-    peer.setModel(new AbstractTableModel {
+    model = new AbstractTableModel {
       override def getColumnName(column: Int) = columnNames(column).toString
       def getRowCount() = rowData.length
       def getColumnCount() = columnNames.length
@@ -134,7 +134,7 @@ class Table extends Component with Scrollable.Wrapper {
         rowData(row)(col) = value
         fireTableCellUpdated(row, col)
       }
-    })
+    }
   }
   def this(rows: Int, columns: Int) = {
     this()
@@ -155,6 +155,7 @@ class Table extends Component with Scrollable.Wrapper {
   def model = peer.getModel()
   def model_=(x: TableModel) = {
     peer.setModel(x)
+    model.removeTableModelListener(modelListener)
     model.addTableModelListener(modelListener)
   }
 
@@ -312,5 +313,4 @@ class Table extends Component with Scrollable.Wrapper {
       }
     )
   }
-  model.addTableModelListener(modelListener)
 }
diff --git a/src/swing/scala/swing/test/UIDemo.scala b/src/swing/scala/swing/test/UIDemo.scala
index ce40fe2056..9207c82948 100644
--- a/src/swing/scala/swing/test/UIDemo.scala
+++ b/src/swing/scala/swing/test/UIDemo.scala
@@ -73,11 +73,7 @@ object UIDemo extends SimpleSwingApplication {
                 reactLive = live.selected
             }
           }
-          contents += new Button("Center Frame") {
-            reactions += {
-              case ButtonClicked(_) => centerOnScreen()
-            }
-          }
+          contents += new Button(Action("Center Frame") { centerOnScreen() })
         }
         pages += new Page("Buttons", buttons)
         pages += new Page("GridBag", GridBagDemo.ui)