java/awt/color/XAWTDifference/XAWTDifference.java

@@ -1,6 +1,29 @@
 /*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
    test
    @bug        5092883 6513478
    @summary    REGRESSION: SystemColor class gives back wrong values under Linux
    @author     andrei.dmitriev : area=awt.color
    @run applet/manual=yesno XAWTDifference.html

@@ -126,21 +149,21 @@
     }//End  init()
 
     public void start ()
     {
         Toolkit toolkit = Toolkit.getDefaultToolkit();
-
         String toolkitName = Toolkit.getDefaultToolkit().getClass().getName();
-        if (toolkitName.equals("sun.awt.windows.WToolkit")){
-            Sysout.println("This test is for XAWT/Motif only. Now using :"+toolkit);
+        if (!toolkitName.equals("sun.awt.X11.XToolkit")) {
+            Sysout.println("Press PASS, this test is for XAWT/Motif only. Now using :"+toolkit);
             return;
         }
+
         String testPath = System.getProperty("test.src", ".");
         Sysout.println("test.src == "+testPath);
         Frame standardFrame = new StandardFrame("StandardFrame");
 
-        standardFrame.setSize(531, 832);
+        standardFrame.setSize(417, 667);
         standardFrame.setVisible(true);
 
         setVisible(true);
         validate();
 

@@ -195,11 +218,11 @@
         super(name);
         String testPath = System.getProperty("test.src", ".");
         image = Toolkit.getDefaultToolkit().getImage(testPath + File.separator + "MotifColors.jpg");
     }
     public void paint(Graphics g){
-        g.drawImage(image, 0, 0, 531, 832, null);
+        g.drawImage(image, 0, 0, 417, 667, this);
     }
 }
 
 /****************************************************
  Standard Test Machinery