Merge

src/share/classes/sun/awt/datatransfer/DataTransferer.java

@@ -2905,13 +2905,13 @@ search:
                     return comp;
                 }
 
-//                if (flavor1.isFlavorTextType()) {
-//                    return 1;
-//                }
-//
-//                if (flavor2.isFlavorTextType()) {
-//                    return -1;
-//                }
+                if (flavor1.isFlavorTextType()) {
+                    return 1;
+                }
+
+                if (flavor2.isFlavorTextType()) {
+                    return -1;
+                }
 
                 // Next, look for application/x-java-* types. Prefer unknown
                 // MIME types because if the user provides his own data flavor,