From 15bba63dc12c64c983baa4511739afb71db780a5 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 27 Jan 2014 22:03:51 +0400 Subject: [PATCH] Removed obsolete workaround for KT-1752. --- .../kotlin/kotlin/swing/ActionListeners.kt | 76 ------------- .../kotlin/kotlin/swing/ChangeListeners.kt | 101 ------------------ .../kotlin/swing/PropertyChangeListeners.kt | 19 ---- .../stdlib/src/kotlin/beans/Listeners.kt | 19 ---- 4 files changed, 215 deletions(-) delete mode 100644 libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ActionListeners.kt delete mode 100644 libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ChangeListeners.kt delete mode 100644 libraries/kotlin-swing/src/main/kotlin/kotlin/swing/PropertyChangeListeners.kt delete mode 100644 libraries/stdlib/src/kotlin/beans/Listeners.kt diff --git a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ActionListeners.kt b/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ActionListeners.kt deleted file mode 100644 index 856d5f3df0a..00000000000 --- a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ActionListeners.kt +++ /dev/null @@ -1,76 +0,0 @@ -package kotlin.swing - -import javax.swing.* -import java.awt.event.* -import java.awt.* - -// TODO this file may be deleted when this issue is implemented -// http://youtrack.jetbrains.com/issue/KT-1752 - -/** - * Creates a [[ActionListener]] for the given function for processing each [[ActionEvent]] - */ -/*inline*/ fun actionListener(fn: (ActionEvent) -> Unit): ActionListener = FunctionActionListener(fn) - -private class FunctionActionListener(val fn: (ActionEvent) -> Unit) : ActionListener { - public override fun actionPerformed(e: ActionEvent) { - if (e != null) { - (fn)(e) - } - } -} - -/*inline*/ fun Button.addActionListener(fn: (ActionEvent) -> Unit): Unit { - addActionListener(actionListener(fn)) -} - -/*inline*/ fun List.addActionListener(fn: (ActionEvent) -> Unit): Unit { - addActionListener(actionListener(fn)) -} - -/*inline*/ fun MenuItem.addActionListener(fn: (ActionEvent) -> Unit): Unit { - addActionListener(actionListener(fn)) -} - -/*inline*/ fun TextField.addActionListener(fn: (ActionEvent) -> Unit): Unit { - addActionListener(actionListener(fn)) -} - -/*inline*/ fun TrayIcon.addActionListener(fn: (ActionEvent) -> Unit): Unit { - addActionListener(actionListener(fn)) -} - -/*inline*/ fun AbstractButton.addActionListener(fn: (ActionEvent) -> Unit): Unit { - addActionListener(actionListener(fn)) -} - -/*inline*/ fun ButtonModel.addActionListener(fn: (ActionEvent) -> Unit): Unit { - addActionListener(actionListener(fn)) -} - -/*inline*/ fun ComboBoxEditor.addActionListener(fn: (ActionEvent) -> Unit): Unit { - addActionListener(actionListener(fn)) -} - -/*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 { - addActionListener(actionListener(fn)) -} -*/ - -/*inline*/ fun JFileChooser.addActionListener(fn: (ActionEvent) -> Unit): Unit { - addActionListener(actionListener(fn)) -} - -/*inline*/ fun JTextField.addActionListener(fn: (ActionEvent) -> Unit): Unit { - addActionListener(actionListener(fn)) -} - -/*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 deleted file mode 100644 index f3f90112263..00000000000 --- a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/ChangeListeners.kt +++ /dev/null @@ -1,101 +0,0 @@ -package kotlin.swing - -import java.awt.* -import java.awt.event.* -import javax.swing.* -import javax.swing.colorchooser.* -import javax.swing.event.* -import javax.swing.text.* - -// TODO this file may be deleted when this issue is implemented -// http://youtrack.jetbrains.com/issue/KT-1752 - -/** - * Creates a [[ChangeListener]] for the given function for processing each [[ChangeEvent]] - */ -/*inline*/ fun changeListener(fn: (ChangeEvent) -> Unit): ChangeListener = FunctionChangeListener(fn) - -private class FunctionChangeListener(val fn: (ChangeEvent) -> Unit) : ChangeListener { - public override fun stateChanged(e: ChangeEvent) { - if (e != null) { - (fn)(e) - } - } -} - -/*inline*/ fun AbstractButton.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun AbstractSpinnerModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun BoundedRangeModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun ButtonModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun ColorSelectionModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun DefaultColorSelectionModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun DefaultSingleSelectionModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun JProgressBar.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun DefaultButtonModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun JSlider.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun JSpinner.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun JViewport.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun MenuSelectionManager.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun SingleSelectionModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun SpinnerModel.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun Caret.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun DefaultCaret.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*inline*/ fun Style.addChangeListener(fn: (ChangeEvent) -> Unit): Unit { - addChangeListener(changeListener(fn)) -} - -/*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 deleted file mode 100644 index 419ac616c8d..00000000000 --- a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/PropertyChangeListeners.kt +++ /dev/null @@ -1,19 +0,0 @@ -package kotlin.swing - -import kotlin.beans.* - -import javax.swing.* -import java.awt.event.* -import java.awt.* -import java.beans.* - -// TODO this file may be deleted when this issue is implemented -// http://youtrack.jetbrains.com/issue/KT-1752 - -fun Component.addPropertyChangeListener(fn: (PropertyChangeEvent) -> Unit): Unit { - addPropertyChangeListener(propertyChangeListener(fn)) -} - -fun Component.addPropertyChangeListener(name: String, fn: (PropertyChangeEvent) -> Unit): Unit { - addPropertyChangeListener(name, propertyChangeListener(fn)) -} diff --git a/libraries/stdlib/src/kotlin/beans/Listeners.kt b/libraries/stdlib/src/kotlin/beans/Listeners.kt deleted file mode 100644 index bc948a78c89..00000000000 --- a/libraries/stdlib/src/kotlin/beans/Listeners.kt +++ /dev/null @@ -1,19 +0,0 @@ -package kotlin.beans - -import java.beans.* - -// TODO this file may be deleted when this issue is implemented -// http://youtrack.jetbrains.com/issue/KT-1752 - -/** - * Creates a [[PropertyChangeListener]] for the given function for processing each [[PropertyChangeEvent]] - */ -fun propertyChangeListener(fn: (PropertyChangeEvent) -> Unit): PropertyChangeListener = FunctionPropertyChangeListener(fn) - -private class FunctionPropertyChangeListener(val fn: (PropertyChangeEvent) -> Unit) : PropertyChangeListener { - public override fun propertyChange(e: PropertyChangeEvent) { - if (e != null) { - (fn)(e) - } - } -}