summaryrefslogtreecommitdiff
path: root/src/swing
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-04-14 08:25:58 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-04-14 08:25:58 +0000
commit433ed7ef4fd7d6ed8067c10cebe1e7ec3f72b40f (patch)
tree270b56354e7dde32bb3fc7953d08baf92ba49326 /src/swing
parentd61d2c93d788fdf01ad2497b9c6bb69ab9d6a397 (diff)
downloadscala-433ed7ef4fd7d6ed8067c10cebe1e7ec3f72b40f.tar.gz
scala-433ed7ef4fd7d6ed8067c10cebe1e7ec3f72b40f.tar.bz2
scala-433ed7ef4fd7d6ed8067c10cebe1e7ec3f72b40f.zip
Merged revisions 21492-21512,21516-21518,21520-...
Merged revisions 21492-21512,21516-21518,21520-21525,21527,21529,21531,21535-21537,21539- 21543,21545-21548,21550,21552,21554-21560 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r21492 | dubochet | 2010-04-12 19:04:31 +0200 (Mon, 12 Apr 2010) | 1 line [scaladoc] Lazy vals are printed as such, no longer as vars. No review. ........ r21493 | dubochet | 2010-04-12 19:04:47 +0200 (Mon, 12 Apr 2010) | 1 line [scaladoc] Signature kind (def, val) needs more space to accommodate lazy vals and implicit defs. ........ r21494 | dubochet | 2010-04-12 19:05:04 +0200 (Mon, 12 Apr 2010) | 1 line [scaladoc] Comment summary (first sentence) is extracted by comment parser, which is a lot more robust and correct. No review. ........ r21495 | dragos | 2010-04-12 19:19:29 +0200 (Mon, 12 Apr 2010) | 4 lines Auto-generate scala.runtime.AbstractFunctionN classes. Moved zipped* methods in Tuple1/2 in genprod, so that regenerating tuples does not lose these methods. Added @specialized annotations into genprod for the same reason. ........ r21496 | dragos | 2010-04-12 19:19:38 +0200 (Mon, 12 Apr 2010) | 5 lines Regenerated tuples, products and (Abstract)Functions. We needed to have separate files for AbstractFunctionN because the compiler may need their symbol even before their sourcefile is parsed. In such cases it relies on finding a source file with the right name. ........ r21497 | dragos | 2010-04-12 19:19:51 +0200 (Mon, 12 Apr 2010) | 1 line Don't generate forwarders for specialized methods. no review. ........ r21498 | dragos | 2010-04-12 19:19:59 +0200 (Mon, 12 Apr 2010) | 3 lines Companion objects of case classes extend AbstractFunctionN instead of FunctionN. This saves quite some space, since FunctionN methods are not re-mixed in for each object. ........ r21499 | dragos | 2010-04-12 19:20:07 +0200 (Mon, 12 Apr 2010) | 5 lines Fixed various position issues in specialized members. Removed an instance where the tree transformer was run twice on the same tree, resulting in double definition errors. Fixed re-typing of super calls in constructor arguments for specialized members. No review. ........ r21500 | phaller | 2010-04-12 19:27:14 +0200 (Mon, 12 Apr 2010) | 1 line Restored partest behavior to write log files with normalized paths. For new tests the check file can be copied from the log file. This makes the behavior of --show-diff exactly the same as diffing the log and check file. Review by extempore. ........ r21501 | dubochet | 2010-04-12 19:30:24 +0200 (Mon, 12 Apr 2010) | 1 line [scaladoc] Inner objects, which according to the compiler are actually methods, are now printed as objects by Scaladoc. No review. ........ r21502 | phaller | 2010-04-12 21:18:31 +0200 (Mon, 12 Apr 2010) | 1 line Reverted r21500 until all test categories work again. ........ r21503 | dubochet | 2010-04-12 21:51:53 +0200 (Mon, 12 Apr 2010) | 1 line [scaladoc] Use case symbols have correct owner; inherited filter works as expected with use cases. Review by odersky. ........ r21504 | extempore | 2010-04-12 21:57:56 +0200 (Mon, 12 Apr 2010) | 5 lines Correct oversight where neg tests didn't demand a checkfile. More trying to get timeout/interrupted logic so we know when things die but also don't impede interrupts. Folded precondition logic into test sequence logic, it's plenty general to cover it. Closes #3282, review by phaller. ........ r21505 | malayeri | 2010-04-12 21:59:21 +0200 (Mon, 12 Apr 2010) | 7 lines [scaladoc] Cosmetic changes: - changed link color to underlined and dark purple - increased padding in gray lines of method definitions - lightened gray lines of method definitions - changed dashed and solid lines from black to gray - increased size of top template declaration; changed alignment Review by dubochet. ........ r21506 | phaller | 2010-04-12 22:17:13 +0200 (Mon, 12 Apr 2010) | 1 line Disabled test that hangs when actors package is compiled with specialization. Review by dragos. ........ r21507 | phaller | 2010-04-12 22:41:46 +0200 (Mon, 12 Apr 2010) | 1 line Another attempt at avoiding partest hang ups when the compiler crashes. Review by extempore. ........ r21508 | dubochet | 2010-04-12 22:48:42 +0200 (Mon, 12 Apr 2010) | 1 line [scaladoc] Members inherited from sourceless files are correctly printed in documentation. No review. ........ r21509 | malayeri | 2010-04-12 22:53:02 +0200 (Mon, 12 Apr 2010) | 1 line Changed the colors for types, value members, and tooltips. Feel free to revert. Review by dubochet. ........ r21510 | extempore | 2010-04-12 23:36:33 +0200 (Mon, 12 Apr 2010) | 9 lines Still working on partest. Added ant targets which can be temporary if considered clutter. ant test.partest ant test.partest-opt They run some recently troublesome partest tests with a low timeout. Logged some more exceptions where the compiler has been dying. Review by phaller. ........ r21511 | extempore | 2010-04-12 23:45:17 +0200 (Mon, 12 Apr 2010) | 10 lines Disabling what I think are the last two failing tests, one each of the two leading bugs among those we've seen here today on testing theater: "could not find toMap: (x$1: scala.collection.TraversableOnce,x$2: Predef$<:<)" and "scala.tools.nsc.symtab.Types$TypeError: method react cannot be accessed in java.lang.Object with scala.actors.Reactor[Any] No review but hey lets' see if we can re-enable these tests soonish. ........ r21512 | prokopec | 2010-04-12 23:53:30 +0200 (Mon, 12 Apr 2010) | 1 line Documentation for mutable collections. No review. ........ r21516 | extempore | 2010-04-13 01:20:03 +0200 (Tue, 13 Apr 2010) | 5 lines Noticed that Settings post-set hooks were not being set in the place where they ought to be, so multiple setting settings (such as -optimise) were not flipping all the right bits when set programmatically instead of via command line options. This may be a factor in inlining issues, though by itself it does not appear to solve anything. No review. ........ r21517 | malayeri | 2010-04-13 06:25:09 +0200 (Tue, 13 Apr 2010) | 1 line [scaladoc] Changed comment code and pre tages to not have "font-size: small" attribute. Review by dubochet. ........ r21518 | plocinic | 2010-04-13 10:12:05 +0200 (Tue, 13 Apr 2010) | 1 line Some clean-ups. Removed old syntax, code duplication etc. No review. ........ r21520 | prokopec | 2010-04-13 12:29:58 +0200 (Tue, 13 Apr 2010) | 1 line docs for immutable.A-L*. no review ........ r21521 | rytz | 2010-04-13 12:31:39 +0200 (Tue, 13 Apr 2010) | 1 line fixed most of stability, reviewed by iuli, so no review. continuations.jar is still failing stability, i'll look at that. ........ r21522 | rompf | 2010-04-13 13:08:12 +0200 (Tue, 13 Apr 2010) | 1 line closes #3241 and improves serialization of hash tries. review by community. ........ r21523 | phaller | 2010-04-13 13:37:42 +0200 (Tue, 13 Apr 2010) | 1 line Improved handling of uncaught exceptions in actors. See #711. Review by community. ........ r21524 | prokopec | 2010-04-13 13:41:54 +0200 (Tue, 13 Apr 2010) | 1 line A brace got hurt while documenting. no review. ........ r21525 | rytz | 2010-04-13 13:53:50 +0200 (Tue, 13 Apr 2010) | 1 line fix stability. jar is not stable. no review. ........ r21527 | dubochet | 2010-04-13 14:08:47 +0200 (Tue, 13 Apr 2010) | 1 line [scaladoc] Fixed CSS so that styles from wiki markup are correctly displayed in comments. No Review. ........ r21529 | prokopec | 2010-04-13 14:15:40 +0200 (Tue, 13 Apr 2010) | 1 line Immutable up to Queue docs. no review ........ r21531 | imaier | 2010-04-13 14:53:21 +0200 (Tue, 13 Apr 2010) | 1 line Fixed #3258 ........ r21535 | phaller | 2010-04-13 16:41:02 +0200 (Tue, 13 Apr 2010) | 1 line Hardened actor tests. No review. ........ r21536 | phaller | 2010-04-13 16:59:29 +0200 (Tue, 13 Apr 2010) | 1 line Removed obsolete AbstractReactor trait. No review. ........ r21537 | prokopec | 2010-04-13 17:50:39 +0200 (Tue, 13 Apr 2010) | 1 line Docs. no review ........ r21539 | prokopec | 2010-04-13 18:32:09 +0200 (Tue, 13 Apr 2010) | 1 line Documented immutable.*. no review ........ r21540 | odersky | 2010-04-13 19:36:21 +0200 (Tue, 13 Apr 2010) | 1 line more documentation ........ r21541 | odersky | 2010-04-13 19:36:54 +0200 (Tue, 13 Apr 2010) | 1 line fix for usecase in doccomments. ........ r21542 | odersky | 2010-04-13 19:37:24 +0200 (Tue, 13 Apr 2010) | 1 line attempted fix for the TypeSkolem problem under specialize. ........ r21543 | odersky | 2010-04-13 19:42:35 +0200 (Tue, 13 Apr 2010) | 1 line Fix for specialized fix. ........ r21545 | malayeri | 2010-04-13 20:13:53 +0200 (Tue, 13 Apr 2010) | 1 line [scaladoc] More cosmetic changes. Objects are a different shade of blue and classes are green. ........ r21546 | extempore | 2010-04-13 20:24:05 +0200 (Tue, 13 Apr 2010) | 1 line A redblack tree scalacheck test contributed by dcsobral. No review. ........ r21547 | extempore | 2010-04-13 20:24:27 +0200 (Tue, 13 Apr 2010) | 2 lines A safety improvement for random path generation, and a small change to Random for a more general interface. Review by community. ........ r21548 | extempore | 2010-04-13 20:24:48 +0200 (Tue, 13 Apr 2010) | 3 lines Some mopping up in equality. Found a stack overflow in the way equals was being handled, and hammered it out. New ==/## tests which covers all types and values. Review by odersky. ........ r21550 | odersky | 2010-04-13 21:46:21 +0200 (Tue, 13 Apr 2010) | 2 lines Removed trace output after having verified that skolems are correctly identified now. Now review. ........ r21552 | malayeri | 2010-04-13 22:48:50 +0200 (Tue, 13 Apr 2010) | 1 line [scaladoc] Tweak so that left pane has a little bit of left padding. Review by dubochet. ........ r21554 | dchenbecker | 2010-04-13 22:51:44 +0200 (Tue, 13 Apr 2010) | 4 lines Fix for #3284. This code should probably be refactored, but in the interest of not breaking backwards compatibility, the JSON.parse method has been marked deprecated for now. ........ r21555 | phaller | 2010-04-13 23:48:21 +0200 (Tue, 13 Apr 2010) | 1 line Reverted r21523. No review. ........ r21556 | dragos | 2010-04-14 00:50:37 +0200 (Wed, 14 Apr 2010) | 4 lines Fixed deadlocking behavior in actors. This bug deserves a few more lines. Specialization removed a 'private' modifier on Actor.resumeActor. Mixin did not mix this method in actor implementations, believing it was private. At runtime, an AbstractMethodError was thrown, but swallowed by forkjoin (probably), resulting in an apparent deadlock. It would have been much faster to find and fix if the stacktrace was printed, as it is in Java 1.5. No review. ........ r21557 | dragos | 2010-04-14 00:50:52 +0200 (Wed, 14 Apr 2010) | 1 line Don't decode symbols in .toString. ........ r21558 | dragos | 2010-04-14 00:51:04 +0200 (Wed, 14 Apr 2010) | 4 lines Made the icode reader more resilient to errors. A non-resolved symbol does not cause any crashes, but the method using an unknown symbol will not be used for inlining. Resurrected tests, removed spec-matrix for the moment. No review. ........ r21559 | dragos | 2010-04-14 00:52:56 +0200 (Wed, 14 Apr 2010) | 2 lines Revert "Fix for #3284. This code should probably be refactored,". It breaks test test/files/run/json.scala, and we need at least one good nightly before the RC. ........ r21560 | odersky | 2010-04-14 00:54:25 +0200 (Wed, 14 Apr 2010) | 2 lines Disabled failing json test. ........
Diffstat (limited to 'src/swing')
-rw-r--r--src/swing/scala/swing/Table.scala6
-rw-r--r--src/swing/scala/swing/test/UIDemo.scala6
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)