Skip to content

Commit 580778d

Browse files
committed
Update copyright and reformat
1 parent f622991 commit 580778d

File tree

13 files changed

+38
-63
lines changed

13 files changed

+38
-63
lines changed

scala-console/src/main/scala/net/sf/ij_plugins/scala/ScalaConsolePlugin.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Image/J Plugins
3-
* Copyright (C) 2002-2012 Jarek Sacha
3+
* Copyright (C) 2002-2014 Jarek Sacha
44
* Author's email: jsacha at users dot sourceforge dot net
55
*
66
* This library is free software; you can redistribute it and/or
@@ -23,10 +23,10 @@
2323
package net.sf.ij_plugins.scala
2424

2525
import console.ScalaConsole
26-
import ij.plugin.PlugIn
27-
import java.lang.String
2826
import ij.IJ
27+
import ij.plugin.PlugIn
2928
import java.io.File
29+
import java.lang.String
3030

3131

3232
private object ScalaConsolePlugin {

scala-console/src/main/scala/net/sf/ij_plugins/scala/console/OutputArea.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Image/J Plugins
3-
* Copyright (C) 2002-2012 Jarek Sacha
3+
* Copyright (C) 2002-2014 Jarek Sacha
44
* Author's email: jsacha at users dot sourceforge dot net
55
*
66
* This library is free software; you can redistribute it and/or
@@ -22,10 +22,10 @@
2222

2323
package net.sf.ij_plugins.scala.console
2424

25+
import java.awt.{Dimension, BorderLayout, Color}
2526
import javax.swing._
2627
import swing.Swing
2728
import text.{StyleConstants, StyleContext, StyledDocument}
28-
import java.awt.{Dimension, BorderLayout, Color}
2929

3030

3131
/**

scala-console/src/main/scala/net/sf/ij_plugins/scala/console/ScalaConsole.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Image/J Plugins
3-
* Copyright (C) 2002-2012 Jarek Sacha
3+
* Copyright (C) 2002-2014 Jarek Sacha
44
* Author's email: jsacha at users dot sourceforge dot net
55
*
66
* This library is free software; you can redistribute it and/or

scala-console/src/main/scala/net/sf/ij_plugins/scala/console/ScalaConsoleApp.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Image/J Plugins
3-
* Copyright (C) 2002-2012 Jarek Sacha
3+
* Copyright (C) 2002-2014 Jarek Sacha
44
* Author's email: jsacha at users dot sourceforge dot net
55
*
66
* This library is free software; you can redistribute it and/or

scala-console/src/main/scala/net/sf/ij_plugins/scala/console/ScalaConsoleController.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Image/J Plugins
3-
* Copyright (C) 2002-2012 Jarek Sacha
3+
* Copyright (C) 2002-2014 Jarek Sacha
44
* Author's email: jsacha at users dot sourceforge dot net
55
*
66
* This library is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
2323
package net.sf.ij_plugins.scala.console
2424

2525
import editor.Editor
26-
import swing.Frame
2726
import java.io.File
27+
import swing.Frame
2828

2929
/**
3030
* Controller for the Scala Console.

scala-console/src/main/scala/net/sf/ij_plugins/scala/console/ScalaConsoleFrame.scala

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Image/J Plugins
3-
* Copyright (C) 2002-2012 Jarek Sacha
3+
* Copyright (C) 2002-2014 Jarek Sacha
44
* Author's email: jsacha at users dot sourceforge dot net
55
*
66
* This library is free software; you can redistribute it and/or
@@ -51,8 +51,8 @@ private class ScalaConsoleFrame(val editor: Editor,
5151
peer.setIconImages({
5252
val names = Array("scala16.png", "scala32.png", "scala48.png", "scala64.png")
5353
val icons = for (name <- names) yield console.loadImage(this.getClass, "resources/" + name)
54-
import scala.collection.JavaConversions._
55-
icons.toList
54+
import scala.collection.JavaConversions._
55+
icons.toList
5656
})
5757

5858

@@ -110,26 +110,24 @@ private class ScalaConsoleFrame(val editor: Editor,
110110

111111
// React to models and internal changes
112112
reactions += {
113-
case StateEvent(state) => {
114-
val isReady = state == State.Ready
115-
enablable.foreach(_.enabled = isReady)
116-
cursor = if (isReady) Cursor.getDefaultCursor else Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)
117-
statusLine.text = state.toString
118-
}
119-
120-
case ErrStreamEvent(data) => outputArea.appendErrStream(data)
121-
case OutStreamEvent(data) => outputArea.appendOutStream(data)
113+
case StateEvent(state) =>
114+
val isReady = state == State.Ready
115+
enablable.foreach(_.enabled = isReady)
116+
cursor = if (isReady) Cursor.getDefaultCursor else Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)
117+
statusLine.text = state.toString
118+
119+
case ErrStreamEvent(data) => outputArea.appendErrStream(data)
120+
case OutStreamEvent(data) => outputArea.appendOutStream(data)
122121
case InterpreterLogEvent(data) => outputArea.appendInterpreterOut(data)
123-
case ResultEvent(result) => {
124-
result match {
125-
case Results.Error => outputArea.appendErrStream(result.toString)
126-
case Results.Success => outputArea.appendOutStream(result.toString)
127-
case Results.Incomplete => outputArea.appendErrStream(result.toString)
128-
}
122+
case ResultEvent(result) =>
123+
result match {
124+
case Results.Error => outputArea.appendErrStream(result.toString)
125+
case Results.Success => outputArea.appendOutStream(result.toString)
126+
case Results.Incomplete => outputArea.appendErrStream(result.toString)
129127
}
130128

131-
case SourceFileEvent(fileOption) => fileOption match {
132-
case Some(file) => title = defaultTitle + " - " + file.getCanonicalPath
129+
case SourceFileEvent(fileOption) => fileOption match {
130+
case Some(file) => title = defaultTitle + " - " + file.getCanonicalPath
133131
case None => title = defaultTitle
134132
}
135133

scala-console/src/main/scala/net/sf/ij_plugins/scala/console/editor/Editor.scala

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Image/J Plugins
3-
* Copyright (C) 2002-2012 Jarek Sacha
3+
* Copyright (C) 2002-2014 Jarek Sacha
44
* Author's email: jsacha at users dot sourceforge dot net
55
*
66
* This library is free software; you can redistribute it and/or
@@ -22,30 +22,8 @@
2222

2323
package net.sf.ij_plugins.scala.console.editor
2424

25-
/*
26-
* Image/J Plugins
27-
* Copyright (C) 2002-2012 Jarek Sacha
28-
* Author's email: jsacha at users dot sourceforge dot net
29-
*
30-
* This library is free software; you can redistribute it and/or
31-
* modify it under the terms of the GNU Lesser General Public
32-
* License as published by the Free Software Foundation; either
33-
* version 2.1 of the License, or (at your option) any later version.
34-
*
35-
* This library is distributed in the hope that it will be useful,
36-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
37-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
38-
* Lesser General Public License for more details.
39-
*
40-
* You should have received a copy of the GNU Lesser General Public
41-
* License along with this library; if not, write to the Free Software
42-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
43-
*
44-
* Latest release available at http://sourceforge.net/projects/ij-plugins/
45-
*/
46-
47-
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea
4825
import java.io.File
26+
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea
4927
import swing.event.Event
5028
import swing.{Publisher, Action, Component}
5129

scala-console/src/main/scala/net/sf/ij_plugins/scala/console/editor/EditorModel.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Image/J Plugins
3-
* Copyright (C) 2002-2012 Jarek Sacha
3+
* Copyright (C) 2002-2014 Jarek Sacha
44
* Author's email: jsacha at users dot sourceforge dot net
55
*
66
* This library is free software; you can redistribute it and/or

scala-console/src/main/scala/net/sf/ij_plugins/scala/console/editor/EditorView.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Image/J Plugins
3-
* Copyright (C) 2002-2013 Jarek Sacha
3+
* Copyright (C) 2002-2014 Jarek Sacha
44
* Author's email: jsacha at users dot sourceforge dot net
55
*
66
* This library is free software; you can redistribute it and/or

scala-console/src/main/scala/net/sf/ij_plugins/scala/console/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Image/J Plugins
3-
* Copyright (C) 2002-2012 Jarek Sacha
3+
* Copyright (C) 2002-2014 Jarek Sacha
44
* Author's email: jsacha at users dot sourceforge dot net
55
*
66
* This library is free software; you can redistribute it and/or

0 commit comments

Comments
 (0)