Permalink
Browse files

Whitespace normalization.

Normalized the repos, otherwise my patches will be sprinkled
with whitespace noise.
  • Loading branch information...
1 parent c500876 commit 94e26c985d4eea571828fecf8187fa7aa04e8235 @paulp paulp committed Feb 2, 2013
Showing with 931 additions and 932 deletions.
  1. +11 −11 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/MimaMenuBar.scala
  2. +4 −4 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/MimaSwingApp.scala
  3. +2 −2 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/UncaughtExceptionHandlerDialog.scala
  4. +9 −9 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/WithConstraints.scala
  5. +1 −1 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/event/ExitMiMa.scala
  6. +1 −2 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/widget/BugReportDialog.scala
  7. +3 −3 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/widget/ClassPathEditor.scala
  8. +1 −1 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/widget/CloseButton.scala
  9. +1 −1 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/widget/FilePicker.scala
  10. +2 −2 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/widget/HtmlViewPane.scala
  11. +6 −6 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/widget/ListItemsPanel.scala
  12. +3 −3 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/widget/LoadingPanel.scala
  13. +3 −3 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/widget/NavigationPanel.scala
  14. +7 −7 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/wizard/Wizard.scala
  15. +2 −2 core-ui/src/main/scala/com/typesafe/tools/mima/core/ui/wizard/WizardPage.scala
  16. +5 −5 core-ui/src/main/scala/com/typesafe/tools/mima/core/util/log/UiLogger.scala
  17. +1 −1 core-ui/src/test/scala/com/typesafe/tools/mima/core/util/BrowseSpec.scala
  18. +1 −1 core/src/main/scala/com/typesafe/tools/mima/core/BufferReader.scala
  19. +283 −283 core/src/main/scala/com/typesafe/tools/mima/core/ClassInfo.scala
  20. +17 −17 core/src/main/scala/com/typesafe/tools/mima/core/ClassfileParser.scala
  21. +67 −67 core/src/main/scala/com/typesafe/tools/mima/core/Config.scala
  22. +16 −16 core/src/main/scala/com/typesafe/tools/mima/core/Definitions.scala
  23. +86 −86 core/src/main/scala/com/typesafe/tools/mima/core/MemberInfo.scala
  24. +18 −18 core/src/main/scala/com/typesafe/tools/mima/core/Members.scala
  25. +101 −101 core/src/main/scala/com/typesafe/tools/mima/core/PackageInfo.scala
  26. +11 −11 core/src/main/scala/com/typesafe/tools/mima/core/PathResolver.scala
  27. +4 −4 core/src/main/scala/com/typesafe/tools/mima/core/Reference.scala
  28. +12 −12 core/src/main/scala/com/typesafe/tools/mima/core/Settings.scala
  29. +54 −54 core/src/main/scala/com/typesafe/tools/mima/core/Type.scala
  30. +1 −1 core/src/main/scala/com/typesafe/tools/mima/core/WithAccessFlags.scala
  31. +4 −4 core/src/main/scala/com/typesafe/tools/mima/core/WithAccessModifier.scala
  32. +3 −3 core/src/main/scala/com/typesafe/tools/mima/core/WithLocalModifier.scala
  33. +19 −19 core/src/main/scala/com/typesafe/tools/mima/core/util/IndentedOutput.scala
  34. +1 −1 core/src/main/scala/com/typesafe/tools/mima/core/util/Urls.scala
  35. +1 −1 core/src/main/scala/com/typesafe/tools/mima/core/util/log/Logging.scala
  36. +13 −13 project/Build.scala
  37. +2 −2 reporter-ui/src/main/scala/com/typesafe/tools/mima/lib/ui/LibWizard.scala
  38. +7 −7 reporter-ui/src/main/scala/com/typesafe/tools/mima/lib/ui/MimaLibApp.scala
  39. +2 −2 reporter-ui/src/main/scala/com/typesafe/tools/mima/lib/ui/model/ReportTableModel.scala
  40. +2 −2 reporter-ui/src/main/scala/com/typesafe/tools/mima/lib/ui/widget/ProblemInfoView.scala
  41. +4 −4 reporter-ui/src/main/scala/com/typesafe/tools/mima/lib/ui/widget/ReportTable.scala
  42. +1 −1 reporter/functional-tests/src/main/scala/com/typesafe/tools/mima/lib/CollectProblemsTest.scala
  43. +1 −1 reporter/functional-tests/src/test/class-added-same-class-in-different-package-is-ok/v2/A.scala
  44. +1 −1 reporter/functional-tests/src/test/class-removed-superclass-nok/v1/A.scala
  45. +1 −1 reporter/functional-tests/src/test/eager-field-becomes-eager-lazy-nok-semantic/v1/Lazy.scala
  46. +1 −1 reporter/functional-tests/src/test/eager-field-becomes-eager-lazy-nok-semantic/v2/Lazy.scala
  47. +1 −1 reporter/functional-tests/src/test/lazy-field-becomes-eager-ok/v1/Lazy.scala
  48. +1 −1 reporter/functional-tests/src/test/lazy-field-becomes-eager-ok/v2/Lazy.scala
  49. +1 −1 reporter/functional-tests/src/test/moving-method-upward-from-trait-to-class-nok/v2/A.scala
  50. +9 −9 reporter/src/main/scala/com/typesafe/tools/mima/cli/Main.scala
  51. +87 −87 reporter/src/main/scala/com/typesafe/tools/mima/lib/MiMaLib.scala
  52. +8 −8 reporter/src/main/scala/com/typesafe/tools/mima/lib/analyze/Analyzer.scala
  53. +3 −3 reporter/src/main/scala/com/typesafe/tools/mima/lib/analyze/Checker.scala
  54. +2 −2 reporter/src/main/scala/com/typesafe/tools/mima/lib/analyze/field/FieldChecker.scala
  55. +4 −4 reporter/src/main/scala/com/typesafe/tools/mima/lib/analyze/method/MethodChecker.scala
  56. +1 −1 reporter/src/main/scala/com/typesafe/tools/mima/lib/analyze/method/MethodRules.scala
  57. +7 −7 reporter/src/main/scala/com/typesafe/tools/mima/lib/analyze/template/TemplateChecker.scala
  58. +11 −11 reporter/src/main/scala/com/typesafe/tools/mima/lib/analyze/template/TemplateRules.scala
