harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r588245 [3/10] - in /harmony/enhanced/classlib/branches/java6: depends/build/ depends/files/ make/ modules/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/ modules/archive/ modules/archive/src/main/java/jav...
Date Thu, 25 Oct 2007 14:45:48 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/nativebridge/ByteBase.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/nativebridge/ByteBase.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/nativebridge/ByteBase.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/nativebridge/ByteBase.java Thu Oct 25 07:44:56 2007
@@ -165,8 +165,8 @@
      * must be non-negative and no larger than dst.length - from
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > dst.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > dst.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > dst.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void get(byte[] dst, int from, int length) {
         checkArraysBounds(from, dst.length, length, 1);
@@ -187,8 +187,8 @@
      * must be non-negative and no larger than array.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void set(byte[] src, int offset, int length) {
         checkArraysBounds(offset, src.length, length, 1);
@@ -285,8 +285,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void getChar(char[] dst, int offset, int length) {
         checkArraysBounds(offset, dst.length, length, 2);
@@ -309,8 +309,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void setChar(char[] src, int offset, int length) {
         checkArraysBounds(offset, src.length, length, 2);
@@ -366,8 +366,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void getInt16(short[] dst, int offset, int length) {
         checkArraysBounds(offset, dst.length, length, 2);
@@ -390,8 +390,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void setInt16(short[] src, int offset, int length) {
         checkArraysBounds(offset, src.length, length, 2);
@@ -483,8 +483,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void getFloat(float[] dst, int offset, int length) {
         checkArraysBounds(offset, dst.length, length, 4);
@@ -507,8 +507,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void setFloat(float[] src, int offset, int length) {
         checkArraysBounds(offset, src.length, length, 4);
@@ -531,8 +531,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void getDouble(double[] dst, int offset, int length) {
         checkArraysBounds(offset, dst.length, length, 8);
@@ -555,8 +555,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void setDouble(double[] src, int offset, int length) {
         checkArraysBounds(offset, src.length, length, 8);
@@ -612,8 +612,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void getInt32(int[] dst, int offset, int length) {
         checkArraysBounds(offset, dst.length, length, 4);
@@ -636,8 +636,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void setInt32(int[] src, int offset, int length) {
         checkArraysBounds(offset, src.length, length, 4);
@@ -693,8 +693,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void getInt64(long[] dst, int offset, int length) {
         checkArraysBounds(offset, dst.length, length, 8);
@@ -717,8 +717,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void setInt64(long[] src, int offset, int length) {
         checkArraysBounds(offset, src.length, length, 8);
@@ -787,8 +787,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void getCLong(long[] dst, int offset, int length) {
         checkArraysBounds(offset, dst.length, length, CLONG_SIZE == 8 ? 8 : 4);
@@ -807,8 +807,8 @@
      * must be non-negative and no larger than dst.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void setCLong(long[] src, int offset, int length) {
         checkArraysBounds(offset, src.length, length, CLONG_SIZE == 8 ? 8 : 4);
@@ -1110,15 +1110,15 @@
         }
     }
 
-    final void checkArraysBounds(int toIdx, int srcDstLengh, int copyLength, int bytesInData) {
+    final void checkArraysBounds(int toIdx, int srcDstLength, int copyLength, int bytesInData) {
         if (size == -1) {
             return;
         }
-        if (toIdx < 0 || toIdx > srcDstLengh) {
+        if (toIdx < 0 || toIdx > srcDstLength) {
             // awt.34=Initial offset in the destination array is wrong: {0}
             throw new IndexOutOfBoundsException(Messages.getString("awt.34", toIdx)); //$NON-NLS-1$
         }
-        if (copyLength < 0 || copyLength > srcDstLengh - toIdx || copyLength * bytesInData > size) {
+        if (copyLength < 0 || copyLength > srcDstLength - toIdx || copyLength * bytesInData > size) {
             // awt.35=Wrong number of elements to copy: {0}
             throw new IndexOutOfBoundsException(Messages.getString("awt.35", copyLength)); //$NON-NLS-1$
         }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/nativebridge/Int16Pointer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/nativebridge/Int16Pointer.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/nativebridge/Int16Pointer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/nativebridge/Int16Pointer.java Thu Oct 25 07:44:56 2007
@@ -109,7 +109,7 @@
         if (byteBase != null) {
             byteBase.getChar(dst, offset, length);
         } else {
-            throw new UnsupportedOperationException("not inmplemented"); //$NON-NLS-1$
+            throw new UnsupportedOperationException("not implemented"); //$NON-NLS-1$
         }
     }
 
@@ -126,7 +126,7 @@
         if (byteBase != null) {
             byteBase.setChar(src, offset, length);
         } else {
-            throw new UnsupportedOperationException("not inmplemented"); //$NON-NLS-1$
+            throw new UnsupportedOperationException("not implemented"); //$NON-NLS-1$
         }
     }
 
@@ -143,7 +143,7 @@
         if (byteBase != null) {
             byteBase.getInt16(dst, offset, length);
         } else {
-            throw new UnsupportedOperationException("not inmplemented"); //$NON-NLS-1$
+            throw new UnsupportedOperationException("not implemented"); //$NON-NLS-1$
         }
     }
 
@@ -160,7 +160,7 @@
         if (byteBase != null) {
             byteBase.setInt16(src, offset, length);
         } else {
-            throw new UnsupportedOperationException("not inmplemented"); //$NON-NLS-1$
+            throw new UnsupportedOperationException("not implemented"); //$NON-NLS-1$
         }
     }
 
@@ -171,7 +171,7 @@
         if (byteBase != null) {
             return new Int16Pointer(byteBase.getBytesBaseElementPointer(index * INT16_SIZE_FACTOR, INT16_SIZE_FACTOR));
         }
-        throw new UnsupportedOperationException("not inmplemented"); //$NON-NLS-1$
+        throw new UnsupportedOperationException("not implemented"); //$NON-NLS-1$
     }
 
     /**
@@ -206,7 +206,7 @@
         if (byteBase != null) {
             byteBase.setString(str);
         } else {
-            throw new UnsupportedOperationException("not inmplemented"); //$NON-NLS-1$
+            throw new UnsupportedOperationException("not implemented"); //$NON-NLS-1$
         }
     }
 
@@ -217,7 +217,7 @@
                 byteBase.setInt16(i * INT16_SIZE_FACTOR, value);
             }
         } else {
-            throw new UnsupportedOperationException("not inmplemented"); //$NON-NLS-1$
+            throw new UnsupportedOperationException("not implemented"); //$NON-NLS-1$
         }
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/nativebridge/Int8Pointer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/nativebridge/Int8Pointer.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/nativebridge/Int8Pointer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/nativebridge/Int8Pointer.java Thu Oct 25 07:44:56 2007
@@ -83,8 +83,8 @@
      * must be non-negative and no larger than dst.length - from
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > dst.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > dst.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > dst.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void get(byte[] dst, int from, int length) {
         byteBase.get(dst, from, length);
@@ -100,8 +100,8 @@
      * must be non-negative and no larger than array.length - offset
      *
      * @throws IndexOutOfBoundsException if from < 0 || from > src.length
-     * @throws IndexOutOfBoundsException if lenght < 0 || lenght > src.length - from
-     * @throws IndexOutOfBoundsException if lenght > this.size()
+     * @throws IndexOutOfBoundsException if length < 0 || length > src.length - from
+     * @throws IndexOutOfBoundsException if length > this.size()
      */
     public void set(byte[] src, int offset, int length) {
         byteBase.set(src, offset, length);

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/font/LinuxFont.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/font/LinuxFont.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/font/LinuxFont.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/font/LinuxFont.java Thu Oct 25 07:44:56 2007
@@ -57,6 +57,9 @@
 
     // X11 screen value
     private int screen = 0;
+
+    // native antialiased font handle
+    private long aaFont = 0;
     
     public LinuxFont(String fontName, int fontStyle, int fontSize) {
         /*
@@ -332,5 +335,20 @@
         }
         
         return extraMetrix;
+    }
+
+    /**
+     * Returns native font handle of this font peer. 
+     */
+    public long getFontHandle(boolean isAntialiased) {
+        if (!isAntialiased) {
+            return this.getFontHandle();
+        } else {
+            if (aaFont == 0) {
+                aaFont = LinuxNativeFont.getAntialiasedFont(
+                        pFont, this.display, true);
+            }
+            return aaFont;
+        }
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/font/LinuxGlyph.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/font/LinuxGlyph.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/font/LinuxGlyph.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/font/LinuxGlyph.java Thu Oct 25 07:44:56 2007
@@ -48,10 +48,10 @@
  */
 public class LinuxGlyph extends Glyph{
 
-    // Xft instanse
+    // Xft instance
     private final Xft xft = Xft.getInstance();
     
-    // LinuxNativeFontWrapper instanse
+    // LinuxNativeFontWrapper instance
     private final LinuxNativeFontWrapper lnfw = LinuxNativeFontWrapper.getInstance();
 
     // GlyphBitmap structure that stores bitmap of the glyph. 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/font/LinuxNativeFont.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/font/LinuxNativeFont.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/font/LinuxNativeFont.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/font/LinuxNativeFont.java Thu Oct 25 07:44:56 2007
@@ -46,9 +46,9 @@
     public synchronized static native String[] getFontFamiliesNames();
 
     /**
-     * Returns true if the new font was added to the system, false otherwise.
-     * Methods checks if the number of system fonts changed after font configutation
-     * was rebuilded.
+     * Returns true if the new font was added to the system, false
+     * otherwise.  Methods checks if the number of system fonts
+     * changed after font configuration was rebuilt.
      *   
      * @param absolutePath absolute path to the font.
      */
@@ -59,7 +59,7 @@
      * font handle, also sets font type to the font peer parameter. 
      * NullPointerException is thrown if there are errors in native code. 
      * 
-     * @param linFont LinuxFont instanse
+     * @param linFont LinuxFont instance
      * @param family font family name
      * @param style style of the font
      * @param size size of the font
@@ -110,6 +110,11 @@
     public synchronized static native String getFontPSNameNative(long fnt);
 
     /**
+     * Getting antialiasing font from existing font
+     */
+    public static native long getAntialiasedFont(long font, long display, boolean isAntialiasing);
+
+    /**
      * Disposing XftFont object.
      * 
      * @param hndFont XftFont handle
@@ -193,7 +198,7 @@
      * directory, after temporary font file is deleted.
      *   
      * @param tempFontFileName directory that is being re-cached name.
-     * @return not null value if succcess, 0 otherwise
+     * @return not null value if success, 0 otherwise
      */
     public synchronized static native int RemoveFontResource(String tempFontFileName);
 
@@ -672,7 +677,7 @@
     }
 
     /**
-     * Returns an array of instanses of 1 pt. sized plain Font objects
+     * Returns an array of instances of 1 pt. sized plain Font objects
      * corresponding to fonts supported by a system. 
      */
     public static Font[] getAllFonts() {

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/DrawableTextRenderer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/DrawableTextRenderer.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/DrawableTextRenderer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/DrawableTextRenderer.java Thu Oct 25 07:44:56 2007
@@ -25,6 +25,7 @@
 import java.awt.font.GlyphVector;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
+import java.awt.RenderingHints;
 
 import org.apache.harmony.awt.gl.CommonGraphics2D;
 import org.apache.harmony.awt.gl.TextRenderer;
@@ -44,12 +45,17 @@
  */
 public class DrawableTextRenderer extends TextRenderer {
     
-    /** Singleton DrawableTextRenderer instanse */
+    /** Singleton DrawableTextRenderer instance */
     public static final DrawableTextRenderer inst = new DrawableTextRenderer();
 
-    // X11 instanse
+    // X11 instance
     static final X11 x11 = X11.getInstance();
 
+    boolean isAntialiasingHintSet(Graphics2D g){
+        Object value = g.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
+        return (value == RenderingHints.VALUE_ANTIALIAS_ON);
+    }
+
     public void drawString(Graphics2D ga, String str, float x, float y) {
         CommonGraphics2D g = (CommonGraphics2D)ga;
         AffineTransform trans = g.getTransform();
@@ -57,6 +63,7 @@
         double yOffset = y + trans.getTranslateY();
 
         FontPeerImpl fnt = (FontPeerImpl)g.getFont().getPeer();
+
         if (fnt.getClass() == CompositeFont.class){
             drawCompositeString(g, str, xOffset, yOffset);
         } else {
@@ -128,7 +135,7 @@
         }
         if (inChars.length != 0 ){
             LinuxNativeFont.drawStringNative(xg2d.xftDraw, display, colormap, 
-                    peer.getFontHandle(), (int)Math.round(x), (int)Math.round(y), 
+                    peer.getFontHandle(isAntialiasingHintSet(g)), (int)Math.round(x), (int)Math.round(y),
                     outChars, j, xcolorPtr);
         }
         xcolor.unlock();
@@ -251,7 +258,7 @@
             char chars[] = {gl.getChar()};
 
             LinuxNativeFont.drawStringNative(xg2d.xftDraw, display, colormap, 
-                    peer.getFontHandle(), xBaseLine, yBaseLine, chars, 1, 
+                    peer.getFontHandle(isAntialiasingHintSet(g)), xBaseLine, yBaseLine, chars, 1,
                     xcolorPtr);
         }
         xcolor.unlock();

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphicsConfiguration.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphicsConfiguration.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphicsConfiguration.java Thu Oct 25 07:44:56 2007
@@ -248,9 +248,9 @@
             case Transparency.OPAQUE:
                 return getColorModel();
             case Transparency.TRANSLUCENT:
+                return ColorModel.getRGBdefault();
             case Transparency.BITMASK:
-                // Transparency unsupported yet, return default model again
-                return getColorModel();
+                return new DirectColorModel(25, 0xFF0000, 0xFF00, 0xFF, 0x1000000);
             default:
                 // awt.0D=Invalid transparency
                 throw new IllegalArgumentException(Messages.getString("awt.0D")); //$NON-NLS-1$

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WindowsFont.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WindowsFont.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WindowsFont.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WindowsFont.java Thu Oct 25 07:44:56 2007
@@ -46,6 +46,8 @@
     
     // table with loaded cached Glyphs
     private final Hashtable<Integer, WinGlyph> glyphs = new Hashtable<Integer, WinGlyph>();
+    // table with loaded glyph codes
+    private final Hashtable<Integer, Integer> glyphCodes = new Hashtable<Integer, Integer>();
 
     // Pairs of [begin, end],[..].. unicode ranges values 
     private int[] fontUnicodeRanges;
@@ -404,7 +406,33 @@
 
         return faceName;
     }
-    
+
+    /**
+     * Returns unicode by index from the 'cmap' table of this font.
+     */
+    @Override
+    public char getUnicodeByIndex(int glyphCode) {
+        char result;
+
+        if (glyphCodes.isEmpty()) {
+            for (int i = 0; i < fontUnicodeRanges.length - 1; i += 2) {
+                for (int j = fontUnicodeRanges[i]; j <= fontUnicodeRanges[i + 1]; j++)
+                {
+                    int code = NativeFont.getGlyphCodeNative(pFont, (char) j);
+                    glyphCodes.put(code, j);
+                }
+            }
+        }
+
+        if (glyphCodes.containsKey(glyphCode)) {
+            result = (char) glyphCodes.get(glyphCode).intValue();
+        } else {
+            result = defaultChar;
+        }
+
+        return result;
+    }
+
     /**
      * Returns initiated FontExtraMetrics instance of this WindowsFont.
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java Thu Oct 25 07:44:56 2007
@@ -101,18 +101,21 @@
                 int compType = ac.getRule();
                 float alpha = ac.getAlpha();
                 if(srcSurf instanceof ImageSurface){
-                    if(bgcolor == null || srcSurf.getTransparency() == Transparency.OPAQUE){
-                        bltImage(srcX, srcY, srcSurfStruct, srcSurf.getData(),
-                                dstX, dstY, dstSurfStruct,
-                                width, height, compType, alpha,
-                                matrix, clipRects, numVertex, 
-                                srcSurf.invalidated());
-                    }else{
-                        bltBGImage(srcX, srcY, srcSurfStruct, srcSurf.getData(),
-                                dstX, dstY, dstSurfStruct,
-                                width, height, bgcolor.getRGB(),
-                                compType, alpha, matrix, clipRects, 
-                                numVertex, srcSurf.invalidated());
+                    Object data = srcSurf.getData();
+                    synchronized(data){
+                        if(bgcolor == null || srcSurf.getTransparency() == Transparency.OPAQUE){
+                            bltImage(srcX, srcY, srcSurfStruct, srcSurf.getData(),
+                                    dstX, dstY, dstSurfStruct,
+                                    width, height, compType, alpha,
+                                    matrix, clipRects, numVertex, 
+                                    srcSurf.invalidated());
+                        }else{
+                            bltBGImage(srcX, srcY, srcSurfStruct, srcSurf.getData(),
+                                    dstX, dstY, dstSurfStruct,
+                                    width, height, bgcolor.getRGB(),
+                                    compType, alpha, matrix, clipRects, 
+                                    numVertex, srcSurf.invalidated());
+                        }
                     }
                     srcSurf.validate();
                 }else{
@@ -124,10 +127,13 @@
             }else if(comp instanceof XORComposite){
                 XORComposite xcomp = (XORComposite) comp;
                 if(srcSurf instanceof ImageSurface){
-                    xorImage(srcX, srcY, srcSurfStruct, srcSurf.getData(),
-                            dstX, dstY, dstSurfStruct,
-                            width, height, xcomp.getXORColor().getRGB(),
-                            matrix, clipRects, numVertex, srcSurf.invalidated());
+                    Object data = srcSurf.getData();
+                    synchronized(data){
+                        xorImage(srcX, srcY, srcSurfStruct, data,
+                                dstX, dstY, dstSurfStruct,
+                                width, height, xcomp.getXORColor().getRGB(),
+                                matrix, clipRects, numVertex, srcSurf.invalidated());
+                    }
                     srcSurf.validate();
                 }else{
                     xorBitmap(srcX, srcY, srcSurfStruct,

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java Thu Oct 25 07:44:56 2007
@@ -74,10 +74,6 @@
         super(hwnd, hdc);
     }
 
-    public WGLGraphicsConfiguration(long hdc) {
-        super(hdc);
-    }
-
     public long windowProc(long hwnd, int msg, long wParam, long lParam) {
         return w32.DefWindowProcW(hwnd, msg, wParam, lParam);
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java Thu Oct 25 07:44:56 2007
@@ -40,6 +40,7 @@
 
 import org.apache.harmony.awt.gl.CommonGraphics2D;
 import org.apache.harmony.awt.gl.MultiRectArea;
+import org.apache.harmony.awt.gl.XORComposite;
 import org.apache.harmony.awt.gl.font.FontManager;
 import org.apache.harmony.awt.gl.font.NativeFont;
 import org.apache.harmony.awt.gl.font.fontlib.FLTextRenderer;
@@ -186,7 +187,12 @@
             if (img == null) {
                 config = new WinGraphicsConfiguration(nw.getId(), getDC());
             } else {
-                config = new WinGraphicsConfiguration(getDC());
+                long hwnd = img.getHWND();
+                if(hwnd != 0){
+                    config = new WinGraphicsConfiguration(hwnd, getDC());
+                }else{
+                    config = img.getGraphicsConfiguration();
+                }
             }
         }
 
@@ -195,7 +201,7 @@
 
     @Override
     protected void fillMultiRectAreaPaint(MultiRectArea mra) {
-        if (nativeBrush) {
+        if (nativeBrush && composite == AlphaComposite.SrcOver) {
             fillRects(gi, mra.rect, mra.rect[0]-1);
         } else {
             super.fillMultiRectAreaPaint(mra);
@@ -223,7 +229,7 @@
     }
 
 
-    //REMARK: It seems that transfrom affects paints too
+    //REMARK: It seems that transform affects paints too
     //REMARK: Think how to implement this
     @Override
     public void setPaint(Paint paint) {
@@ -302,7 +308,7 @@
 
     @Override
     public void draw(Shape s) {
-        if (!nativePen) {
+        if (!nativePen || composite != AlphaComposite.SrcOver) {
             super.draw(s);
             return;
         }
@@ -314,7 +320,7 @@
 
     @Override
     public void drawLine(int x1, int y1, int x2, int y2) {
-        if (!nativePen) {
+        if (!nativePen || composite != AlphaComposite.SrcOver) {
             super.drawLine(x1, y1, x2, y2);
             return;
         }
@@ -324,7 +330,7 @@
 
     @Override
     public void drawRect(int x, int y, int width, int height) {
-        if (!nativePen) {
+        if (!nativePen || composite != AlphaComposite.SrcOver) {
             super.drawRect(x, y, width, height);
             return;
         }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsConfiguration.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsConfiguration.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsConfiguration.java Thu Oct 25 07:44:56 2007
@@ -23,6 +23,7 @@
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.Rectangle;
+import java.awt.Transparency;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
@@ -68,12 +69,7 @@
     }
 
     public WinGraphicsConfiguration(long hwnd, long hdc) {
-        this(hdc);
         this.device = new WinGraphicsDevice(hwnd);
-    }
-
-    public WinGraphicsConfiguration(long hdc) {
-        this.device = null;
         this.index = -1;
 
         int dci = win32.GetPixelFormat(hdc);
@@ -93,34 +89,34 @@
     private void init(Win32.PIXELFORMATDESCRIPTOR pfd) {
         flags = pfd.get_dwFlags();
         pixelType = pfd.get_iPixelType();
-        if ((pixelType & WindowsDefs.PFD_TYPE_COLORINDEX) == WindowsDefs.PFD_TYPE_COLORINDEX) {
-            cm = null;
-            return;
-        }
-
         bits = pfd.get_cColorBits();
+
         if (bits == 0) { 
-            cm = null; 
             return; 
         }
-        
-        redBits = pfd.get_cRedBits();
-        redShift = pfd.get_cRedShift();
-        rmask = (int)(Math.pow(2,redBits)-1) << redShift;
-
-        greenBits = pfd.get_cGreenBits();
-        greenShift = pfd.get_cGreenShift();
-        gmask = (int)(Math.pow(2,greenBits)-1) << greenShift;
-
-        blueBits = pfd.get_cBlueBits();
-        blueShift = pfd.get_cBlueShift();
-        bmask = (int)(Math.pow(2,blueBits)-1) << blueShift;
-
-        alphaBits = pfd.get_cAlphaBits();
-        alphaShift = pfd.get_cAlphaShift();
-        amask = (int)(Math.pow(2,alphaBits)-1) << alphaShift;
 
-        cm = new DirectColorModel(bits, rmask, gmask, bmask, amask);
+        if ((pixelType & WindowsDefs.PFD_TYPE_COLORINDEX) != WindowsDefs.PFD_TYPE_COLORINDEX) {
+            redBits = pfd.get_cRedBits();
+            redShift = pfd.get_cRedShift();
+            rmask = (int)(Math.pow(2,redBits)-1) << redShift;
+
+            greenBits = pfd.get_cGreenBits();
+            greenShift = pfd.get_cGreenShift();
+            gmask = (int)(Math.pow(2,greenBits)-1) << greenShift;
+
+            blueBits = pfd.get_cBlueBits();
+            blueShift = pfd.get_cBlueShift();
+            bmask = (int)(Math.pow(2,blueBits)-1) << blueShift;
+
+            alphaBits = pfd.get_cAlphaBits();
+            alphaShift = pfd.get_cAlphaShift();
+            amask = (int)(Math.pow(2,alphaBits)-1) << alphaShift;
+        }
+
+        long hdc = win32.CreateDCW(null, device.getIDstring(), null, null);
+        cm = createColorModel(hdc);
+        win32.DeleteDC(hdc);
+
     }
 
     @Override
@@ -166,7 +162,14 @@
 
     @Override
     public ColorModel getColorModel(int transparency) {
-        return cm;
+        switch(transparency){
+        case Transparency.BITMASK:
+            return new DirectColorModel(25, 0xFF0000, 0xFF00, 0xFF, 0x1000000);
+        case Transparency.TRANSLUCENT:
+            return ColorModel.getRGBdefault();
+        default:
+            return cm;
+        }
     }
 
     @Override
@@ -242,4 +245,6 @@
     public int getIndex() {
         return index;
     }
+    
+    private native ColorModel createColorModel(long hdc);
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java Thu Oct 25 07:44:56 2007
@@ -158,4 +158,12 @@
         }
         super.flush();
     }
+    
+    long getHWND(){
+        return hwnd;
+    }
+    
+    WinGraphicsConfiguration getGraphicsConfiguration(){
+        return gc;
+    }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WinDataTransfer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WinDataTransfer.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WinDataTransfer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WinDataTransfer.java Thu Oct 25 07:44:56 2007
@@ -86,7 +86,7 @@
             return getDataObjectFormats(pointer);
         }
 
-        public boolean isNativeFormatAtailable(String nativeFormat) {
+        public boolean isNativeFormatAvailable(String nativeFormat) {
             return isDataObjectFormatAvailable(pointer, nativeFormat);
         }
         

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WindowsDefs.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WindowsDefs.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WindowsDefs.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WindowsDefs.java Thu Oct 25 07:44:56 2007
@@ -3394,7 +3394,7 @@
     static final int ERROR_DS_SOURCE_AUDITING_NOT_ENABLED = 8552;
     static final int ERROR_DS_CANT_CREATE_IN_NONDOMAIN_NC = 8553;
     static final int ERROR_DS_INVALID_NAME_FOR_SPN = 8554;
-    static final int ERROR_DS_FILTER_USES_CONTRUCTED_ATTRS = 8555;
+    static final int ERROR_DS_FILTER_USES_CONSTRUCTED_ATTRS = 8555;
     static final int ERROR_DS_UNICODEPWD_NOT_IN_QUOTES = 8556;
     static final int ERROR_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED = 8557;
     static final int ERROR_DS_MUST_BE_RUN_ON_DST_DC = 8558;

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEvent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEvent.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEvent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEvent.java Thu Oct 25 07:44:56 2007
@@ -584,9 +584,9 @@
         modifiers |= ((win32.GetKeyState(VK_MENU) & 0x80) != 0) ?
                 InputEvent.ALT_DOWN_MASK : 0;
 
-        modifiers |= ((wParam & MK_LBUTTON) != 0) || (msg == WM_LBUTTONUP) ? InputEvent.BUTTON1_DOWN_MASK : 0;
-        modifiers |= ((wParam & MK_MBUTTON) != 0) || (msg == WM_MBUTTONUP) ? InputEvent.BUTTON2_DOWN_MASK : 0;
-        modifiers |= ((wParam & MK_RBUTTON) != 0) || (msg == WM_RBUTTONUP) ? InputEvent.BUTTON3_DOWN_MASK : 0;
+        modifiers |= (wParam & MK_LBUTTON) != 0 ? InputEvent.BUTTON1_DOWN_MASK : 0;
+        modifiers |= (wParam & MK_MBUTTON) != 0 ? InputEvent.BUTTON2_DOWN_MASK : 0;
+        modifiers |= (wParam & MK_RBUTTON) != 0 ? InputEvent.BUTTON3_DOWN_MASK : 0;
         return modifiers;
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/AGL.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/AGL.h?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/AGL.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/AGL.h Thu Oct 25 07:44:56 2007
@@ -4044,7 +4044,7 @@
 111,238,  1,226,251, 56,  0,  0,115,109, 97,108,236,247,230,  0,
   0,  0,  0}; 
 
-static const ufshort STANDART_ENCODING[256] = {
+static const ufshort STANDARD_ENCODING[256] = {
     0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Outline.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Outline.cpp?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Outline.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Outline.cpp Thu Oct 25 07:44:56 2007
@@ -25,7 +25,7 @@
 	commandsCount = 0;
 
 	_points = new ffloat[_pointsLength = pointsNumber];
-	_commands = new ufchar[_commandLenght = commandNumber];    
+	_commands = new ufchar[_commandLength = commandNumber];    
 
 	/*for (commandsCount = 0 ; commandsCount < commandNumber; commandsCount ++) {
 		this->_commands[commandsCount] = SEG_CLOSE;
@@ -40,11 +40,11 @@
 }
 
 void Outline::trim() {
-    if (_commandLenght == commandsCount) {
+    if (_commandLength == commandsCount) {
 		return;
 	}
 
-	//printf("_length = %u, commandsCount = %u\n", _commandLenght, commandsCount);
+	//printf("_length = %u, commandsCount = %u\n", _commandLength, commandsCount);
 
 	ufchar *commandMas = new ufchar[commandsCount];
 	ffloat *pointsMas = new ffloat[pointsCount];
@@ -58,7 +58,7 @@
 	_points = pointsMas;
 	_commands = commandMas;
 
-    _commandLenght = commandsCount;
+    _commandLength = commandsCount;
     _pointsLength = pointsCount;
 }
 
@@ -111,5 +111,5 @@
 }
 
 ufshort Outline::getCommandLength(void) {
-    return _commandLenght;
+    return _commandLength;
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Outline.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Outline.h?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Outline.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Outline.h Thu Oct 25 07:44:56 2007
@@ -73,7 +73,7 @@
 	
 private:
 	ufshort _pointsLength;	
-    ufshort _commandLenght;	
+    ufshort _commandLength;	
 
 	ufshort pointsCount;
 	ufshort commandsCount;

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Font.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Font.cpp?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Font.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Font.cpp Thu Oct 25 07:44:56 2007
@@ -49,7 +49,7 @@
         _descent = 195;
 
 
-        fchar path[MAX_STR_LENGHT];
+        fchar path[MAX_STR_LENGTH];
         size_t length = strlen(pathToFile) - 3;
 
         strncpy(path, pathToFile, length);
@@ -402,7 +402,7 @@
 }
 
 void T1Font::parseAFM(FILE *font) {
-    fchar curStr[MAX_STR_LENGHT];
+    fchar curStr[MAX_STR_LENGTH];
 
     while (!feof(font)) {
         getNextLexeme(curStr, font);
@@ -424,7 +424,7 @@
         } /*else if (!strcmp(curStr, "StartCharMetrics")) {
             getNextLexeme(curStr, font);            
             fchar* curValue;
-            fchar psName[MAX_STR_LENGHT];
+            fchar psName[MAX_STR_LENGTH];
             ufshort count = (ufshort) atoi(curStr);
             for (ufshort i = 0; i < count; i ++) {
                 getNextLine(curStr, font);
@@ -461,7 +461,7 @@
 
 
 void T1Font::initFont(FILE *font) {
-	fchar curStr[MAX_STR_LENGHT];
+	fchar curStr[MAX_STR_LENGTH];
 
 	DecodeState state = HEADER;
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Glyph.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Glyph.cpp?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Glyph.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Glyph.cpp Thu Oct 25 07:44:56 2007
@@ -284,13 +284,13 @@
 
                         memcpy(tempGlyphBB, _glyphBB, 4 * sizeof(ffloat));
 
-						parseValueToOutline((*_charStringMap)[STANDART_ENCODING[(ufshort)y2]], stack, out, curX, curY, relativeSize);
+						parseValueToOutline((*_charStringMap)[STANDARD_ENCODING[(ufshort)y2]], stack, out, curX, curY, relativeSize);
 
 						*curY = x2;
 						*curX = y1;
 						out->moveTo(*curX, *curY);
 
-						parseValueToOutline((*_charStringMap)[STANDART_ENCODING[(ufshort)x3]], stack, out, curX, curY, relativeSize);
+						parseValueToOutline((*_charStringMap)[STANDARD_ENCODING[(ufshort)x3]], stack, out, curX, curY, relativeSize);
 
 						_advanceX = aX;
 						_advanceY = aY;
@@ -409,8 +409,8 @@
 						*point += 2;
 						*command += 1;
 
-						countPoints(stack, (*_charStringMap)[STANDART_ENCODING[bchar]], point, command);
-						countPoints(stack, (*_charStringMap)[STANDART_ENCODING[achar]], point, command);
+						countPoints(stack, (*_charStringMap)[STANDARD_ENCODING[bchar]], point, command);
+						countPoints(stack, (*_charStringMap)[STANDARD_ENCODING[achar]], point, command);
 
 						break;
 					} else if (curChar == CH_STR_ESCAPE_SBW) { //sbw

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Type1Structs.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Type1Structs.h?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Type1Structs.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Type1Structs.h Thu Oct 25 07:44:56 2007
@@ -37,7 +37,7 @@
 
 typedef std::map<const fchar*, const ufshort> Type1CharMap;//inner glyph number -- unicode
 
-static const ufshort MAX_STR_LENGHT = 1024;
+static const ufshort MAX_STR_LENGTH = 1024;
 static const ufshort C1 = 52845;
 static const ufshort C2 = 22719;
 static const ufshort DEF_R_EXEC = 55665;

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp Thu Oct 25 07:44:56 2007
@@ -18,55 +18,50 @@
 
 #include "TypeDefinition.h"
 
-fint fwcslen(fwchar_t* str)
+fint fwcslen(const fwchar_t* str)
 {
     if (!str)
         return 0;
         
 	fint counter=0;
-	fwchar_t* tmpstr = str;
-	while(*tmpstr != 0)
+	while(*str != 0)
 	{
-		tmpstr++;
+		str++;
 		counter++;
 	}
 	return counter;
 }
 
-fint fwcscmp(fwchar_t* str1, fchar* str2)
+fint fwcscmp(const fwchar_t* str1, const fchar* str2)
 {
     if (str1 == 0 || str2 == 0)
         return (fint)(str1 - (fwchar_t*)str2);
         
-	fwchar_t* tmpstr1 = str1; 
-	fchar* tmpstr2 = str2;
-	while(*tmpstr1 != 0 || *tmpstr2 !=0)
+	while(*str1 != 0 || *str2 !=0)
 	{
-        if (*tmpstr1 != (fwchar_t)(*tmpstr2))
+        if (*str1 != (fwchar_t)(*str2))
 			return -1;
 
-		tmpstr1++;
-		tmpstr2++;
+		str1++;
+		str2++;
 	}
 
 	return 0;
 }
 
-fint fwcscmp(fwchar_t* str1, fwchar_t* str2)
+fint fwcscmp(const fwchar_t* str1, const fwchar_t* str2)
 {
     if (str1 == 0 || str2 == 0)
         return (fint)(str1 - str2);
         
-	fwchar_t* tmpstr1 = str1; 
-	fwchar_t* tmpstr2 = str2;
-	while(*tmpstr1 != 0 || *tmpstr2 !=0)
+	while(*str1 != 0 || *str2 !=0)
 	{
-        if (*tmpstr1 != *tmpstr2)
+        if (*str1 != *str2)
 			return -1;
 
-		tmpstr1++;
-		tmpstr2++;
+		str1++;
+		str2++;
 	}
 
 	return 0;
-}
\ No newline at end of file
+}

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.h?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.h Thu Oct 25 07:44:56 2007
@@ -29,8 +29,8 @@
 typedef short fshort;
 typedef unsigned short fwchar_t;
 
-fint fwcslen(fwchar_t* str);
-fint fwcscmp(fwchar_t* str1, fchar* str2);
-fint fwcscmp(fwchar_t* str1, fwchar_t* str2);
+fint fwcslen(const fwchar_t* str);
+fint fwcscmp(const fwchar_t* str1, const fchar* str2);
+fint fwcscmp(const fwchar_t* str1, const fwchar_t* str2);
 
 #endif

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile Thu Oct 25 07:44:56 2007
@@ -34,7 +34,7 @@
   $(SHAREDSUB)TypeDefinition.o
 
 ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
 MDLLIBFILES += \

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/pngdecoder.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/pngdecoder.c?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/pngdecoder.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/pngdecoder.c Thu Oct 25 07:44:56 2007
@@ -250,6 +250,9 @@
   }
 
   (*env)->CallVoidMethod(env, obj, img_PNG_returnHeaderID);
+  if ((*env)->ExceptionCheck(env))
+    longjmp(decoderInfo->jmpBuf, 1);
+
  
   // Get java array for image data
   if(decoderInfo->colorType == PNG_COLOR_TYPE_RGB || 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile Thu Oct 25 07:44:56 2007
@@ -32,7 +32,7 @@
 MDLLIBFILES += $(LIBPATH)libhyzip.a
 endif
 
-MDLLIBFILES += $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+MDLLIBFILES += $(MDLLIBZLIB) \
 	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGraphicsEnvironment.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGraphicsEnvironment.cpp?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGraphicsEnvironment.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGraphicsEnvironment.cpp Thu Oct 25 07:44:56 2007
@@ -22,6 +22,7 @@
 
 #include <windows.h>
 #include "org_apache_harmony_awt_gl_windows_WinGraphicsEnvironment.h"
+#include "gl_GDIPlus.h"
 
 #define MAX_MONITOR_NUMBER 256
 
@@ -77,4 +78,151 @@
         env->SetObjectArrayElement(array, i, monitors.monitors[i]); 
     
     return array;
+}
+
+#define PF_32RGB888    1
+#define PF_16RGB565    2
+#define PF_16RGB555    3
+#define PF_24BGR888    4
+#define PF_8BPP        5
+#define PF_4BPP        6
+#define PF_2BPP        7
+#define PF_1BPP        8
+#define PF_UNKNOWN     0
+
+/*
+ * Class:     org_apache_harmony_awt_gl_windows_WinGraphicsConfiguration
+ * Method:    createColorModel
+ * Signature: (J)Ljava/awt/ColorModel;
+ */
+JNIEXPORT jobject JNICALL Java_org_apache_harmony_awt_gl_windows_WinGraphicsConfiguration_createColorModel
+  (JNIEnv *env, jobject obj, jlong hdc)
+{
+    jclass cmClass;
+    jmethodID cmInit;
+    jobject colorModel;
+
+    GLBITMAPINFO bmpInfo;
+    HBITMAP bmp;
+
+    int pfType;
+    int bits;
+
+    DWORD *mask;
+
+    HDC dc = (HDC)hdc;
+    bmp = CreateCompatibleBitmap(dc, 1, 1);
+
+    memset(&bmpInfo, 0, sizeof(GLBITMAPINFO));
+
+    bmpInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+    GetDIBits(dc, bmp, 0, 1, NULL, (BITMAPINFO *)&bmpInfo, DIB_RGB_COLORS);
+    GetDIBits(dc, bmp, 0, 1, NULL, (BITMAPINFO *)&bmpInfo, DIB_RGB_COLORS);
+
+    DeleteObject(bmp);
+
+    bits = bmpInfo.bmiHeader.biBitCount;
+
+    if(bmpInfo.bmiHeader.biCompression == BI_BITFIELDS){
+        mask = (DWORD *)bmpInfo.bmiColors;
+
+        if(mask[0] == 0x7c00 && mask[1] == 0x03e0 && mask[2] == 0x1f){
+
+             pfType = PF_16RGB555;
+
+        }else if(mask[0] == 0xf800 && mask[1] == 0x07e0 && mask[2] == 0x1f){
+
+             pfType = PF_16RGB565;
+
+        }else if(mask[0] == 0xff0000 && mask[1] == 0xff00 && mask[2] == 0xff){
+
+             pfType = PF_32RGB888;
+
+        }else{
+
+             pfType = PF_UNKNOWN;
+
+        }
+    }else{
+        switch(bits){
+        
+        case 1:
+            pfType = PF_1BPP;
+            break;
+        case 2:
+            pfType = PF_2BPP;
+            break;
+        case 4:
+            pfType = PF_4BPP;
+            break;
+        case 8:
+            pfType = PF_8BPP;
+            break;
+        case 16:
+            pfType = PF_16RGB555;
+            break;
+        case 24:
+            pfType = PF_24BGR888;
+            break;
+        case 32:
+            pfType = PF_32RGB888;
+            break;
+        default:
+            pfType = PF_UNKNOWN;
+        }
+    }
+
+    switch(pfType){
+    
+    case PF_1BPP:
+    case PF_2BPP:
+    case PF_4BPP:
+    case PF_8BPP:
+        {
+            int cmapSize = 1 << bits;
+            int cmapByteSize = cmapSize << 2;
+            jbyteArray cmap = env->NewByteArray(cmapByteSize);
+            void *cmapPtr = env->GetPrimitiveArrayCritical(cmap, 0);
+            memcpy(cmapPtr, bmpInfo.bmiColors, cmapByteSize);
+            env->ReleasePrimitiveArrayCritical(cmap, cmapPtr, 0);
+            cmClass = env->FindClass("java/awt/image/IndexColorModel");
+            cmInit = env->GetMethodID(cmClass, "<init>", "(II[BIZ)V"); 
+            colorModel = env->NewObject(cmClass, cmInit, bits, cmapSize, cmap, 0, 0);
+        }
+        break;
+
+    case PF_16RGB555:
+    case PF_16RGB565:
+        cmClass = env->FindClass("java/awt/image/DirectColorModel");
+        cmInit = env->GetMethodID(cmClass, "<init>", "(IIII)V"); 
+        colorModel = env->NewObject(cmClass, cmInit, bits, mask[0], mask[1], mask[2]);
+        break;
+
+    case PF_32RGB888:
+        cmClass = env->FindClass("java/awt/image/DirectColorModel");
+        cmInit = env->GetMethodID(cmClass, "<init>", "(IIII)V"); 
+        colorModel = env->NewObject(cmClass, cmInit, 24, mask[0], mask[1], mask[2]);
+        break;
+
+    case PF_24BGR888:
+        {
+            cmClass = env->FindClass("java/awt/image/ComponentColorModel");
+            cmInit = env->GetMethodID(cmClass, "<init>", "(Ljava/awt/color/ColorSpace;ZZII)V");
+
+            jclass csClass = env->FindClass("java/awt/color/ColorSpace");
+            jmethodID csInit = env->GetStaticMethodID(csClass, "getInstance", "(I)Ljava/awt/color/ColorSpace");
+            jfieldID csFiled = env->GetStaticFieldID(csClass, "CS_sRGB", "I");
+            jint csType = env->GetStaticIntField(csClass, csFiled);
+
+            jobject cs = env->CallStaticObjectMethod(csClass, csInit, csType);
+            colorModel = env->NewObject(cmClass, cmInit, cs, 0, 0, 1, 0);
+        }
+        break;
+
+    default:
+        cmClass = env->FindClass("java/lang/RuntimeException");
+        env->ThrowNew(cmClass, "Unknown Graphics Device Pixel Format");
+
+    }
+    return colorModel;
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGraphicsEnvironment.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGraphicsEnvironment.h?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGraphicsEnvironment.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGraphicsEnvironment.h Thu Oct 25 07:44:56 2007
@@ -45,6 +45,11 @@
 JNIEXPORT jobjectArray JNICALL
 Java_org_apache_harmony_awt_gl_windows_WinGraphicsEnvironment_enumerateDisplayDevices(JNIEnv *, jobject);
 
+/*
+ * Method: org.apache.harmony.awt.gl.windows.WinGraphicsConfiguration.createColorModel(J)Ljava/awt/ColorModel;
+ */
+JNIEXPORT jobject JNICALL
+Java_org_apache_harmony_awt_gl_windows_WinGraphicsConfiguration_createColorModel(JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile Thu Oct 25 07:44:56 2007
@@ -25,7 +25,7 @@
   libjpeg.a
 
 ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
 MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile Thu Oct 25 07:44:56 2007
@@ -29,7 +29,7 @@
   liblcms.a
 
 ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
 MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c Thu Oct 25 07:44:56 2007
@@ -174,8 +174,8 @@
  * Signature: (Ljava/lang/String;)Z
  *
  * Returns true if the new font was added to the system, false otherwise.
- * Methods checks if the number of system fonts changed after font configutation
- * was rebuilded.
+ * Methods checks if the number of system fonts changed after font configuration
+ * was rebuilt.
  */
 JNIEXPORT jstring JNICALL 
     Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_embedFontNative(JNIEnv *env, jclass obj, jstring fName){
@@ -1768,4 +1768,35 @@
 
     return metrics;
        
+}
+
+/*
+ * Getting antialiased font from existing font 
+ */
+JNIEXPORT jlong JNICALL
+	Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getAntialiasedFont(
+		JNIEnv *env, jclass jobj, jlong font, jlong display, jboolean isAntialiasing){
+	
+    XftFont *fnt = (XftFont *)(long)font;
+    Display *dpy = (Display *)(long)display;
+
+    XftResult result;
+    XftPattern *mpattern = XftFontMatch(dpy, DefaultScreen(dpy),fnt->pattern,&result); 
+
+    XftPatternDel(mpattern, XFT_ANTIALIAS);
+    if (isAntialiasing) {
+        if (!XftPatternAddBool(mpattern, XFT_ANTIALIAS, True)) {
+            throwNPException(env,
+                "Error during adding font antialias set to true to XFTPattern structure");
+        }
+	}
+    else {
+        if (!XftPatternAddBool(mpattern, XFT_ANTIALIAS, False)) {
+            throwNPException(env,
+                "Error during adding font antialias set to false to XFTPattern structure");
+        }
+    }
+
+    XftFont *aaFnt = XftFontOpenPattern(dpy, mpattern);
+    return (long)aaFnt;
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/exports.txt?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/exports.txt (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/exports.txt Thu Oct 25 07:44:56 2007
@@ -27,3 +27,4 @@
 Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_NativeFreeGlyphBitmap
 Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getPointsFromFTVector
 Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_freeGlyphOutline
+Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getAntialiasedFont

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/include/org_apache_harmony_awt_gl_font_LinuxNativeFont.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/include/org_apache_harmony_awt_gl_font_LinuxNativeFont.h?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/include/org_apache_harmony_awt_gl_font_LinuxNativeFont.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/include/org_apache_harmony_awt_gl_font_LinuxNativeFont.h Thu Oct 25 07:44:56 2007
@@ -263,6 +263,16 @@
 JNIEXPORT void JNICALL Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_freeGlyphOutline
   (JNIEnv *, jclass, jlong);
 
+
+/*
+ * Method: org.apache.harmony.awt.gl.font.LinuxNativeFont.getAntialiasedFont 
+ */
+
+JNIEXPORT jlong JNICALL
+	Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getAntialiasedFont(
+		JNIEnv *, jclass, jlong, jlong, jboolean);
+
+
 #ifdef __cplusplus
 }
 #endif

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile Thu Oct 25 07:44:56 2007
@@ -28,7 +28,7 @@
 BUILDFILES = LinuxNativeFont.o
 
 ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
 MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile Thu Oct 25 07:44:56 2007
@@ -22,7 +22,7 @@
   $(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o
 
 ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
 MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/winFont.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/winFont.cpp?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/winFont.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/winFont.cpp Thu Oct 25 07:44:56 2007
@@ -389,7 +389,7 @@
 * Class:     org_apache_harmony_awt_gl_font_NativeFont
 * Method:    enumSystemFonts
 * Signature: ()V;
-* Description: Sets arrays of avaliable Font data in Java.
+* Description: Sets arrays of available Font data in Java.
 */
 JNIEXPORT void JNICALL Java_org_apache_harmony_awt_gl_font_NativeFont_enumSystemFonts(JNIEnv *env, jclass obj) {
     int i = 0;
@@ -816,7 +816,7 @@
 * Class:     org_apache_harmony_awt_gl_font_NativeFont
 * Method:    getFonts
 * Signature: ()[Ljava/lang/String;
-* Description: Returns array of avaliable Font Names.
+* Description: Returns array of available Font Names.
 *       !! Doesn't enumerate Type1 fonts !!
 */
 JNIEXPORT jobjectArray JNICALL Java_org_apache_harmony_awt_gl_font_NativeFont_getFonts(JNIEnv *env, jclass obj) {

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile Thu Oct 25 07:44:56 2007
@@ -25,7 +25,7 @@
   org_apache_harmony_awt_nativebridge_linux_Xft.o
 
 ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
 MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/GradientPaintTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/GradientPaintTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/GradientPaintTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/GradientPaintTest.java Thu Oct 25 07:44:56 2007
@@ -30,7 +30,7 @@
 
     GradientPaint gp;
 
-    public void testContructorBad() {
+    public void testConstructorBad() {
         // Regression for HARMONY-1470
         try {
             new GradientPaint(1, 2, null, 3, 4, new Color(255), false);

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/Graphics2DTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/Graphics2DTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/Graphics2DTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/Graphics2DTest.java Thu Oct 25 07:44:56 2007
@@ -18,6 +18,8 @@
 package java.awt;
 
 import java.awt.image.BufferedImage;
+import java.util.HashMap;
+import java.util.Map;
 
 import junit.framework.TestCase;
 
@@ -68,5 +70,27 @@
 				RenderingHints.VALUE_ANTIALIAS_OFF);
 		assertEquals(g2d.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL),
 				RenderingHints.VALUE_STROKE_DEFAULT);
+	}
+    
+    public void testSetRenderingHint() {
+		// Regression test for HARMONY-4920
+		final Graphics2D g2d = (Graphics2D) frame.getGraphics();
+		final Map<RenderingHints.Key, Object> m = new HashMap<RenderingHints.Key, Object>();
+
+		m.put(RenderingHints.KEY_ALPHA_INTERPOLATION,
+				RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
+		m.put(RenderingHints.KEY_TEXT_ANTIALIASING,
+				RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
+
+		g2d.setRenderingHints(m);
+
+		assertEquals(RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY, g2d
+				.getRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION));
+		assertEquals(RenderingHints.VALUE_TEXT_ANTIALIAS_OFF, g2d
+				.getRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING));
+		assertEquals(RenderingHints.VALUE_ANTIALIAS_OFF, g2d
+				.getRenderingHint(RenderingHints.KEY_ANTIALIASING));
+		assertEquals(RenderingHints.VALUE_STROKE_DEFAULT, g2d
+				.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL));
 	}
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/TexturePaintTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/TexturePaintTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/TexturePaintTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/TexturePaintTest.java Thu Oct 25 07:44:56 2007
@@ -22,7 +22,7 @@
 
 public class TexturePaintTest extends TestCase {
 
-    public void testContructorBad() {
+    public void testConstructorBad() {
         // Regression HARMONY-1471
         try {
             new TexturePaint(null, new Rectangle());

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/InputEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/InputEventTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/InputEventTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/InputEventTest.java Thu Oct 25 07:44:56 2007
@@ -28,9 +28,9 @@
 public class InputEventTest extends TestCase {
 
     public final void testInputEvent() {
-        Button button = new Button("Button");
+        Button button = new Button("Button"); //$NON-NLS-1$
         InputEvent event = new InputEvent(button, 0, 1000000000,
-                InputEvent.ALT_DOWN_MASK | InputEvent.BUTTON1_MASK) {};
+                InputEvent.ALT_MASK | InputEvent.BUTTON1_MASK) {};
 
         assertEquals(event.getSource(), button);
         assertEquals(event.getID(), 0);
@@ -39,7 +39,7 @@
     }
 
     public final void testConsuming() {
-        Button button = new Button("Button");
+        Button button = new Button("Button"); //$NON-NLS-1$
         InputEvent event = new InputEvent(button, 0, 1000000000,
                 InputEvent.ALT_DOWN_MASK | InputEvent.BUTTON1_MASK) {};
 
@@ -49,135 +49,75 @@
     }
 
     public final void testGetModifiers() {
-        Button button = new Button("Button");
-        InputEvent event = new InputEvent(button, 0, 1000000000, 0) {};
+        Button button = new Button("Button"); //$NON-NLS-1$
+        InputEvent event = new InputEvent(button, 0, 1000000000,
+                InputEvent.MASKS | InputEvent.DOWN_MASKS) {};
 
-        event.setModifiers(InputEvent.BUTTON1_MASK);
-        assertEquals(event.getModifiers(), InputEvent.BUTTON1_MASK);
-        event.setModifiers(InputEvent.BUTTON2_MASK);
-        assertEquals(event.getModifiers(), InputEvent.BUTTON2_MASK);
-        event.setModifiers(InputEvent.BUTTON3_MASK);
-        assertEquals(event.getModifiers(), InputEvent.BUTTON3_MASK);
-        event.setModifiers(InputEvent.BUTTON1_DOWN_MASK);
-        assertEquals(event.getModifiers(), InputEvent.BUTTON1_MASK);
-        event.setModifiers(InputEvent.BUTTON2_DOWN_MASK);
-        assertEquals(event.getModifiers(), InputEvent.BUTTON2_MASK);
-        event.setModifiers(InputEvent.BUTTON3_DOWN_MASK);
-        assertEquals(event.getModifiers(), InputEvent.BUTTON3_MASK);
-        event.setModifiers(InputEvent.ALT_MASK);
-        assertEquals(event.getModifiers(), InputEvent.ALT_MASK);
-        event.setModifiers(InputEvent.ALT_DOWN_MASK);
-        assertEquals(event.getModifiers(), InputEvent.ALT_MASK);
-        event.setModifiers(InputEvent.ALT_GRAPH_DOWN_MASK);
-        assertEquals(event.getModifiers(), InputEvent.ALT_GRAPH_MASK);
-        event.setModifiers(InputEvent.ALT_GRAPH_MASK);
-        assertEquals(event.getModifiers(), InputEvent.ALT_GRAPH_MASK);
-        event.setModifiers(InputEvent.CTRL_MASK);
-        assertEquals(event.getModifiers(), InputEvent.CTRL_MASK);
-        event.setModifiers(InputEvent.CTRL_DOWN_MASK);
-        assertEquals(event.getModifiers(), InputEvent.CTRL_MASK);
-        event.setModifiers(InputEvent.SHIFT_DOWN_MASK);
-        assertEquals(event.getModifiers(), InputEvent.SHIFT_MASK);
-        event.setModifiers(InputEvent.SHIFT_MASK);
-        assertEquals(event.getModifiers(), InputEvent.SHIFT_MASK);
-        event.setModifiers(InputEvent.META_MASK);
-        assertEquals(event.getModifiers(), InputEvent.META_MASK);
-        event.setModifiers(InputEvent.META_DOWN_MASK);
-        assertEquals(event.getModifiers(), InputEvent.META_MASK);
+        assertEquals(InputEvent.MASKS, event.getModifiers());
     }
 
     public final void testGetModifiersEx() {
-        Button button = new Button("Button");
-        InputEvent event = new InputEvent(button, 0, 1000000000, 0) {};
+        Button button = new Button("Button"); //$NON-NLS-1$
+        InputEvent event = new InputEvent(button, 0, 1000000000,
+                InputEvent.MASKS | InputEvent.DOWN_MASKS) {};
 
-        event.setModifiers(InputEvent.BUTTON1_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.BUTTON1_DOWN_MASK);
-        event.setModifiers(InputEvent.BUTTON2_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.BUTTON2_DOWN_MASK | InputEvent.ALT_DOWN_MASK);
-        event.setModifiers(InputEvent.BUTTON3_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.BUTTON3_DOWN_MASK | InputEvent.META_DOWN_MASK);
-        event.setModifiers(InputEvent.BUTTON1_DOWN_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.BUTTON1_DOWN_MASK);
-        event.setModifiers(InputEvent.BUTTON2_DOWN_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.BUTTON2_DOWN_MASK);
-        event.setModifiers(InputEvent.BUTTON3_DOWN_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.BUTTON3_DOWN_MASK);
-        event.setModifiers(InputEvent.ALT_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.BUTTON2_DOWN_MASK | InputEvent.ALT_DOWN_MASK);
-        event.setModifiers(InputEvent.ALT_DOWN_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.ALT_DOWN_MASK);
-        event.setModifiers(InputEvent.ALT_GRAPH_DOWN_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.ALT_GRAPH_DOWN_MASK);
-        event.setModifiers(InputEvent.ALT_GRAPH_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.ALT_GRAPH_DOWN_MASK);
-        event.setModifiers(InputEvent.CTRL_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.CTRL_DOWN_MASK);
-        event.setModifiers(InputEvent.CTRL_DOWN_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.CTRL_DOWN_MASK);
-        event.setModifiers(InputEvent.SHIFT_DOWN_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.SHIFT_DOWN_MASK);
-        event.setModifiers(InputEvent.SHIFT_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.SHIFT_DOWN_MASK);
-        event.setModifiers(InputEvent.META_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.BUTTON3_DOWN_MASK | InputEvent.META_DOWN_MASK);
-        event.setModifiers(InputEvent.META_DOWN_MASK);
-        assertEquals(event.getModifiersEx(), InputEvent.META_DOWN_MASK);
+        assertEquals(InputEvent.DOWN_MASKS, event.getModifiersEx());
     }
 
     public final void testIsAltDown() {
-        Button button = new Button("Button");
+        Button button = new Button("Button"); //$NON-NLS-1$
         InputEvent event = new InputEvent(button, 0, 1000000000, 0) {};
 
         assertFalse(event.isAltDown());
-        event.setModifiers(InputEvent.ALT_DOWN_MASK);
+        event = new InputEvent(button, 0, 1000000000, InputEvent.ALT_DOWN_MASK) {};
         assertTrue(event.isAltDown());
     }
 
     public final void testIsAltGraphDown() {
-        Button button = new Button("Button");
+        Button button = new Button("Button"); //$NON-NLS-1$
         InputEvent event = new InputEvent(button, 0, 1000000000, 0) {};
 
         assertFalse(event.isAltGraphDown());
-        event.setModifiers(InputEvent.ALT_GRAPH_DOWN_MASK);
+        event = new InputEvent(button, 0, 1000000000, 
+                InputEvent.ALT_GRAPH_DOWN_MASK) {};
         assertTrue(event.isAltGraphDown());
     }
 
     public final void testIsControlDown() {
-        Button button = new Button("Button");
+        Button button = new Button("Button"); //$NON-NLS-1$
         InputEvent event = new InputEvent(button, 0, 1000000000, 0) {};
 
         assertFalse(event.isControlDown());
-        event.setModifiers(InputEvent.CTRL_DOWN_MASK);
+        event = new InputEvent(button, 0, 1000000000, InputEvent.CTRL_DOWN_MASK) {};
         assertTrue(event.isControlDown());
     }
 
     public final void testIsMetaDown() {
-        Button button = new Button("Button");
+        Button button = new Button("Button"); //$NON-NLS-1$
         InputEvent event = new InputEvent(button, 0, 1000000000, 0) {};
 
         assertFalse(event.isMetaDown());
-        event.setModifiers(InputEvent.META_DOWN_MASK);
+        event = new InputEvent(button, 0, 1000000000, InputEvent.META_DOWN_MASK) {};
         assertTrue(event.isMetaDown());
     }
 
     public final void testIsShiftDown() {
-        Button button = new Button("Button");
+        Button button = new Button("Button"); //$NON-NLS-1$
         InputEvent event = new InputEvent(button, 0, 1000000000, 0) {};
 
         assertFalse(event.isShiftDown());
-        event.setModifiers(InputEvent.SHIFT_DOWN_MASK);
+        event = new InputEvent(button, 0, 1000000000, InputEvent.SHIFT_DOWN_MASK) {};
         assertTrue(event.isShiftDown());
     }
 
     public final void testGetModifiersExText() {
-        assertTrue(InputEvent.getModifiersExText(InputEvent.ALT_DOWN_MASK).indexOf("Alt") != -1);
-        assertTrue(InputEvent.getModifiersExText(InputEvent.ALT_GRAPH_DOWN_MASK).indexOf("Alt Graph") != -1);
-        assertTrue(InputEvent.getModifiersExText(InputEvent.CTRL_DOWN_MASK).indexOf("Ctrl") != -1);
-        assertTrue(InputEvent.getModifiersExText(InputEvent.SHIFT_DOWN_MASK).indexOf("Shift") != -1);
-        assertTrue(InputEvent.getModifiersExText(InputEvent.META_DOWN_MASK).indexOf("Meta") != -1);
-        assertTrue(InputEvent.getModifiersExText(InputEvent.BUTTON1_DOWN_MASK).indexOf("Button1") != -1);
-        assertTrue(InputEvent.getModifiersExText(InputEvent.BUTTON2_DOWN_MASK).indexOf("Button2") != -1);
-        assertTrue(InputEvent.getModifiersExText(InputEvent.BUTTON3_DOWN_MASK).indexOf("Button3") != -1);
+        assertTrue(InputEvent.getModifiersExText(InputEvent.ALT_DOWN_MASK).indexOf("Alt") != -1); //$NON-NLS-1$
+        assertTrue(InputEvent.getModifiersExText(InputEvent.ALT_GRAPH_DOWN_MASK).indexOf("Alt Graph") != -1); //$NON-NLS-1$
+        assertTrue(InputEvent.getModifiersExText(InputEvent.CTRL_DOWN_MASK).indexOf("Ctrl") != -1); //$NON-NLS-1$
+        assertTrue(InputEvent.getModifiersExText(InputEvent.SHIFT_DOWN_MASK).indexOf("Shift") != -1); //$NON-NLS-1$
+        assertTrue(InputEvent.getModifiersExText(InputEvent.META_DOWN_MASK).indexOf("Meta") != -1); //$NON-NLS-1$
+        assertTrue(InputEvent.getModifiersExText(InputEvent.BUTTON1_DOWN_MASK).indexOf("Button1") != -1); //$NON-NLS-1$
+        assertTrue(InputEvent.getModifiersExText(InputEvent.BUTTON2_DOWN_MASK).indexOf("Button2") != -1); //$NON-NLS-1$
+        assertTrue(InputEvent.getModifiersExText(InputEvent.BUTTON3_DOWN_MASK).indexOf("Button3") != -1); //$NON-NLS-1$
     }
-
 }



Mime
View raw message