summaryrefslogtreecommitdiff
path: root/src/swing
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-04-29 11:39:00 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-04-29 11:39:00 +0000
commit394ae087a71ff1e50827373dc73830c0fe799e3b (patch)
treeb430c1cfafe285dba5da226d5efac759c9330e73 /src/swing
parentedfac2904f29c7a9f32799fb8e37bd7a856b6b72 (diff)
downloadscala-394ae087a71ff1e50827373dc73830c0fe799e3b.tar.gz
scala-394ae087a71ff1e50827373dc73830c0fe799e3b.tar.bz2
scala-394ae087a71ff1e50827373dc73830c0fe799e3b.zip
Merged revisions 21575,21577,21596-21599,21603-...
Merged revisions 21575,21577,21596-21599,21603-21604,21606-21607,21611,21616,21620-21622, 21627-21629,21634-21635,21638-21640,21643-21645,21649-21650,21652,21655, 21660-21667,21671-21673,21675-21677,21679-21681,21684-21688,21690-21691, 21696-21697,21700-21712,21714,21720-21725,21729-21730,21735-21738 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r21575 | dragos | 2010-04-14 11:35:50 +0200 (Wed, 14 Apr 2010) | 1 line Revert "Don't decode symbols in .toString." ........ r21577 | rytz | 2010-04-14 18:06:14 +0200 (Wed, 14 Apr 2010) | 1 line added scalacheck.jar and *.test files to the scala-test sbaz package. no review. ........ r21596 | extempore | 2010-04-15 17:23:49 +0200 (Thu, 15 Apr 2010) | 1 line A repl corner case. Closes #3298, no review. ........ r21597 | extempore | 2010-04-15 20:30:58 +0200 (Thu, 15 Apr 2010) | 4 lines Removed a bunch of -Y warning options. I intend to someday bring them back in the form of a compiler plugin. Also promoted -Yfatal-warnings to -Xfatal-warnings: this is key to writing tests which involve warnings and should be at least semi-supported. Closes #3300, no review. ........ r21598 | extempore | 2010-04-15 23:58:47 +0200 (Thu, 15 Apr 2010) | 3 lines Initialization ordering issue in BigDecimal. (More of these may be slipping by because -Xcheckinit doesn't work since specialization began.) No review. ........ r21599 | extempore | 2010-04-16 00:18:15 +0200 (Fri, 16 Apr 2010) | 3 lines Improved @tailrec error messages to specify the reason. In the process fixed old bug involving tail call transformation. Closes #3275, #2018. Review by dragos. ........ r21603 | extempore | 2010-04-16 03:53:46 +0200 (Fri, 16 Apr 2010) | 1 line Added a test to make sure distinct preserves ordering. No review ........ r21604 | extempore | 2010-04-16 05:26:33 +0200 (Fri, 16 Apr 2010) | 3 lines More polishing up features in partest which worked somewhere along the way but not at the end. This time it is unknown options: now it will complain. Closes #3289, no review. ........ r21606 | extempore | 2010-04-16 20:32:49 +0200 (Fri, 16 Apr 2010) | 3 lines Made partest diff algorithm much more lenient. Altered partest --update-check to create the check file if none exists as well as updating a pre-existing one. No review. ........ r21607 | extempore | 2010-04-16 20:34:02 +0200 (Fri, 16 Apr 2010) | 2 lines Degeneralized some incomplete generalization of the diff machinery. Improved the summary output on failures. No review. ........ r21611 | extempore | 2010-04-17 21:44:24 +0200 (Sat, 17 Apr 2010) | 1 line Fix and test case for forwarder duplicate bug. Closes #3004, no review. ........ r21616 | extempore | 2010-04-18 21:10:58 +0200 (Sun, 18 Apr 2010) | 2 lines Raised some partest timeouts, I think with these we might see the windows nightly pass. No review. ........ r21620 | plocinic | 2010-04-19 14:46:23 +0200 (Mon, 19 Apr 2010) | 1 line Better fix for #2757. Review by milessabin. ........ r21621 | dcaoyuan | 2010-04-19 17:16:53 +0200 (Mon, 19 Apr 2010) | 1 line Fixed #3322wq ........ r21622 | plocinic | 2010-04-19 17:33:39 +0200 (Mon, 19 Apr 2010) | 1 line Missing bit from r21620. In-memory classes need to be treated in the old way. ........ r21627 | rytz | 2010-04-20 15:08:52 +0200 (Tue, 20 Apr 2010) | 1 line fix bootstrap library build. review by odersky ........ r21628 | extempore | 2010-04-20 20:07:43 +0200 (Tue, 20 Apr 2010) | 2 lines More fully integrate immutable.Queue into collections. Fixes issue with return type of methods being Seq. Closes #3297, no review. ........ r21629 | extempore | 2010-04-20 20:07:54 +0200 (Tue, 20 Apr 2010) | 2 lines Undeprecated @retain as suggested by odersky on scala-internals 3/24/10. No review. ........ r21634 | extempore | 2010-04-21 07:08:25 +0200 (Wed, 21 Apr 2010) | 6 lines Handled action items (1) and (4) of the phaller/cunei/rytz agenda for a less regressive partest, to the extent possible without some accompanying sbaz changes. Unnecessary sanity check which failed on sane but non-trunk filesystem layouts removed. Files with custom command sequences explicitly qualify the path to the filenames listed in the .cmds file. Review by phaller. ........ r21635 | extempore | 2010-04-21 07:28:07 +0200 (Wed, 21 Apr 2010) | 3 lines Fixed bug in update method visibility which caused x += y not to find x's update method when defined generically. Closes #3278. Already reviewed by odersky. ........ r21638 | dragos | 2010-04-21 16:00:50 +0200 (Wed, 21 Apr 2010) | 1 line Fixed retyping of ThisTypes and less aggressive calls to makeNotPrivate ........ r21639 | dragos | 2010-04-21 16:00:54 +0200 (Wed, 21 Apr 2010) | 4 lines Changed the way special overrides are implemented. Instead of duplicating the source tree, it is moved from the generic method to its specialized variant. The owners are changed, and value/type parameter symbols are updated. This should fix most bugs involving call-by-name parameters. ........ r21640 | dubochet | 2010-04-21 16:38:57 +0200 (Wed, 21 Apr 2010) | 1 line [scaladoc] Slight change to design of how CommentFactory and ModelFactory are mixed together. Okayed by Pedro. ........ r21643 | extempore | 2010-04-21 19:06:38 +0200 (Wed, 21 Apr 2010) | 5 lines Since pickled data moved into annotations ShowPickled has been confusedly scratching its head. Made tools/showPickled work again. In the process created a simple interface for creating command line tools for the (majority of) commands which would just like to specify a handful of options. No review. ........ r21644 | extempore | 2010-04-21 19:06:59 +0200 (Wed, 21 Apr 2010) | 32 lines Two new command line programs in ~/tools: scmp and tokens. 1) scmp: will need a bit more fleshing out to be super useful, but here is what you can do right now: // This means run the given command line first with the options // given to p1 and then without, and show the diff in output. % tools/scmp --p1 '-no-specialization -nowarn' scalac -Ydebug src/library/scala/Function1.scala Upcoming features will involve seeing diffs of such things as the pickled signatures of generated files and the javap disassembly. 2) tokens: tokenizes all the scala files found under any given paths and prints one token per line. Example: the five most frequently used tokens under scala/util. % tools/tokens src/library/scala/util |sort | uniq -c | sort -r | head -5 598 ')' 598 '(' 347 ; 294 '=' 278 , Good to see those parens are balanced. Example: number of appearances of an identifier called x: % tools/tokens src/library/scala/util | grep ^x$ | wc 137 Way to go, x. Review by community. ........ r21645 | extempore | 2010-04-21 21:44:45 +0200 (Wed, 21 Apr 2010) | 2 lines Fixed a couple bugs in tools/tokens which were mysteriously more visible once it was checked in. No review. ........ r21649 | extempore | 2010-04-22 01:11:43 +0200 (Thu, 22 Apr 2010) | 10 lines Added two options to tools/tokens, --sliding and --freq. Using both: % tools/tokens --sliding 10 --freq src/compiler/scala/tools/nsc/typechecker | head -5 34 'if' '(' settings '.' debug '.' value ')' log '(' 17 scala '.' tools '.' nsc ; 'package' typechecker ;; 'import' 17 'package' scala '.' tools '.' nsc ; 'package' typechecker ;; 16 '}' 'package' scala '.' tools '.' nsc ; 'package' typechecker 15 ')' '{' 'if' '(' settings '.' debug '.' value ')' No review. ........ r21650 | phaller | 2010-04-22 10:04:12 +0200 (Thu, 22 Apr 2010) | 1 line Reactor.exceptionHandler is defined on Throwable instead of Exception. Fixes potential problem with visibility of changes to a field. Review by plocinic. ........ r21652 | phaller | 2010-04-22 12:26:29 +0200 (Thu, 22 Apr 2010) | 1 line Reverted change of Reactor.exceptionHandler's type of see r21650. Review by plocinic. ........ r21655 | plocinic | 2010-04-22 16:48:46 +0200 (Thu, 22 Apr 2010) | 1 line Some cleanup I did when looking at #2769. ........ r21660 | odersky | 2010-04-23 14:31:33 +0200 (Fri, 23 Apr 2010) | 1 line Fixed implicits problem in specs; Manifest[Class[_]] can now be generated. review by dubochet. ........ r21661 | odersky | 2010-04-23 14:34:44 +0200 (Fri, 23 Apr 2010) | 1 line Fixed typo in error message. No review. ........ r21662 | odersky | 2010-04-23 15:11:03 +0200 (Fri, 23 Apr 2010) | 1 line Fixed potential duplicate error annotation "Error occurred in an application involving default arguments." ........ r21663 | imaier | 2010-04-23 16:07:29 +0200 (Fri, 23 Apr 2010) | 1 line added missing SuperMixins ........ r21664 | plocinic | 2010-04-23 17:14:24 +0200 (Fri, 23 Apr 2010) | 1 line Closes #3108 plus removed some semicolons. No review. ........ r21665 | plocinic | 2010-04-23 17:14:27 +0200 (Fri, 23 Apr 2010) | 1 line Added test for #3081. No review. ........ r21666 | extempore | 2010-04-23 23:20:14 +0200 (Fri, 23 Apr 2010) | 16 lines Created Mutable and Immutable SetFactories to deal with the spectacular performance regression which accompanies the use of AddingBuilder on mutable Sets. Because '+' now creates a new collection even on mutable sets, AddingBuilder on a 100K element collection will create garbage sets of size 1,2,3...,99,999 before finishing. Thankfully there is already GrowingBuilder. See test/files/run/adding-growing-set.scala for a demonstration. This patch is not complete: in particular, SortedSet and SetBuilder need attention. Unfortunately there is a combinatorial jump in the number of Addable/Growable divisions which arises once one tries to accomodate both Sorted signatures (taking an Ordering) and unsorted signatures, so will come back to it after receiving counsel. Review by odersky. ........ r21667 | extempore | 2010-04-24 00:13:41 +0200 (Sat, 24 Apr 2010) | 4 lines Added size hints to Array.{ iterate, range, tabulate, fill }. Probably closes #3331, but it would be nice if someone would measure whether it makes much difference to skip the builder entirely in those cases where that could be done. No review. ........ r21671 | extempore | 2010-04-24 04:49:34 +0200 (Sat, 24 Apr 2010) | 2 lines Took another of universal equality's victims to the hospital. Closes #3348, no review. ........ r21672 | extempore | 2010-04-24 09:01:47 +0200 (Sat, 24 Apr 2010) | 8 lines StringBuilder no longer violates the Seq reverse contract: it returns a new StringBuilder. The behavior formerly found in reverse (updates in place) is now available in reverseContents. Migration warning on reverse. Closes #3327. Also did some StringBuilder rewriting as per discussion with odersky. And took a cleaver to parts of the documentation to get to the good parts a little faster. Review by community. ........ r21673 | extempore | 2010-04-24 17:17:41 +0200 (Sat, 24 Apr 2010) | 2 lines Another guess falling somewhere between educated and wild as to how to get the auxjvm nightly passing again. No review. ........ r21675 | rytz | 2010-04-25 08:23:11 +0200 (Sun, 25 Apr 2010) | 1 line close #3338, close #3334, close #3345. review by community. ........ r21676 | phaller | 2010-04-25 18:50:01 +0200 (Sun, 25 Apr 2010) | 1 line Closes #3356. Removes ad-hoc exception propagation logic from ActorCanReply.!!. Review by prokopec. ........ r21677 | prokopec | 2010-04-25 21:58:01 +0200 (Sun, 25 Apr 2010) | 1 line Fixes #3350. review by extempore ........ r21679 | extempore | 2010-04-26 01:20:59 +0200 (Mon, 26 Apr 2010) | 19 lines Some overdue improvements in repl completion, which has been largely awol since the pickler format change. Where possible, completion is now done using the compiler's internal model rather than reflection. Many handy things now work which did not before, such as wildcard imports causing all imported identifiers to henceforth be completable. Note also that there is a verbosity counter now, so hitting tab twice may yield more results than hitting it once. scala> import java.util.concurrent.atomic._ import java.util.concurrent.atomic._ scala> Atomic<tab><tab> AtomicBoolean AtomicInteger AtomicIntegerArray AtomicIntegerFieldUpdater AtomicLong AtomicLongArray [etc] Review by community. ........ r21680 | rytz | 2010-04-26 10:17:22 +0200 (Mon, 26 Apr 2010) | 1 line moved AnnotationDefaultAttr to scala.runtime. no review. ........ r21681 | odersky | 2010-04-26 12:15:37 +0200 (Mon, 26 Apr 2010) | 1 line Solves the "same type after erasure problem" uncovered by Derek. Review by rytz. ........ r21684 | dubochet | 2010-04-26 15:10:06 +0200 (Mon, 26 Apr 2010) | 1 line Improved documentation for `NodeSeq.\` and `NodeSeq.\\` (#3328). No review. ........ r21685 | dubochet | 2010-04-26 15:11:22 +0200 (Mon, 26 Apr 2010) | 1 line Better positioned regular expression parser, contributed by "asloane" (#3254). No review. ........ r21686 | malayeri | 2010-04-26 15:13:41 +0200 (Mon, 26 Apr 2010) | 1 line [scaladoc] Fix alignment of "Inherited" and "Visibility" labels in the page filter area. Review by dubochet. ........ r21687 | malayeri | 2010-04-26 15:19:46 +0200 (Mon, 26 Apr 2010) | 1 line [scaladoc] Added missing file for previous commit. ........ r21688 | malayeri | 2010-04-26 15:24:12 +0200 (Mon, 26 Apr 2010) | 1 line [scaladoc] Added TODO comments for later fixing issue that sourceless templates are not documented. No review. ........ r21690 | malayeri | 2010-04-26 15:30:09 +0200 (Mon, 26 Apr 2010) | 1 line [scaladoc] Moved object/template icons to the left of the link in the index. Review by dubochet. ........ r21691 | malayeri | 2010-04-26 15:33:41 +0200 (Mon, 26 Apr 2010) | 1 line [scaladoc] Removed commented-out items in the css, which should have just been removed in the first place. No review. ........ r21696 | prokopec | 2010-04-26 22:34:57 +0200 (Mon, 26 Apr 2010) | 1 line Typo patrol. no review ........ r21697 | extempore | 2010-04-26 22:42:03 +0200 (Mon, 26 Apr 2010) | 16 lines Mostly finishing the ball that got rolling in r21679. scala> String.cop<tab> scala> String.copyValueOf<tab> def copyValueOf(Array[Char]): String def copyValueOf(Array[Char], Int, Int): String scala> Nil.mkString<tab><tab> def mkString(sep: String): String def mkString(start: String, sep: String, end: String): String def mkString: String Lines which are not simply delimited don't work yet, so don't go expecting List(1).<tab> to do the right thing. Yet. No review. ........ r21700 | extempore | 2010-04-27 09:21:29 +0200 (Tue, 27 Apr 2010) | 1 line Some cleanups in repl completion and power mode. No review. ........ r21701 | extempore | 2010-04-27 09:40:17 +0200 (Tue, 27 Apr 2010) | 1 line Fixing the test I broke with the last commit. No review. ........ r21702 | moors | 2010-04-27 16:04:02 +0200 (Tue, 27 Apr 2010) | 5 lines fixed #3349 : method symbol cached too aggressively cooking raw types changes a symbol's info, but the change was masked by caching in MethodSymbol review by odersky ........ r21703 | dragos | 2010-04-27 17:08:57 +0200 (Tue, 27 Apr 2010) | 1 line Fixed crash when calling super in a closure (see #3312). Closes #3325. No review. ........ r21704 | dragos | 2010-04-27 17:09:00 +0200 (Tue, 27 Apr 2010) | 2 lines Fixed construction of specialized classes in the presence of side-effects and non-trivial initializers. Review by odersky. ........ r21705 | dragos | 2010-04-27 17:09:04 +0200 (Tue, 27 Apr 2010) | 1 line Added test for several tickets that were fixed earlier this week. no review. ........ r21706 | extempore | 2010-04-27 18:36:39 +0200 (Tue, 27 Apr 2010) | 7 lines Created TypeDiagnostics trait and have begun opportunistically moving code into it. Along the way, some improvements to error messages. The situation described in ticket #2206 has always had an applicable error message, but it wasn't making it out to the user. More kinds of ambiguity are disambiguated, see the test cases. And overload errors are printed with some formatting so one has some hope of parsing. Review by odersky. ........ r21707 | dragos | 2010-04-27 19:06:00 +0200 (Tue, 27 Apr 2010) | 1 line Fixed broken test file. No review. ........ r21708 | extempore | 2010-04-27 20:39:45 +0200 (Tue, 27 Apr 2010) | 2 lines Various refinements and polishing to do with method signature completion. No review. ........ r21709 | odersky | 2010-04-27 21:18:36 +0200 (Tue, 27 Apr 2010) | 2 lines Closes #3362. Review by dragos. ........ r21710 | extempore | 2010-04-27 21:27:04 +0200 (Tue, 27 Apr 2010) | 2 lines Added size hints to builders where possible without introducing new methods. Closes #3331, review by community. ........ r21711 | extempore | 2010-04-27 23:31:05 +0200 (Tue, 27 Apr 2010) | 1 line A small error message improvement suggested at #3092. No review. ........ r21712 | phaller | 2010-04-28 00:10:36 +0200 (Wed, 28 Apr 2010) | 1 line Fixed scaladoc output for several types and members. No review. ........ r21714 | rytz | 2010-04-28 11:37:03 +0200 (Wed, 28 Apr 2010) | 1 line no inlining on msil. this will fix msil build. no review ........ r21720 | ilyas | 2010-04-28 14:29:26 +0200 (Wed, 28 Apr 2010) | 1 line scalap: signature for case classes fixed ........ r21721 | phaller | 2010-04-28 15:28:45 +0200 (Wed, 28 Apr 2010) | 1 line Closes #3364. No review. ........ r21722 | phaller | 2010-04-28 17:26:22 +0200 (Wed, 28 Apr 2010) | 1 line Closes #3365. Adds test for new code. Review by prokopec. ........ r21723 | extempore | 2010-04-28 17:31:17 +0200 (Wed, 28 Apr 2010) | 17 lines Added classes/continuations-plugin to the plugin build classpath. Explanation: as things stood the plugin step of the overall build fails constantly even when no files have been touched. The reason is that if one checks out an older version of the repository and then returns to the master, a subset of continuation source files will have more recent modification dates than their corresponding classes, and ant sees that as a reason to rebuild them. But without continuations-plugin on the classpath, it cannot see the classfiles of those which were not changed. IOW, if a project has A.scala B.scala C.scala and tries to rebuild only A.scala and C.scala, B.class must be somewhere it can be seen. We can resolve this differently if desired but this is how the rest of the compiler does it. (Try removing quick from quick's classpath and rebuilding after some changes.) Review by rompf. ........ r21724 | extempore | 2010-04-28 20:42:26 +0200 (Wed, 28 Apr 2010) | 3 lines Some path-dependent type fiddling so power mode Trees don't come back typed _5.compiler.Tree forSome { val _5: scala.tools.nsc.Interpreter } or similar. No review. ........ r21725 | extempore | 2010-04-28 22:30:48 +0200 (Wed, 28 Apr 2010) | 3 lines Fixed bug in Iterator.iterate which would lead to a runtime exception under some circumstances due to inadequate laziness in calculating the next element. No review. ........ r21729 | rytz | 2010-04-29 08:37:18 +0200 (Thu, 29 Apr 2010) | 1 line improved doc for PARAMACCESSOR flag. no review ........ r21730 | rytz | 2010-04-29 10:09:38 +0200 (Thu, 29 Apr 2010) | 1 line fix msil backend. no review ........ r21735 | phaller | 2010-04-29 10:51:32 +0200 (Thu, 29 Apr 2010) | 1 line Closes #3369. Review by plocinic. ........ r21736 | phaller | 2010-04-29 11:00:51 +0200 (Thu, 29 Apr 2010) | 1 line UncaughtException is now a case class (see #2017). Review by plocinic. ........ r21737 | phaller | 2010-04-29 11:17:24 +0200 (Thu, 29 Apr 2010) | 1 line Removes scala.concurrent.AsyncInvokable, which is superseded by scala.actors.CanReply. No review. ........ r21738 | phaller | 2010-04-29 11:44:30 +0200 (Thu, 29 Apr 2010) | 1 line Made internal helper methods in concurrent.ops private. Removed protected tryCatch helper method from concurrent.TaskRunner. Review by rompf. ........
Diffstat (limited to 'src/swing')
-rw-r--r--src/swing/scala/swing/EditorPane.scala2
-rw-r--r--src/swing/scala/swing/FlowPanel.scala4
-rw-r--r--src/swing/scala/swing/FormattedTextField.scala2
-rw-r--r--src/swing/scala/swing/GridBagPanel.scala6
-rw-r--r--src/swing/scala/swing/GridPanel.scala3
-rw-r--r--src/swing/scala/swing/Label.scala3
-rw-r--r--src/swing/scala/swing/ListView.scala2
-rw-r--r--src/swing/scala/swing/MainFrame.scala2
-rw-r--r--src/swing/scala/swing/Menu.scala2
-rw-r--r--src/swing/scala/swing/PasswordField.scala2
-rw-r--r--src/swing/scala/swing/ProgressBar.scala2
-rw-r--r--src/swing/scala/swing/RadioButton.scala2
-rw-r--r--src/swing/scala/swing/ScrollBar.scala2
-rw-r--r--src/swing/scala/swing/ScrollPane.scala2
-rw-r--r--src/swing/scala/swing/Separator.scala2
-rw-r--r--src/swing/scala/swing/Slider.scala2
-rw-r--r--src/swing/scala/swing/SplitPane.scala2
-rw-r--r--src/swing/scala/swing/TabbedPane.scala2
-rw-r--r--src/swing/scala/swing/Table.scala2
-rw-r--r--src/swing/scala/swing/TextArea.scala5
-rw-r--r--src/swing/scala/swing/ToggleButton.scala2
21 files changed, 29 insertions, 24 deletions
diff --git a/src/swing/scala/swing/EditorPane.scala b/src/swing/scala/swing/EditorPane.scala
index d90615299d..884da6a371 100644
--- a/src/swing/scala/swing/EditorPane.scala
+++ b/src/swing/scala/swing/EditorPane.scala
@@ -21,7 +21,7 @@ import java.awt.event._
* @see javax.swing.JEditorPane
*/
class EditorPane(contentType0: String, text0: String) extends TextComponent {
- override lazy val peer: JEditorPane = new JEditorPane(contentType0, text0) with SuperMixin {}
+ override lazy val peer: JEditorPane = new JEditorPane(contentType0, text0) with SuperMixin
def this() = this("text/plain", "")
def contentType: String = peer.getContentType
diff --git a/src/swing/scala/swing/FlowPanel.scala b/src/swing/scala/swing/FlowPanel.scala
index 5b2d1950a4..65833940f5 100644
--- a/src/swing/scala/swing/FlowPanel.scala
+++ b/src/swing/scala/swing/FlowPanel.scala
@@ -12,6 +12,7 @@
package scala.swing
import java.awt.FlowLayout
+import javax.swing.JPanel
object FlowPanel {
object Alignment extends Enumeration {
@@ -30,7 +31,8 @@ object FlowPanel {
* @see java.awt.FlowLayout
*/
class FlowPanel(alignment: FlowPanel.Alignment.Value)(contents0: Component*) extends Panel with SequentialContainer.Wrapper {
- override lazy val peer: javax.swing.JPanel = new javax.swing.JPanel(new java.awt.FlowLayout(alignment.id))
+ override lazy val peer: JPanel =
+ new JPanel(new java.awt.FlowLayout(alignment.id)) with SuperMixin
def this(contents0: Component*) = this(FlowPanel.Alignment.Center)(contents0: _*)
def this() = this(FlowPanel.Alignment.Center)()
diff --git a/src/swing/scala/swing/FormattedTextField.scala b/src/swing/scala/swing/FormattedTextField.scala
index c82c0fe45f..1a2d1dacb4 100644
--- a/src/swing/scala/swing/FormattedTextField.scala
+++ b/src/swing/scala/swing/FormattedTextField.scala
@@ -33,7 +33,7 @@ object FormattedTextField {
* @see javax.swing.JFormattedTextField
*/
class FormattedTextField(format: java.text.Format) extends TextComponent {
- override lazy val peer: JFormattedTextField = new JFormattedTextField(format)
+ override lazy val peer: JFormattedTextField = new JFormattedTextField(format) with SuperMixin
import FormattedTextField._
diff --git a/src/swing/scala/swing/GridBagPanel.scala b/src/swing/scala/swing/GridBagPanel.scala
index 5402d1f686..412ec3f4f5 100644
--- a/src/swing/scala/swing/GridBagPanel.scala
+++ b/src/swing/scala/swing/GridBagPanel.scala
@@ -11,7 +11,7 @@
package scala.swing
-import java.awt.{GridBagConstraints}
+import java.awt.{GridBagConstraints, GridBagLayout}
object GridBagPanel {
@@ -50,10 +50,10 @@ object GridBagPanel {
* @see java.awt.GridBagLayout
*/
class GridBagPanel extends Panel with LayoutContainer {
- override lazy val peer = new javax.swing.JPanel(new java.awt.GridBagLayout)
+ override lazy val peer = new javax.swing.JPanel(new GridBagLayout) with SuperMixin
import GridBagPanel._
- private def layoutManager = peer.getLayout.asInstanceOf[java.awt.GridBagLayout]
+ private def layoutManager = peer.getLayout.asInstanceOf[GridBagLayout]
/**
* Convenient conversion from xy-coords given as pairs to
diff --git a/src/swing/scala/swing/GridPanel.scala b/src/swing/scala/swing/GridPanel.scala
index b37f26221d..608b8810a2 100644
--- a/src/swing/scala/swing/GridPanel.scala
+++ b/src/swing/scala/swing/GridPanel.scala
@@ -21,7 +21,8 @@ object GridPanel {
* @see java.awt.GridLayout
*/
class GridPanel(rows0: Int, cols0: Int) extends Panel with SequentialContainer.Wrapper {
- override lazy val peer = new javax.swing.JPanel(new java.awt.GridLayout(rows0, cols0))
+ override lazy val peer =
+ new javax.swing.JPanel(new java.awt.GridLayout(rows0, cols0)) with SuperMixin
/*type Constraints = (Int, Int)
diff --git a/src/swing/scala/swing/Label.scala b/src/swing/scala/swing/Label.scala
index 2a24e8cd02..31b2b0c87c 100644
--- a/src/swing/scala/swing/Label.scala
+++ b/src/swing/scala/swing/Label.scala
@@ -20,7 +20,8 @@ import scala.swing.Swing._
* @see javax.swing.JLabel
*/
class Label(text0: String, icon0: Icon, align: Alignment.Value) extends Component {
- override lazy val peer: JLabel = new JLabel(text0, toNullIcon(icon0), align.id) with SuperMixin
+ override lazy val peer: JLabel =
+ new JLabel(text0, toNullIcon(icon0), align.id) with SuperMixin
def this() = this("", EmptyIcon, Alignment.Center)
def this(s: String) = this(s, EmptyIcon, Alignment.Center)
diff --git a/src/swing/scala/swing/ListView.scala b/src/swing/scala/swing/ListView.scala
index a15471796c..9c7b7d6d19 100644
--- a/src/swing/scala/swing/ListView.scala
+++ b/src/swing/scala/swing/ListView.scala
@@ -143,7 +143,7 @@ object ListView {
*/
class ListView[A] extends Component {
import ListView._
- override lazy val peer: JList = new JList
+ override lazy val peer: JList = new JList with SuperMixin
def this(items: Seq[A]) = {
this()
diff --git a/src/swing/scala/swing/MainFrame.scala b/src/swing/scala/swing/MainFrame.scala
index 361da6233b..ec4e74958b 100644
--- a/src/swing/scala/swing/MainFrame.scala
+++ b/src/swing/scala/swing/MainFrame.scala
@@ -18,5 +18,5 @@ import event._
* framework and quits the application when closed.
*/
class MainFrame extends Frame {
- override def closeOperation { System.exit(0); }
+ override def closeOperation { System.exit(0) }
}
diff --git a/src/swing/scala/swing/Menu.scala b/src/swing/scala/swing/Menu.scala
index 14855fd51f..55773320c6 100644
--- a/src/swing/scala/swing/Menu.scala
+++ b/src/swing/scala/swing/Menu.scala
@@ -24,7 +24,7 @@ object MenuBar {
* @see javax.swing.JMenuBar
*/
class MenuBar extends Component with SequentialContainer.Wrapper {
- override lazy val peer: JMenuBar = new JMenuBar
+ override lazy val peer: JMenuBar = new JMenuBar with SuperMixin
def menus: Seq[Menu] = contents.filter(_.isInstanceOf[Menu]).map(_.asInstanceOf[Menu])
diff --git a/src/swing/scala/swing/PasswordField.scala b/src/swing/scala/swing/PasswordField.scala
index 4b07969612..568cc3b927 100644
--- a/src/swing/scala/swing/PasswordField.scala
+++ b/src/swing/scala/swing/PasswordField.scala
@@ -21,7 +21,7 @@ import java.awt.event._
* @see javax.swing.JPasswordField
*/
class PasswordField(text0: String, columns0: Int) extends TextField(text0, columns0) {
- override lazy val peer: JPasswordField = new JPasswordField(text0, columns0)
+ override lazy val peer: JPasswordField = new JPasswordField(text0, columns0) with SuperMixin
def this(text: String) = this(text, 0)
def this(columns: Int) = this("", columns)
def this() = this("")
diff --git a/src/swing/scala/swing/ProgressBar.scala b/src/swing/scala/swing/ProgressBar.scala
index d43ddd5717..c6c2ae25d3 100644
--- a/src/swing/scala/swing/ProgressBar.scala
+++ b/src/swing/scala/swing/ProgressBar.scala
@@ -22,7 +22,7 @@ import event._
*/
class ProgressBar extends Component with Orientable.Wrapper {
override lazy val peer: javax.swing.JProgressBar =
- new javax.swing.JProgressBar
+ new javax.swing.JProgressBar with SuperMixin
def min: Int = peer.getMinimum
def min_=(v: Int) { peer.setMinimum(v) }
diff --git a/src/swing/scala/swing/RadioButton.scala b/src/swing/scala/swing/RadioButton.scala
index ae789b077c..3b3e60816b 100644
--- a/src/swing/scala/swing/RadioButton.scala
+++ b/src/swing/scala/swing/RadioButton.scala
@@ -21,6 +21,6 @@ import javax.swing._
* @see javax.swing.JRadioButton
*/
class RadioButton(text0: String) extends ToggleButton {
- override lazy val peer: JRadioButton = new JRadioButton(text0)
+ override lazy val peer: JRadioButton = new JRadioButton(text0) with SuperMixin
def this() = this("")
}
diff --git a/src/swing/scala/swing/ScrollBar.scala b/src/swing/scala/swing/ScrollBar.scala
index 2ae8cd5c4e..28245edda7 100644
--- a/src/swing/scala/swing/ScrollBar.scala
+++ b/src/swing/scala/swing/ScrollBar.scala
@@ -23,7 +23,7 @@ object ScrollBar {
}
class ScrollBar extends Component with Orientable.Wrapper with Adjustable.Wrapper {
- override lazy val peer = new JScrollBar
+ override lazy val peer: JScrollBar = new JScrollBar with SuperMixin
def valueIsAjusting = peer.getValueIsAdjusting
def valueIsAjusting_=(b : Boolean) = peer.setValueIsAdjusting(b)
diff --git a/src/swing/scala/swing/ScrollPane.scala b/src/swing/scala/swing/ScrollPane.scala
index fc2e96e67a..16c4130671 100644
--- a/src/swing/scala/swing/ScrollPane.scala
+++ b/src/swing/scala/swing/ScrollPane.scala
@@ -43,7 +43,7 @@ object ScrollPane {
class ScrollPane extends Component with Container {
import ScrollPane._
- override lazy val peer: JScrollPane = new JScrollPane
+ override lazy val peer: JScrollPane = new JScrollPane with SuperMixin
def this(c: Component) = {
this()
contents = c
diff --git a/src/swing/scala/swing/Separator.scala b/src/swing/scala/swing/Separator.scala
index cf2bfd75d0..4fdf0edb70 100644
--- a/src/swing/scala/swing/Separator.scala
+++ b/src/swing/scala/swing/Separator.scala
@@ -19,6 +19,6 @@ import javax.swing._
* @see javax.swing.JSeparator
*/
class Separator(o: Orientation.Value) extends Component with Oriented.Wrapper {
- override lazy val peer: JSeparator = new JSeparator(o.id)
+ override lazy val peer: JSeparator = new JSeparator(o.id) with SuperMixin
def this() = this(Orientation.Horizontal)
}
diff --git a/src/swing/scala/swing/Slider.scala b/src/swing/scala/swing/Slider.scala
index 793f5eb5bb..10b79f37cc 100644
--- a/src/swing/scala/swing/Slider.scala
+++ b/src/swing/scala/swing/Slider.scala
@@ -24,7 +24,7 @@ import event._
* @see javax.swing.JSlider
*/
class Slider extends Component with Orientable.Wrapper with Publisher {
- override lazy val peer: JSlider = new JSlider
+ override lazy val peer: JSlider = new JSlider with SuperMixin
def min: Int = peer.getMinimum
def min_=(v: Int) { peer.setMinimum(v) }
diff --git a/src/swing/scala/swing/SplitPane.scala b/src/swing/scala/swing/SplitPane.scala
index c9f1641ef7..bad3f32bed 100644
--- a/src/swing/scala/swing/SplitPane.scala
+++ b/src/swing/scala/swing/SplitPane.scala
@@ -23,7 +23,7 @@ import Swing._
*/
class SplitPane(o: Orientation.Value, left: Component, right: Component) extends Component with Container with Orientable.Wrapper {
override lazy val peer: javax.swing.JSplitPane =
- new javax.swing.JSplitPane(o.id, left.peer, right.peer)
+ new javax.swing.JSplitPane(o.id, left.peer, right.peer) with SuperMixin
def this(o: Orientation.Value) = this(o, new Component {}, new Component {})
def this() = this(Orientation.Horizontal)
diff --git a/src/swing/scala/swing/TabbedPane.scala b/src/swing/scala/swing/TabbedPane.scala
index b8fb1472fb..ec688a0cf0 100644
--- a/src/swing/scala/swing/TabbedPane.scala
+++ b/src/swing/scala/swing/TabbedPane.scala
@@ -77,7 +77,7 @@ object TabbedPane {
* @see javax.swing.JTabbedPane
*/
class TabbedPane extends Component with Publisher {
- override lazy val peer: JTabbedPane = new JTabbedPane
+ override lazy val peer: JTabbedPane = new JTabbedPane with SuperMixin
import TabbedPane._
object pages extends BufferWrapper[Page] {
diff --git a/src/swing/scala/swing/Table.scala b/src/swing/scala/swing/Table.scala
index 9370ea7eb1..2993f1d84e 100644
--- a/src/swing/scala/swing/Table.scala
+++ b/src/swing/scala/swing/Table.scala
@@ -110,7 +110,7 @@ object Table {
* @see javax.swing.JTable
*/
class Table extends Component with Scrollable.Wrapper {
- override lazy val peer: JTable = new JTable with Table.JTableMixin {
+ override lazy val peer: JTable = new JTable with Table.JTableMixin with SuperMixin {
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) =
diff --git a/src/swing/scala/swing/TextArea.scala b/src/swing/scala/swing/TextArea.scala
index d491b0b0c6..201e4ab674 100644
--- a/src/swing/scala/swing/TextArea.scala
+++ b/src/swing/scala/swing/TextArea.scala
@@ -20,8 +20,9 @@ import java.awt.event._
*
* @see javax.swing.JTextArea
*/
-class TextArea(text0: String, rows0: Int, columns0: Int) extends TextComponent with TextComponent.HasColumns with TextComponent.HasRows {
- override lazy val peer: JTextArea = new JTextArea(text0, rows0, columns0)
+class TextArea(text0: String, rows0: Int, columns0: Int) extends TextComponent
+ with TextComponent.HasColumns with TextComponent.HasRows {
+ override lazy val peer: JTextArea = new JTextArea(text0, rows0, columns0) with SuperMixin
def this(text: String) = this(text, 0, 0)
def this(rows: Int, columns: Int) = this("", rows, columns)
def this() = this("", 0, 0)
diff --git a/src/swing/scala/swing/ToggleButton.scala b/src/swing/scala/swing/ToggleButton.scala
index 506f611c95..59f310dc23 100644
--- a/src/swing/scala/swing/ToggleButton.scala
+++ b/src/swing/scala/swing/ToggleButton.scala
@@ -21,6 +21,6 @@ import javax.swing._
* @see javax.swing.JToggleButton
*/
class ToggleButton(text0: String) extends AbstractButton {
- override lazy val peer: JToggleButton = new JToggleButton(text0)
+ override lazy val peer: JToggleButton = new JToggleButton(text0) with SuperMixin
def this() = this("")
}