Merge pull request #83 from xuwei-k/procedure-syntax

Sciss · web-flow · commit c52d48be0525 · 2018-08-10T09:40:17.000+02:00
fix procedure syntax
diff --git a/examples/src/main/scala/scala/swing/examples/CelsiusConverter.scala b/examples/src/main/scala/scala/swing/examples/CelsiusConverter.scala
@@ -31,7 +31,7 @@ object CelsiusConverter extends SimpleSwingApplication {
       border = Swing.EmptyBorder(5, 5, 5, 5)
       listenTo(convertButton, tempCelsius)
 
-      def convert() {
+      def convert(): Unit = {
         val c = Integer.parseInt(tempCelsius.text)
         val f = c * 9 / 5 + 32
         text = "<html><font color = red>" + f + "</font> Fahrenheit</html>"
diff --git a/examples/src/main/scala/scala/swing/examples/ComboBoxes.scala b/examples/src/main/scala/scala/swing/examples/ComboBoxes.scala
@@ -56,7 +56,7 @@ object ComboBoxes extends SimpleSwingApplication {
 
     listenTo(dateBox.selection)
 
-    def reformat() {
+    def reformat(): Unit = {
       try {
         val today = new Date
         val formatter = new SimpleDateFormat(dateBox.selection.item)
@@ -86,7 +86,7 @@ object ComboBoxes extends SimpleSwingApplication {
 
     val iconBox = new ComboBox(icons) {
       renderer = new ListView.AbstractRenderer[Icon, Label](new Label) {
-        def configure(list: ListView[_], isSelected: Boolean, focused: Boolean, icon: Icon, index: Int) {
+        def configure(list: ListView[_], isSelected: Boolean, focused: Boolean, icon: Icon, index: Int): Unit = {
           component.icon = icon
           component.xAlignment = Alignment.Center
           if (isSelected) {
diff --git a/examples/src/main/scala/scala/swing/examples/LinePainting.scala b/examples/src/main/scala/scala/swing/examples/LinePainting.scala
@@ -41,11 +41,11 @@ object LinePainting extends SimpleSwingApplication {
     /* records the dragging */
     var path = new geom.GeneralPath
 
-    def lineTo(p: Point) {
+    def lineTo(p: Point): Unit = {
       path.lineTo(p.x, p.y); repaint()
     }
 
-    def moveTo(p: Point) {
+    def moveTo(p: Point): Unit = {
       path.moveTo(p.x, p.y); repaint()
     }
 
diff --git a/examples/src/main/scala/scala/swing/examples/TableSelection.scala b/examples/src/main/scala/scala/swing/examples/TableSelection.scala
@@ -54,7 +54,7 @@ object TableSelection extends SimpleSwingApplication {
     }
     contents += new ScrollPane(output)
 
-    def outputSelection() {
+    def outputSelection(): Unit = {
       output.append("Lead: " + table.selection.rows.leadIndex + "," +
         table.selection.columns.leadIndex + ". ")
       output.append("Rows:")
diff --git a/examples/src/main/scala/scala/swing/examples/tutorials/components/IntegerEditor.scala b/examples/src/main/scala/scala/swing/examples/tutorials/components/IntegerEditor.scala
@@ -80,7 +80,7 @@ class IntegerEditor(min: Int, max: Int) extends DefaultCellEditor(new JFormatted
 
   ftf.getActionMap.put("check", new AbstractAction() {
 
-    def actionPerformed(e: ActionEvent) {
+    def actionPerformed(e: ActionEvent): Unit = {
       if (!ftf.isEditValid) {
         if (userSaysRevert()) {
           ftf.postActionEvent()
diff --git a/examples/src/main/scala/scala/swing/examples/tutorials/layout/DiagonalLayout.scala b/examples/src/main/scala/scala/swing/examples/tutorials/layout/DiagonalLayout.scala
@@ -55,13 +55,13 @@ class DiagonalLayout(private var vgap: Int) extends LayoutManager {
   }
 
   /* Required by LayoutManager. */
-  def addLayoutComponent(name: String, comp: Component) {
+  def addLayoutComponent(name: String, comp: Component): Unit = {
   }
 
-  def removeLayoutComponent(comp: Component) {
+  def removeLayoutComponent(comp: Component): Unit = {
   }
 
-  private def setSizes(parent: Container) {
+  private def setSizes(parent: Container): Unit = {
     val nComps = parent.getComponentCount
     var d: Dimension = null
     //Reset preferred/minimum width and height.
@@ -117,7 +117,7 @@ class DiagonalLayout(private var vgap: Int) extends LayoutManager {
      * minimumLayoutSize will be called -- in the case
      * of applets, at least, they probably won't be.
      */
-  def layoutContainer(parent: Container) {
+  def layoutContainer(parent: Container): Unit = {
     val insets = parent.getInsets
     val maxWidth = parent.getWidth - (insets.left + insets.right)
     val maxHeight = parent.getHeight - (insets.top + insets.bottom)

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,11 @@ object LinePainting extends SimpleSwingApplication {`
`41`	`41`	`/* records the dragging */`
`42`	`42`	`var path = new geom.GeneralPath`
`43`	`43`
`44`		`- def lineTo(p: Point) {`
	`44`	`+ def lineTo(p: Point): Unit = {`
`45`	`45`	`path.lineTo(p.x, p.y); repaint()`
`46`	`46`	`}`
`47`	`47`
`48`		`- def moveTo(p: Point) {`
	`48`	`+ def moveTo(p: Point): Unit = {`
`49`	`49`	`path.moveTo(p.x, p.y); repaint()`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ object TableSelection extends SimpleSwingApplication {`
`54`	`54`	`}`
`55`	`55`	`contents += new ScrollPane(output)`
`56`	`56`
`57`		`- def outputSelection() {`
	`57`	`+ def outputSelection(): Unit = {`
`58`	`58`	`output.append("Lead: " + table.selection.rows.leadIndex + "," +`
`59`	`59`	`table.selection.columns.leadIndex + ". ")`
`60`	`60`	`output.append("Rows:")`