azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Comment 'inline' annotation that brokes build

Browse Source
This commit is contained in:
Mikhael Bogdanov
2013-11-26 12:06:12 +04:00
parent 1391676281
commit 771501912e
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ActionListeners.kt
+14 -14
View File
@@ -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))
}
libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ChangeListeners.kt
+20 -20
View File
@@ -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))
}
libraries/kotlin-swing/src/main/kotlin/kotlin/swing/PropertyChangeListeners.kt
+2 -2
View File
@@ -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))
}