From 771501912ed27f0bd0669bc3cda63a90effa6b76 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Tue, 26 Nov 2013 12:06:12 +0400 Subject: [PATCH] Comment 'inline' annotation that brokes build --- .../kotlin/kotlin/swing/ActionListeners.kt | 28 ++++++------- .../kotlin/kotlin/swing/ChangeListeners.kt | 40 +++++++++---------- .../kotlin/swing/PropertyChangeListeners.kt | 4 +- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ActionListeners.kt b/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ActionListeners.kt index be012a85714..856d5f3df0a 100644 --- a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ActionListeners.kt +++ b/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ActionListeners.kt @@ -10,7 +10,7 @@ import java.awt.* /** * Creates a [[ActionListener]] for the given function for processing each [[ActionEvent]] */ -inline fun actionListener(fn: (ActionEvent) -> Unit): ActionListener = FunctionActionListener(fn) +/*inline*/ fun actionListener(fn: (ActionEvent) -> Unit): ActionListener = FunctionActionListener(fn) private class FunctionActionListener(val fn: (ActionEvent) -> Unit) : ActionListener { public override fun actionPerformed(e: ActionEvent) { @@ -20,57 +20,57 @@ private class FunctionActionListener(val fn: (ActionEvent) -> Unit) : ActionList } } -inline fun Button.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun Button.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } -inline fun List.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun List.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } -inline fun MenuItem.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun MenuItem.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } -inline fun TextField.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun TextField.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } -inline fun TrayIcon.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun TrayIcon.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } -inline fun AbstractButton.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun AbstractButton.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } -inline fun ButtonModel.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun ButtonModel.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } -inline fun ComboBoxEditor.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun ComboBoxEditor.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } -inline fun DefaultButtonModel.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun DefaultButtonModel.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } /* TODO depending on the JDK this may or may not compile with or without the type argument -inline fun JComboBox<*>.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun JComboBox<*>.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } */ -inline fun JFileChooser.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun JFileChooser.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } -inline fun JTextField.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun JTextField.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } -inline fun Timer.addActionListener(fn: (ActionEvent) -> Unit): Unit { +/*inline*/ fun Timer.addActionListener(fn: (ActionEvent) -> Unit): Unit { addActionListener(actionListener(fn)) } diff --git a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ChangeListeners.kt b/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ChangeListeners.kt index 6b651267132..f3f90112263 100644 --- a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ChangeListeners.kt +++ b/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ChangeListeners.kt @@ -13,7 +13,7 @@ import javax.swing.text.* /** * Creates a [[ChangeListener]] for the given function for processing each [[ChangeEvent]] */ -inline fun changeListener(fn: (ChangeEvent) -> Unit): ChangeListener = FunctionChangeListener(fn) +/*inline*/ fun changeListener(fn: (ChangeEvent) -> Unit): ChangeListener = FunctionChangeListener(fn) private class FunctionChangeListener(val fn: (ChangeEvent) -> Unit) : ChangeListener { public override fun stateChanged(e: ChangeEvent) { @@ -23,79 +23,79 @@ private class FunctionChangeListener(val fn: (ChangeEvent) -> Unit) : ChangeList } } -inline fun AbstractButton.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun AbstractButton.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun AbstractSpinnerModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun AbstractSpinnerModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun BoundedRangeModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun BoundedRangeModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun ButtonModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun ButtonModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun ColorSelectionModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun ColorSelectionModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun DefaultColorSelectionModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun DefaultColorSelectionModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun DefaultSingleSelectionModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun DefaultSingleSelectionModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun JProgressBar.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun JProgressBar.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun DefaultButtonModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun DefaultButtonModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun JSlider.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun JSlider.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun JSpinner.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun JSpinner.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun JViewport.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun JViewport.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun MenuSelectionManager.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun MenuSelectionManager.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun SingleSelectionModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun SingleSelectionModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun SpinnerModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun SpinnerModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun Caret.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun Caret.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun DefaultCaret.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun DefaultCaret.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun Style.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun Style.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } -inline fun StyleContext.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { +/*inline*/ fun StyleContext.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { addChangeListener(changeListener(fn)) } diff --git a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/PropertyChangeListeners.kt b/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/PropertyChangeListeners.kt index b9cce7bf1ab..419ac616c8d 100644 --- a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/PropertyChangeListeners.kt +++ b/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/PropertyChangeListeners.kt @@ -10,10 +10,10 @@ import java.beans.* // TODO this file may be deleted when this issue is implemented // http://youtrack.jetbrains.com/issue/KT-1752 -inline fun Component.addPropertyChangeListener(fn: (PropertyChangeEvent) -> Unit): Unit { +fun Component.addPropertyChangeListener(fn: (PropertyChangeEvent) -> Unit): Unit { addPropertyChangeListener(propertyChangeListener(fn)) } -inline fun Component.addPropertyChangeListener(name: String, fn: (PropertyChangeEvent) -> Unit): Unit { +fun Component.addPropertyChangeListener(name: String, fn: (PropertyChangeEvent) -> Unit): Unit { addPropertyChangeListener(name, propertyChangeListener(fn)) }