@@ -14,38 +14,38 @@ object MimaMenuBar extends MenuBar {
val file = new Menu("File") {
mnemonic = Key.F
}
-
+
contents += file
-
+
val exit = new MenuItem(new Action("Exit") {
def apply() = publish(ExitMiMa)
}) {
mnemonic = Key.E
}
-
+
file.contents += exit
-
-
+
+
// File menu
val help = new Menu("Help") {
mnemonic = Key.H
}
-
+
contents += help
-
+
val guide = new MenuItem(new Action("Online resources") {
def apply() = Browse to OnlineResourceSite
}) {
mnemonic = Key.T
}
-
+
val bug = new MenuItem(new Action("Report a bug...") {
def apply() = Browse to BugReportingSite
}) {
mnemonic = Key.R
}
-
+
help.contents += (guide, bug)
-
-
+
+
}
@@ -10,15 +10,15 @@ import com.typesafe.tools.mima.core.util.WithUncaughtExceptionHandlerDialog
trait MimaSwingApp extends SimpleSwingApplication with WithUncaughtExceptionHandlerDialog {
- var resargs: List[String] = Nil
-
+ var resargs: List[String] = Nil
+
override def startup(args: Array[String]) {
resargs = Config.setup("scala " + launcherClassName +" <old-dir> <new-dir>", args, "-fixall")
super.startup(args)
}
protected def launcherClassName: String
-
-
+
+
override def top: Frame
}
@@ -20,7 +20,7 @@ trait WithUncaughtExceptionHandlerDialog {
/** Default exception handler */
protected val handler: Thread.UncaughtExceptionHandler = new UncaughtExceptionHandlerDialog()
-
- // setting the handler (assumes it is set only once, here - no way to enforce this though)
+
+ // setting the handler (assumes it is set only once, here - no way to enforce this though)
Thread.setDefaultUncaughtExceptionHandler(handler)
}
@@ -12,21 +12,21 @@ trait WithConstraints extends GridBagPanel {
/** Convenience method for creating and adding components to a GridBagPanel.
* It has reasonable defaults for all parameters.
*/
- def withConstraints[T](gridx: Int = RELATIVE,
- gridy: Int = RELATIVE,
+ def withConstraints[T](gridx: Int = RELATIVE,
+ gridy: Int = RELATIVE,
gridwidth: Int = 1,
- gridheight: Int = 1,
+ gridheight: Int = 1,
weightx: Double = 0.0,
- weighty: Double = 0.0,
+ weighty: Double = 0.0,
anchor: Anchor.Value = Anchor.NorthWest,
fill: Fill.Value = Fill.None,
- insets: Insets = new Insets(0, 0, 0, 0),
+ insets: Insets = new Insets(0, 0, 0, 0),
ipadx: Int = 0,
ipady: Int = 0)(op: Constraints => T) = {
- val c = new Constraints(gridx, gridy,
- gridwidth, gridheight,
- weightx, weighty,
- anchor.id, fill.id, insets,
+ val c = new Constraints(gridx, gridy,
+ gridwidth, gridheight,
+ weightx, weighty,
+ anchor.id, fill.id, insets,
ipadx, ipady)
op(c)
}
@@ -2,5 +2,5 @@ package com.typesafe.tools.mima.core.ui.event
import scala.swing.event.Event
-/** Event sent to request application's shut down.*/
+/** Event sent to request application's shut down.*/
object ExitMiMa extends Event
@@ -71,8 +71,7 @@ class BugReportDialog(error: Throwable, owner: Window = null) extends Dialog(own
location = center
modal = true
- resizable = false
+ resizable = false
pack()
visible = true
}
-
@@ -25,18 +25,18 @@ class ClassPathEditor(init: List[String] = Nil) extends GridBagPanel with WithCo
def classpath_=(_classpath: List[String]) = listView.listData = _classpath
def classpath = listView.listData
-
+
/** Return the string of current classpath in this editor. */
def classPathString = {
ClassPath.join(listView.listData: _*)
}
-
+
private val listView = new ListView(elements.toList) {
border = LineBorder(Color.gray)
selection.intervalMode = ListView.IntervalMode.SingleInterval
listenTo(mouse.moves)
-
+
reactions += {
case MouseMoved(_, point, _) =>
val index = peer.locationToIndex(point)
@@ -5,7 +5,7 @@ import scala.swing.Swing.EmptyBorder
import com.typesafe.tools.mima.core.ui.images
-/** A close button displayed as an icon. When the mouse is over
+/** A close button displayed as an icon. When the mouse is over
* the image a hand cursor is shown.*/
class CloseButton extends Button {
icon = images.Icons.close
@@ -73,6 +73,6 @@ class FilePicker(private val label: Label, owner: Component, private var _select
private def notifiyFileSelectedChanged() {
publish(FileChanged(FilePicker.this, selectedFile.get))
}
-
+
def selectedFile: Option[File] = _selectedFile
}
@@ -13,7 +13,7 @@ import com.typesafe.tools.mima.core.util.Browse
class HtmlViewPane extends Component {
override lazy val peer = componee
-
+
private lazy val componee = new JEditorPane(new HTMLEditorKit().getContentType(), "") {
private val defaultLabelFont = UIManager.getFont("Label.font")
/**
@@ -36,6 +36,6 @@ class HtmlViewPane extends Component {
}
})
}
-
+
def setHtml(html: String) = componee.setText(html)
}
@@ -6,7 +6,7 @@ import scala.swing.event.ButtonClicked
import com.typesafe.tools.mima.core.ui.images
abstract class ListItemsPanel extends Component {
-
+
private val MaxNumberOfItems = 10
type Item <: Component
@@ -52,7 +52,7 @@ abstract class ListItemsPanel extends Component {
override lazy val peer: javax.swing.JComponent = view.peer
final protected def addConstraint() {
- val newRow = new Row(create()) {
+ val newRow = new Row(create()) {
remove.visible = false
}
if(view.contents.nonEmpty) {
@@ -66,12 +66,12 @@ abstract class ListItemsPanel extends Component {
view -= r
view.contents.last.asInstanceOf[Row].remove.visible = false
}
-
-
+
+
private def updateView() {
- add.enabled = (view.contents.size < MaxNumberOfItems)
-
+ add.enabled = (view.contents.size < MaxNumberOfItems)
+
repaint()
revalidate()
}
@@ -31,8 +31,8 @@ class LoadingPanel extends JComponent with MouseListener {
private var barsCount = 14
private var fps = 15.0f
- private var hints: RenderingHints = null
-
+ private var hints: RenderingHints = null
+
def this(text: String = "", barsCount: Int = 14, shield: Float = 0.0f, fps: Float = 15.0f, rampDelay: Int = 300) =
{
this()
@@ -119,7 +119,7 @@ class LoadingPanel extends JComponent with MouseListener {
{
val width = getWidth()
val height = getHeight()
-
+
val ticker = Array.ofDim[Area](barsCount)
val hwidth = width.asInstanceOf[Double] / 2
val hheight = height.asInstanceOf[Double] / 2
@@ -5,12 +5,12 @@ import event._
/** Simple navigation panel that exposes its three buttons: next, back and exit*/
class NavigationPanel extends BoxPanel(Orientation.Horizontal) {
-
+
val back = new Button("Back")
val next = new Button("Next")
val exit = new Button("Quit")
-
+
contents += Swing.HGlue
contents += (back, next, Swing.HStrut(20), exit)
-
+
}
@@ -32,7 +32,7 @@ class Wizard extends BorderPanel {
def apply(_page: => WizardPage) = new WizardPageProxy { override def page = _page }
}
private[Wizard] abstract class WizardPageProxy {
- private var cached: Option[WizardPage] = None
+ private var cached: Option[WizardPage] = None
def clear() = cached = None
protected def page: WizardPage
def get = cached match {
@@ -42,13 +42,13 @@ class Wizard extends BorderPanel {
case Some(page) => page
}
}
-
+
private class LoadingPanel extends BorderPanel {
private val loading = new com.typesafe.tools.mima.core.ui.widget.LoadingPanel("")
private val wrapper = Component.wrap(loading)
add(wrapper, BorderPanel.Position.Center)
add(com.typesafe.tools.mima.core.util.log.UiLogger, BorderPanel.Position.South)
-
+
def start() = loading.start()
}
@@ -155,9 +155,9 @@ class Wizard extends BorderPanel {
buttonsPanel.visible = false
val loading = new LoadingPanel()
setContent(loading)
- // delaying start so that `setContent` will trigger
- // component's `repaint` which will update the loading
- // panel's size. The size is needed to correctly center
+ // delaying start so that `setContent` will trigger
+ // component's `repaint` which will update the loading
+ // panel's size. The size is needed to correctly center
// the loading animation.
Swing onEDT { loading.start() }
}
@@ -175,7 +175,7 @@ class Wizard extends BorderPanel {
private def currentPage = _currentPage
private var _currentPage = 0
-
+
// the bottom section where the navigation buttons are
private val navigation = new NavigationPanel
@@ -6,7 +6,7 @@ object WizardPage {
import scala.swing.event.Event
/** used to inform `Wizard` whether forward navigation is `allowed`. */
case class CanGoNext(allowed: Boolean) extends Event
-
+
trait Model {
/** model is backed by a mutable map. */
protected val data = collection.mutable.Map.empty[String, Any]
@@ -25,7 +25,7 @@ trait WizardPage extends Component {
/** is forward navigation enabled. */
def canNavigateForward = true
-
+
/** is Back navigation enabled. */
def canNavigateBack = true
@@ -6,11 +6,11 @@ import scala.swing.Swing
import com.typesafe.tools.mima.core.Config
object UiLogger extends Component with Logging {
-
+
private lazy val label = new Label
-
+
override lazy val peer = label.peer
-
- def info(str: String): Unit = Swing.onEDT { label.text = str }
- def debugLog(str: String): Unit = if(Config.debug) Swing.onEDT { label.text = str }
+
+ def info(str: String): Unit = Swing.onEDT { label.text = str }
+ def debugLog(str: String): Unit = if(Config.debug) Swing.onEDT { label.text = str }
}
@@ -63,7 +63,7 @@ class BrowseSpec extends SpecificationWithJUnit with Mockito {
there was one(proxy).cannotOpen(anyURI, any)
}
-
+
"fail gracefully if the URI cannot be converted into an URL" in new BrowseMock {
proxy.open(any) throws new java.lang.IllegalArgumentException()
@@ -9,7 +9,7 @@ package com.typesafe.tools.mima.core
import java.lang.Float.intBitsToFloat
import java.lang.Double.longBitsToDouble
-/**
+/**
* This class reads files byte per byte. Only used by ClassFileParser
*
* @author Philippe Altherr
Oops, something went wrong.

0 comments on commit 94e26c9

Please sign in to comment.