[Jnode-svn-commits] SF.net SVN: jnode: [3007] trunk/core/src/classpath/javax/javax

[<ls...@us...>]

Revision: 3007
          http://jnode.svn.sourceforge.net/jnode/?rev=3007&view=rev
Author:   lsantha
Date:     2007-01-07 00:25:33 -0800 (Sun, 07 Jan 2007)

Log Message:
-----------
Classpath patches.

Modified Paths:
--------------
    trunk/core/src/classpath/javax/javax/sql/RowSet.java
    trunk/core/src/classpath/javax/javax/swing/border/CompoundBorder.java

Modified: trunk/core/src/classpath/javax/javax/sql/RowSet.java
===================================================================
--- trunk/core/src/classpath/javax/javax/sql/RowSet.java	2007-01-07 08:25:14 UTC (rev 3006)
+++ trunk/core/src/classpath/javax/javax/sql/RowSet.java	2007-01-07 08:25:33 UTC (rev 3007)
@@ -78,9 +78,9 @@
 
   void setTransactionIsolation(int level) throws SQLException;
 
-  Map getTypeMap() throws SQLException;
+  Map<String, Class<?>> getTypeMap() throws SQLException;
 
-  void setTypeMap(Map map) throws SQLException;
+  void setTypeMap(Map<String, Class<?>> map) throws SQLException;
 
   String getCommand();
 

Modified: trunk/core/src/classpath/javax/javax/swing/border/CompoundBorder.java
===================================================================
--- trunk/core/src/classpath/javax/javax/swing/border/CompoundBorder.java	2007-01-07 08:25:14 UTC (rev 3006)
+++ trunk/core/src/classpath/javax/javax/swing/border/CompoundBorder.java	2007-01-07 08:25:33 UTC (rev 3007)
@@ -115,15 +115,24 @@
    */
   public boolean isBorderOpaque()
   {
-    // While it would be safe to assume true for the opacity of
-    // a null border, this behavior would not be according to
-    // the API specification. Also, it is pathological to have
-    // null borders anyway.
-    if ((insideBorder == null) || (outsideBorder == null))
-      return false;
+    // Although the API specification states that this method 
+    // returns true if both the inside and outside borders are non-null
+    // and opaque, and false otherwise, a mauve test shows that if both
+    // the inside or outside borders are null, then true is returned.
+    if ((insideBorder == null) && (outsideBorder == null))
+      return true;
 
-    return insideBorder.isBorderOpaque()
-      && outsideBorder.isBorderOpaque();
+    // A mauve test shows that if the inside border has a null value,
+    // then true is returned if the outside border is opaque; if the
+    // outside border has a null value, then true is returned if the
+    // inside border is opaque; else, true is returned if both the
+    // inside and outside borders are opaque.
+    if (insideBorder == null)
+      return outsideBorder.isBorderOpaque();
+    else if (outsideBorder == null)
+      return insideBorder.isBorderOpaque();
+    else
+      return insideBorder.isBorderOpaque() && outsideBorder.isBorderOpaque();
   }
     
   /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.