From b4f277a847a9c29d3e0f7a90509c9e6a7c9fde17 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Tue, 12 Feb 2013 17:44:53 -0800
Subject: [nomaster] Revert "Added a Swing PopupMenu wrapper"

This reverts commit bdff881f8a15d4de0c0ff2aa2427f0d8244d2d42.

This is necessary to maintain binary compatibility with 2.10.0.
---
 docs/examples/swing/PopupDemo.scala              | 33 ------------
 src/swing/scala/swing/PopupMenu.scala            | 65 ------------------------
 src/swing/scala/swing/event/PopupMenuEvent.scala | 18 -------
 3 files changed, 116 deletions(-)
 delete mode 100644 docs/examples/swing/PopupDemo.scala
 delete mode 100644 src/swing/scala/swing/PopupMenu.scala
 delete mode 100644 src/swing/scala/swing/event/PopupMenuEvent.scala

diff --git a/docs/examples/swing/PopupDemo.scala b/docs/examples/swing/PopupDemo.scala
deleted file mode 100644
index 6a9eeb125b..0000000000
--- a/docs/examples/swing/PopupDemo.scala
+++ /dev/null
@@ -1,33 +0,0 @@
-package examples.swing
-
-import swing._
-import event._
-import Swing._
-
-/**
- * @author John Sullivan
- * @author Ingo Maier
- */
-object PopupDemo extends SimpleSwingApplication {
-	def top = new MainFrame {
-		val popupMenu = new PopupMenu {
-      contents += new Menu("menu 1") {
-        contents += new RadioMenuItem("radio 1.1")
-        contents += new RadioMenuItem("radio 1.2")
-      }
-      contents += new Menu("menu 2") {
-        contents += new RadioMenuItem("radio 2.1")
-        contents += new RadioMenuItem("radio 2.2")
-      }
-    }
-    val button = new Button("Show Popup Menu")
-    reactions += {
-      case ButtonClicked(b) => popupMenu.show(b, 0, b.bounds.height)
-      case PopupMenuCanceled(m) => println("Menu " + m + " canceled.")
-    }
-    listenTo(popupMenu)
-    listenTo(button)
-
-    contents = new FlowPanel(button)
-	}
-}
\ No newline at end of file
diff --git a/src/swing/scala/swing/PopupMenu.scala b/src/swing/scala/swing/PopupMenu.scala
deleted file mode 100644
index 0f292b11a2..0000000000
--- a/src/swing/scala/swing/PopupMenu.scala
+++ /dev/null
@@ -1,65 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2007-2012, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-
-
-package scala.swing
-
-import javax.swing.JPopupMenu
-import javax.swing.event.{PopupMenuListener, PopupMenuEvent}
-import event._
-
-/**
- * A popup menu.
- * 
- * Example usage:
- *
- * {{{
- * val popupMenu = new PopupMenu {
- *   contents += new Menu("menu 1") {
- *     contents += new RadioMenuItem("radio 1.1")
- *     contents += new RadioMenuItem("radio 1.2")
- *   }
- *   contents += new Menu("menu 2") {
- *     contents += new RadioMenuItem("radio 2.1")
- *     contents += new RadioMenuItem("radio 2.2")
- *   }
- * }
- * val button = new Button("Show Popup Menu")
- * reactions += {
- *   case e: ButtonClicked => popupMenu.show(button, 0, button.bounds.height)
- * }
- * listenTo(button)
- * }}}
- * 
- * @author John Sullivan
- * @author Ingo Maier
- * @see javax.swing.JPopupMenu
- */
-class PopupMenu extends Component with SequentialContainer.Wrapper with Publisher {
-  override lazy val peer: JPopupMenu = new JPopupMenu with SuperMixin 
-
-  peer.addPopupMenuListener(new PopupMenuListener {
-  	def popupMenuCanceled(e: PopupMenuEvent) {
-  	  publish(PopupMenuCanceled(PopupMenu.this))
-  	}
-  	def popupMenuWillBecomeInvisible(e: PopupMenuEvent) {
-  	  publish(PopupMenuWillBecomeInvisible(PopupMenu.this))
-  	}
-  	def popupMenuWillBecomeVisible(e: PopupMenuEvent) {
-  	  publish(PopupMenuWillBecomeVisible(PopupMenu.this))
-  	}
-  })
-
-  def show(invoker: Component, x: Int, y: Int): Unit = peer.show(invoker.peer, x, y)
-
-  def margin: Insets = peer.getMargin
-  def label: String = peer.getLabel
-  def label_=(s: String) { peer.setLabel(s) }
-}
-
diff --git a/src/swing/scala/swing/event/PopupMenuEvent.scala b/src/swing/scala/swing/event/PopupMenuEvent.scala
deleted file mode 100644
index f7083c06de..0000000000
--- a/src/swing/scala/swing/event/PopupMenuEvent.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2007-2012, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-
-
-package scala.swing
-package event
-
-abstract class PopupMenuEvent extends ComponentEvent
-
-case class PopupMenuCanceled(source: PopupMenu) extends PopupMenuEvent
-case class PopupMenuWillBecomeInvisible(source: PopupMenu) extends PopupMenuEvent
-case class PopupMenuWillBecomeVisible(source: PopupMenu) extends PopupMenuEvent
\ No newline at end of file
-- 
cgit v1.2.3