harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r446628 - in /incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java: common/java/awt/ common/org/apache/harmony/awt/gl/ windows/org/apache/harmony/awt/gl/windows/
Date Fri, 15 Sep 2006 15:08:15 GMT
Author: hindessm
Date: Fri Sep 15 08:08:14 2006
New Revision: 446628

URL: http://svn.apache.org/viewvc?view=rev&rev=446628
Log:
Fixing build break relating to HARMONY-1463 (when built after "clean".

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/ToolkitImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java?view=diff&rev=446628&r1=446627&r2=446628
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java
Fri Sep 15 08:08:14 2006
@@ -25,6 +25,7 @@
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 import java.awt.Dispatcher.MouseGrabManager;
+import java.util.EventListener;
 
 import org.apache.harmony.awt.wtk.NativeEvent;
 import org.apache.harmony.awt.wtk.NativeWindow;
@@ -354,7 +355,7 @@
     }
 
     private PointerInfo propagateEvent(PointerInfo info, long mask,
-                                       Class<?> type, boolean pierceHW) {
+                                       Class<? extends EventListener> type, boolean
pierceHW) {
         Component src = info.src;
         while ((src != null) &&
                (src.isLightweight() || pierceHW) &&

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java?view=diff&rev=446628&r1=446627&r2=446628
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java
Fri Sep 15 08:08:14 2006
@@ -646,12 +646,12 @@
 
     public abstract Map<java.awt.font.TextAttribute, ?> mapInputMethodHighlight(InputMethodHighlight
highlight) throws HeadlessException;
 
-    Map<?, ?> mapInputMethodHighlightImpl(InputMethodHighlight highlight)
+    Map<java.awt.font.TextAttribute, ?> mapInputMethodHighlightImpl(InputMethodHighlight
highlight)
             throws HeadlessException {
         checkHeadless();
-        HashMap<?, ?> map = new HashMap<Object, Object>();
+        HashMap<java.awt.font.TextAttribute, ?> map = new HashMap<java.awt.font.TextAttribute,
Object>();
         wtk.getSystemProperties().mapInputMethodHighlight(highlight, map);
-        return Collections.unmodifiableMap(map);
+        return Collections.<java.awt.font.TextAttribute, Object>unmodifiableMap(map);
     }
 
     public void addPropertyChangeListener(String propName, PropertyChangeListener l) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/ToolkitImpl.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/ToolkitImpl.java?view=diff&rev=446628&r1=446627&r2=446628
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/ToolkitImpl.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/ToolkitImpl.java
Fri Sep 15 08:08:14 2006
@@ -510,7 +510,7 @@
     }
 
     @Override
-    public Map<?, ?> mapInputMethodHighlight(InputMethodHighlight highlight)
+    public Map<java.awt.font.TextAttribute, ?> mapInputMethodHighlight(InputMethodHighlight
highlight)
             throws HeadlessException {
         lockAWT();
         try {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java?view=diff&rev=446628&r1=446627&r2=446628
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
Fri Sep 15 08:08:14 2006
@@ -174,7 +174,7 @@
     }
 
     // Public methods
-    public void addRenderingHints(Map hints) {
+    public void addRenderingHints(Map<?,?> hints) {
         this.hints.putAll(hints);
     }
 
@@ -887,7 +887,7 @@
         hints.put(key, value);
     }
 
-    public void setRenderingHints(Map hints) {
+    public void setRenderingHints(Map<?,?> hints) {
         this.hints.clear();
         this.hints.putAll(hints);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java?view=diff&rev=446628&r1=446627&r2=446628
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java
Fri Sep 15 08:08:14 2006
@@ -135,7 +135,7 @@
         setTransform(getTransform());
     }
 
-    public void addRenderingHints(Map hints) {
+    public void addRenderingHints(Map<?,?> hints) {
         super.addRenderingHints(hints);
         Object value = this.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
         if (value == RenderingHints.VALUE_ANTIALIAS_ON) 
@@ -519,7 +519,7 @@
             NativeFont.setAntialiasing(gi,false);
     }
 
-    public void setRenderingHints(Map hints) {
+    public void setRenderingHints(Map<?,?> hints) {
         super.setRenderingHints(hints);
         Object value = this.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
         if (value == RenderingHints.VALUE_ANTIALIAS_ON) 



Mime
View raw message