Loading images through getResource for the jar,...

Loading images through getResource for the jar, fixed SplitPane
orientation issue

9 files changed, 14 insertions, 8 deletions

diff --git a/src/swing/images/banana.jpg b/src/swing/images/banana.jpg
deleted file mode 100644
index 81fc4ab387..0000000000
--- a/src/swing/images/banana.jpg
+++ /dev/null
diff --git a/src/swing/images/margarita1.jpg b/src/swing/images/margarita1.jpg
deleted file mode 100644
index 485723334a..0000000000
--- a/src/swing/images/margarita1.jpg
+++ /dev/null
diff --git a/src/swing/images/margarita2.jpg b/src/swing/images/margarita2.jpg
deleted file mode 100644
index c5fefb0bd5..0000000000
--- a/src/swing/images/margarita2.jpg
+++ /dev/null
diff --git a/src/swing/images/rose.jpg b/src/swing/images/rose.jpg
deleted file mode 100644
index 5c2e75637e..0000000000
--- a/src/swing/images/rose.jpg
+++ /dev/null
diff --git a/src/swing/scala/swing/ListView.scala b/src/swing/scala/swing/ListView.scala
index 4773a5e65c..0460074dd9 100644
--- a/src/swing/scala/swing/ListView.scala
+++ b/src/swing/scala/swing/ListView.scala
@@ -131,10 +131,9 @@ class ListView[A] extends Component {
     peer.setModel(new AbstractListModel {
       def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
       def getSize = items.size
-  	})
+    })
   }
 
-
   object selection extends Publisher {
     protected abstract class Indices[A](a: =>Seq[A]) extends scala.collection.mutable.Set[A] {
       def -=(n: A)
diff --git a/src/swing/scala/swing/SplitPane.scala b/src/swing/scala/swing/SplitPane.scala
index 747dc4eb29..a5026adad7 100644
--- a/src/swing/scala/swing/SplitPane.scala
+++ b/src/swing/scala/swing/SplitPane.scala
@@ -8,7 +8,7 @@ import Swing._
  */
 class SplitPane(o: Orientation.Value, left: Component, right: Component) extends Component with Container with Orientable {
   override lazy val peer: javax.swing.JSplitPane = new javax.swing.JSplitPane(o.id, left.peer, right.peer)
-  def this(o: Orientation.Value) = this(Orientation.Horizontal, new Component {}, new Component {})
+  def this(o: Orientation.Value) = this(o, new Component {}, new Component {})
   def this() = this(Orientation.Horizontal)
 
   def contents: Seq[Component] = List(leftComponent, rightComponent)
diff --git a/src/swing/scala/swing/UIElement.scala b/src/swing/scala/swing/UIElement.scala
index 22370d33b0..843262bcab 100644
--- a/src/swing/scala/swing/UIElement.scala
+++ b/src/swing/scala/swing/UIElement.scala
@@ -8,6 +8,7 @@ import java.awt.{Color, Cursor, Font, Dimension}
 trait UIElement extends Proxy {
   def peer: java.awt.Component
   def self = peer
+
   def foreground: Color = peer.getForeground
   def foreground_=(c: Color) = peer.setForeground(c)
   def background: Color = peer.getBackground
diff --git a/src/swing/scala/swing/test/ComboBoxes.scala b/src/swing/scala/swing/test/ComboBoxes.scala
index 961866a815..2d0767f299 100644
--- a/src/swing/scala/swing/test/ComboBoxes.scala
+++ b/src/swing/scala/swing/test/ComboBoxes.scala
@@ -50,10 +50,17 @@ object ComboBoxes extends SimpleGUIApplication {
       }
     }
 
-    val icons = List(new ImageIcon(resourceFromUserDirectory("swing/images/margarita1.jpg").toURL),
-                     new ImageIcon(resourceFromUserDirectory("swing/images/margarita2.jpg").toURL),
-                     new ImageIcon(resourceFromUserDirectory("swing/images/rose.jpg").toURL),
-                     new ImageIcon(resourceFromUserDirectory("swing/images/banana.jpg").toURL))
+
+    val icons = try {
+      List(new ImageIcon(resourceFromClassloader("images/margarita1.jpg")),
+           new ImageIcon(resourceFromClassloader("images/margarita2.jpg")),
+           new ImageIcon(resourceFromClassloader("images/rose.jpg")),
+           new ImageIcon(resourceFromClassloader("images/banana.jpg")))
+    } catch {
+      case _ =>
+        println("Couldn't load images for combo box")
+        List(scala.swing.Icon.Empty)
+    }
 
     val iconBox = new ComboBox(icons) {
       renderer = new ListView.AbstractRenderer[Icon, Label](new Label) {
diff --git a/src/swing/scala/swing/test/UIDemo.scala b/src/swing/scala/swing/test/UIDemo.scala
index 4faaebbb93..f92569c187 100644
--- a/src/swing/scala/swing/test/UIDemo.scala
+++ b/src/swing/scala/swing/test/UIDemo.scala
@@ -63,7 +63,6 @@ object UIDemo extends SimpleGUIApplication {
     		  case ButtonClicked(`snapTicks`) =>
     		    slider.snapToTicks = snapTicks.selected
     		  case ButtonClicked(`live`) =>
-    		    println("")
     		    reactLive = live.selected
     		}
           }