[Jnode-svn-commits] SF.net SVN: jnode:[4726] trunk

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

Revision: 4726
          http://jnode.svn.sourceforge.net/jnode/?rev=4726&view=rev
Author:   lsantha
Date:     2008-11-23 20:42:09 +0000 (Sun, 23 Nov 2008)

Log Message:
-----------
openjdk integration

Modified Paths:
--------------
    trunk/core/descriptors/org.classpath.ext.xml
    trunk/core/src/classpath/gnu/gnu/java/awt/peer/GLightweightPeer.java
    trunk/core/src/classpath/gnu/gnu/java/awt/peer/swing/SwingComponentPeer.java
    trunk/core/src/icedtea/sun/util/CoreResourceBundleControl.java
    trunk/gui/src/awt/org/jnode/awt/swingpeers/DesktopFramePeer.java
    trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingComponentPeer.java
    trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingDialogPeer.java

Modified: trunk/core/descriptors/org.classpath.ext.xml
===================================================================
--- trunk/core/descriptors/org.classpath.ext.xml	2008-11-23 20:34:38 UTC (rev 4725)
+++ trunk/core/descriptors/org.classpath.ext.xml	2008-11-23 20:42:09 UTC (rev 4726)
@@ -61,6 +61,7 @@
       <export name="sun.awt.dnd.*"/>
       <export name="sun.awt.geom.*"/>
       <export name="sun.awt.shell.*"/>
+      <export name="sun.awt.util.*"/>
       <export name="sun.dc.path.*"/>
       <export name="sun.dc.pr.*"/>
       <export name="sun.font.*"/>

Modified: trunk/core/src/classpath/gnu/gnu/java/awt/peer/GLightweightPeer.java
===================================================================
--- trunk/core/src/classpath/gnu/gnu/java/awt/peer/GLightweightPeer.java	2008-11-23 20:34:38 UTC (rev 4725)
+++ trunk/core/src/classpath/gnu/gnu/java/awt/peer/GLightweightPeer.java	2008-11-23 20:42:09 UTC (rev 4726)
@@ -62,6 +62,7 @@
 import java.awt.peer.ContainerPeer;
 import java.awt.peer.LightweightPeer;
 import sun.awt.CausedFocusEvent;
+import sun.java2d.pipe.Region;
 
 /**
  * A stub class that implements the ComponentPeer and ContainerPeer
@@ -455,4 +456,8 @@
     public boolean requestFocus(Component lightweightChild, boolean temporary, boolean focusedWindowChangeAllowed, long time, CausedFocusEvent.Cause cause) {
         return false;
     }
+
+    public void applyShape(Region shape) {
+        
+    }
 }

Modified: trunk/core/src/classpath/gnu/gnu/java/awt/peer/swing/SwingComponentPeer.java
===================================================================
--- trunk/core/src/classpath/gnu/gnu/java/awt/peer/swing/SwingComponentPeer.java	2008-11-23 20:34:38 UTC (rev 4725)
+++ trunk/core/src/classpath/gnu/gnu/java/awt/peer/swing/SwingComponentPeer.java	2008-11-23 20:42:09 UTC (rev 4726)
@@ -68,6 +68,7 @@
 import javax.swing.JComponent;
 import javax.swing.RepaintManager;
 import sun.awt.CausedFocusEvent;
+import sun.java2d.pipe.Region;
 
 /**
  * The base class for Swing based component peers. This provides the basic
@@ -1117,4 +1118,7 @@
             swingComponent.getJComponent().requestFocus();
         return swingComponent != null;
     }
+
+    public void applyShape(Region shape) {
+    }
 }

Modified: trunk/core/src/icedtea/sun/util/CoreResourceBundleControl.java
===================================================================
--- trunk/core/src/icedtea/sun/util/CoreResourceBundleControl.java	2008-11-23 20:34:38 UTC (rev 4725)
+++ trunk/core/src/icedtea/sun/util/CoreResourceBundleControl.java	2008-11-23 20:42:09 UTC (rev 4726)
@@ -71,6 +71,26 @@
     public static CoreResourceBundleControl getRBControlInstance() {
 	return resourceBundleControlInstance;
     }
+
+    /**
+     * This method is to provide a customized ResourceBundle.Control to speed
+     * up the search of resources in JDK, with the bundle's package name check.
+     *
+     * @param bundleName bundle name to check
+     * @return the instance of resource bundle control if the bundle is JDK's,
+     *    otherwise returns null.
+     */
+    public static CoreResourceBundleControl getRBControlInstance(String bundleName) {
+        if (bundleName.startsWith("com.sun.") ||
+            bundleName.startsWith("java.") ||
+            bundleName.startsWith("javax.") ||
+            bundleName.startsWith("sun.")) {
+            return resourceBundleControlInstance;
+        } else {
+            return null;
+        }
+    }
+
  
     /*
      * @returns a list of candidate locales to search from.

Modified: trunk/gui/src/awt/org/jnode/awt/swingpeers/DesktopFramePeer.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/swingpeers/DesktopFramePeer.java	2008-11-23 20:34:38 UTC (rev 4725)
+++ trunk/gui/src/awt/org/jnode/awt/swingpeers/DesktopFramePeer.java	2008-11-23 20:42:09 UTC (rev 4726)
@@ -54,6 +54,7 @@
 import org.jnode.awt.JNodeGraphics2D;
 import org.jnode.awt.GraphicsFactory;
 import sun.awt.CausedFocusEvent;
+import sun.java2d.pipe.Region;
 
 /**
  * @author Ewout Prangsma (ep...@us...)
@@ -657,4 +658,8 @@
                 .getBounds()));
         }
     }
+
+    public void applyShape(Region shape) {
+        //TODO implement it
+    }
 }

Modified: trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingComponentPeer.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingComponentPeer.java	2008-11-23 20:34:38 UTC (rev 4725)
+++ trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingComponentPeer.java	2008-11-23 20:42:09 UTC (rev 4726)
@@ -56,6 +56,7 @@
 import org.jnode.awt.JNodeGraphics2D;
 import org.jnode.awt.JNodeToolkit;
 import sun.awt.CausedFocusEvent;
+import sun.java2d.pipe.Region;
 
 /**
  * Base class for virtual component peers. Satisfies the requirements for AWT
@@ -530,4 +531,8 @@
     public void reparent(ContainerPeer parent) {
         //TODO implement it
     }
+
+    public void applyShape(Region shape) {
+        //TODO
+    }
 }

Modified: trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingDialogPeer.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingDialogPeer.java	2008-11-23 20:34:38 UTC (rev 4725)
+++ trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingDialogPeer.java	2008-11-23 20:42:09 UTC (rev 4726)
@@ -22,7 +22,9 @@
 package org.jnode.awt.swingpeers;
 
 import java.awt.Dialog;
+import java.awt.Window;
 import java.awt.peer.DialogPeer;
+import java.util.List;
 
 /**
  * AWT dialog peer implemented as a {@link javax.swing.JInternalFrame}.
@@ -52,6 +54,10 @@
             super.setTitle(title);
         }
     }
+
+    public void blockWindows(List<Window> windows) {
+        //TODO implement it
+    }
 }
 
 final class SwingDialog extends SwingBaseWindow<Dialog, SwingDialog> {


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