The body of the method or constructor declaration performs
* potentially unsafe operations, such as an assignment to an element
- * of the variable-arity parameter's array that generates an unchecked
- * warning.
+ * of the variable arity parameter's array that generates an unchecked
+ * warning. Some unsafe operations do not trigger an unchecked
+ * warning. For example, the aliasing in
+ *
+ *
+ * @SafeVarargs // Not actually safe!
+ * static void m(List<String>... stringLists) {
+ * Object[] array = stringLists;
+ * List<Integer> tmpList = Arrays.asList(42);
+ * array[0] = tmpList; // Semantically invalid, but compiles without warnings
+ * String s = stringLists[0].get(0); // Oh no, ClassCastException at runtime!
+ * }
+ *
+ *
+ * leads to a {@code ClassCastException} at runtime.
*
* Future versions of the platform may mandate compiler errors for
* such unsafe operations.
diff --git a/src/share/classes/java/util/concurrent/locks/LockSupport.java b/src/share/classes/java/util/concurrent/locks/LockSupport.java
index f0cd3bc04568549e41aa99d43e61954b922c1d11..7b829f63a0689acf888ce1e8b50ed5c24fc40d2f 100644
--- a/src/share/classes/java/util/concurrent/locks/LockSupport.java
+++ b/src/share/classes/java/util/concurrent/locks/LockSupport.java
@@ -275,10 +275,14 @@ public class LockSupport {
* snapshot -- the thread may have since unblocked or blocked on a
* different blocker object.
*
+ * @param t the thread
* @return the blocker
+ * @throws NullPointerException if argument is null
* @since 1.6
*/
public static Object getBlocker(Thread t) {
+ if (t == null)
+ throw new NullPointerException();
return unsafe.getObjectVolatile(t, parkBlockerOffset);
}
diff --git a/src/share/classes/javax/swing/JPopupMenu.java b/src/share/classes/javax/swing/JPopupMenu.java
index 24a9d4cf6c5562ea479e3ea9cd862c7f43e1e10e..53926e4a744179027c8c60c5a6a5c28d5e0aa03b 100644
--- a/src/share/classes/javax/swing/JPopupMenu.java
+++ b/src/share/classes/javax/swing/JPopupMenu.java
@@ -342,8 +342,8 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
// Calculate the screen size that popup should fit
Dimension popupSize = JPopupMenu.this.getPreferredSize();
- int popupRightX = popupLocation.x + popupSize.width;
- int popupBottomY = popupLocation.y + popupSize.height;
+ long popupRightX = (long)popupLocation.x + (long)popupSize.width;
+ long popupBottomY = (long)popupLocation.y + (long)popupSize.height;
int scrWidth = scrBounds.width;
int scrHeight = scrBounds.height;
if (!canPopupOverlapTaskBar()) {
@@ -358,13 +358,13 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
int scrBottomY = scrBounds.y + scrHeight;
// Ensure that popup menu fits the screen
- if (popupRightX > scrRightX) {
+ if (popupRightX > (long)scrRightX) {
popupLocation.x = scrRightX - popupSize.width;
if( popupLocation.x < scrBounds.x ) {
popupLocation.x = scrBounds.x ;
}
}
- if (popupBottomY > scrBottomY) {
+ if (popupBottomY > (long)scrBottomY) {
popupLocation.y = scrBottomY - popupSize.height;
if( popupLocation.y < scrBounds.y ) {
popupLocation.y = scrBounds.y;
diff --git a/src/share/classes/javax/swing/JSplitPane.java b/src/share/classes/javax/swing/JSplitPane.java
index d947329d6630dafd7e72b4d20bcb334919dd1e2d..fa773e5ae677f2138ad1d5b3e41bf6fc5ae51d29 100644
--- a/src/share/classes/javax/swing/JSplitPane.java
+++ b/src/share/classes/javax/swing/JSplitPane.java
@@ -671,7 +671,7 @@ public class JSplitPane extends JComponent implements Accessible
* which must be true for the child components
* to be continuously
* redisplayed and laid out during user intervention.
- * The default value of this property is false.
+ * The default value of this property is look and feel dependent.
* Some look and feels might not support continuous layout;
* they will ignore this property.
*
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java b/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
index 42c88e0282385c4b5128cdefc82070282217efef..70b0bffaac763836ec5fbc486956aabb68ae7de9 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
@@ -154,7 +154,7 @@ public class BasicSplitPaneDivider extends Container
setBackground(UIManager.getColor("SplitPane.background"));
}
- private void revalidate() {
+ private void revalidateSplitPane() {
invalidate();
if (splitPane != null) {
splitPane.revalidate();
@@ -315,7 +315,7 @@ public class BasicSplitPaneDivider extends Container
setCursor((orientation == JSplitPane.HORIZONTAL_SPLIT) ?
Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR) :
Cursor.getPredefinedCursor(Cursor.S_RESIZE_CURSOR));
- revalidate();
+ revalidateSplitPane();
}
else if (e.getPropertyName() == JSplitPane.
ONE_TOUCH_EXPANDABLE_PROPERTY) {
@@ -376,7 +376,7 @@ public class BasicSplitPaneDivider extends Container
add(rightButton);
}
}
- revalidate();
+ revalidateSplitPane();
}
diff --git a/src/share/classes/sun/awt/ExtendedKeyCodes.java b/src/share/classes/sun/awt/ExtendedKeyCodes.java
index d6d72ac4ad7c50d20bd51d4c72936e15bd9afad4..fc004ba2a283c2afdacc1c0c964f399f13c00cab 100644
--- a/src/share/classes/sun/awt/ExtendedKeyCodes.java
+++ b/src/share/classes/sun/awt/ExtendedKeyCodes.java
@@ -13,7 +13,7 @@ public class ExtendedKeyCodes {
*/
// Keycodes declared in KeyEvent.java with corresponding Unicode values.
private final static HashMap regularKeyCodesMap =
- new HashMap(83, 1.0f);
+ new HashMap(98, 1.0f);
// Keycodes derived from Unicode values. Here should be collected codes
// for characters appearing on the primary layer of at least one
@@ -108,6 +108,21 @@ public class ExtendedKeyCodes {
regularKeyCodesMap.put(0x5E, KeyEvent.VK_CIRCUMFLEX);
regularKeyCodesMap.put(0x5F, KeyEvent.VK_UNDERSCORE);
regularKeyCodesMap.put(0x60, KeyEvent.VK_BACK_QUOTE);
+ regularKeyCodesMap.put(0x61, KeyEvent.VK_A);
+ regularKeyCodesMap.put(0x62, KeyEvent.VK_B);
+ regularKeyCodesMap.put(0x63, KeyEvent.VK_C);
+ regularKeyCodesMap.put(0x64, KeyEvent.VK_D);
+ regularKeyCodesMap.put(0x65, KeyEvent.VK_E);
+ regularKeyCodesMap.put(0x66, KeyEvent.VK_F);
+ regularKeyCodesMap.put(0x67, KeyEvent.VK_G);
+ regularKeyCodesMap.put(0x68, KeyEvent.VK_H);
+ regularKeyCodesMap.put(0x69, KeyEvent.VK_I);
+ regularKeyCodesMap.put(0x6A, KeyEvent.VK_J);
+ regularKeyCodesMap.put(0x6B, KeyEvent.VK_K);
+ regularKeyCodesMap.put(0x6C, KeyEvent.VK_L);
+ regularKeyCodesMap.put(0x6D, KeyEvent.VK_M);
+ regularKeyCodesMap.put(0x6E, KeyEvent.VK_N);
+ regularKeyCodesMap.put(0x6F, KeyEvent.VK_O);
regularKeyCodesMap.put(0x70, KeyEvent.VK_P);
regularKeyCodesMap.put(0x71, KeyEvent.VK_Q);
regularKeyCodesMap.put(0x72, KeyEvent.VK_R);
diff --git a/src/share/classes/sun/awt/datatransfer/DataTransferer.java b/src/share/classes/sun/awt/datatransfer/DataTransferer.java
index e8fe5859b2dd74663cd0ef7178f7ec9c7c343d6c..82ff88993497126ca743a2a11f40233a763a1df4 100644
--- a/src/share/classes/sun/awt/datatransfer/DataTransferer.java
+++ b/src/share/classes/sun/awt/datatransfer/DataTransferer.java
@@ -29,12 +29,10 @@ import java.awt.AWTError;
import java.awt.EventQueue;
import java.awt.Image;
import java.awt.Graphics;
-import java.awt.Toolkit;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.FlavorMap;
import java.awt.datatransfer.FlavorTable;
-import java.awt.datatransfer.StringSelection;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
@@ -66,8 +64,6 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.security.AccessControlContext;
-import java.security.AccessControlException;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
@@ -171,7 +167,26 @@ public abstract class DataTransferer {
*/
public static final DataFlavor javaTextEncodingFlavor;
- private static SortedSet standardEncodings;
+ /**
+ * Lazy initialization of Standard Encodings.
+ */
+ private static class StandardEncodingsHolder {
+ private static final SortedSet standardEncodings = load();
+
+ private static SortedSet load() {
+ final Comparator comparator =
+ new CharsetComparator(IndexedComparator.SELECT_WORST);
+ final SortedSet tempSet = new TreeSet(comparator);
+ tempSet.add("US-ASCII");
+ tempSet.add("ISO-8859-1");
+ tempSet.add("UTF-8");
+ tempSet.add("UTF-16BE");
+ tempSet.add("UTF-16LE");
+ tempSet.add("UTF-16");
+ tempSet.add(getDefaultTextCharset());
+ return Collections.unmodifiableSortedSet(tempSet);
+ }
+ }
/**
* Tracks whether a particular text/* MIME type supports the charset
@@ -509,18 +524,7 @@ public abstract class DataTransferer {
* non-standard, character sets are not included.
*/
public static Iterator standardEncodings() {
- if (standardEncodings == null) {
- TreeSet tempSet = new TreeSet(defaultCharsetComparator);
- tempSet.add("US-ASCII");
- tempSet.add("ISO-8859-1");
- tempSet.add("UTF-8");
- tempSet.add("UTF-16BE");
- tempSet.add("UTF-16LE");
- tempSet.add("UTF-16");
- tempSet.add(getDefaultTextCharset());
- standardEncodings = Collections.unmodifiableSortedSet(tempSet);
- }
- return standardEncodings.iterator();
+ return StandardEncodingsHolder.standardEncodings.iterator();
}
/**
@@ -2398,7 +2402,9 @@ search:
public static DataFlavor[] setToSortedDataFlavorArray(Set flavorsSet) {
DataFlavor[] flavors = new DataFlavor[flavorsSet.size()];
flavorsSet.toArray(flavors);
- Arrays.sort(flavors, defaultFlavorComparator);
+ final Comparator comparator =
+ new DataFlavorComparator(IndexedComparator.SELECT_WORST);
+ Arrays.sort(flavors, comparator);
return flavors;
}
@@ -2455,11 +2461,6 @@ search:
return new ArrayList();
}
- private static CharsetComparator defaultCharsetComparator =
- new CharsetComparator(IndexedComparator.SELECT_WORST);
- private static DataFlavorComparator defaultFlavorComparator =
- new DataFlavorComparator(IndexedComparator.SELECT_WORST);
-
/**
* A Comparator which includes a helper function for comparing two Objects
* which are likely to be keys in the specified Map.
diff --git a/src/share/classes/sun/java2d/pisces/Stroker.java b/src/share/classes/sun/java2d/pisces/Stroker.java
index dc270c194c87cc6153996682335c661a0f51f4ac..6d4a4c75ac54d34a7627b2e9257e6e142edbb45f 100644
--- a/src/share/classes/sun/java2d/pisces/Stroker.java
+++ b/src/share/classes/sun/java2d/pisces/Stroker.java
@@ -27,6 +27,8 @@ package sun.java2d.pisces;
import java.util.Arrays;
import java.util.Iterator;
+import static java.lang.Math.ulp;
+import static java.lang.Math.sqrt;
import sun.awt.geom.PathConsumer2D;
@@ -130,7 +132,7 @@ final class Stroker implements PathConsumer2D {
private static void computeOffset(final float lx, final float ly,
final float w, final float[] m)
{
- final float len = (float)Math.sqrt(lx*lx + ly*ly);
+ final float len = (float) sqrt(lx*lx + ly*ly);
if (len == 0) {
m[0] = m[1] = 0;
} else {
@@ -217,7 +219,7 @@ final class Stroker implements PathConsumer2D {
// this normal's length is at least 0.5 and at most sqrt(2)/2 (because
// we know the angle of the arc is > 90 degrees).
float nx = my - omy, ny = omx - mx;
- float nlen = (float)Math.sqrt(nx*nx + ny*ny);
+ float nlen = (float) sqrt(nx*nx + ny*ny);
float scale = lineWidth2/nlen;
float mmx = nx * scale, mmy = ny * scale;
@@ -246,8 +248,8 @@ final class Stroker implements PathConsumer2D {
// define the bezier curve we're computing.
// It is computed using the constraints that P1-P0 and P3-P2 are parallel
// to the arc tangents at the endpoints, and that |P1-P0|=|P3-P2|.
- float cv = (float)((4.0 / 3.0) * Math.sqrt(0.5-cosext2) /
- (1.0 + Math.sqrt(cosext2+0.5)));
+ float cv = (float) ((4.0 / 3.0) * sqrt(0.5-cosext2) /
+ (1.0 + sqrt(cosext2+0.5)));
// if clockwise, we need to negate cv.
if (rev) { // rev is equivalent to isCW(omx, omy, mx, my)
cv = -cv;
@@ -284,28 +286,20 @@ final class Stroker implements PathConsumer2D {
false);
}
- // Return the intersection point of the lines (x0, y0) -> (x1, y1)
- // and (x0p, y0p) -> (x1p, y1p) in m[0] and m[1]
- private void computeMiter(final float x0, final float y0,
- final float x1, final float y1,
- final float x0p, final float y0p,
- final float x1p, final float y1p,
- final float[] m, int off)
+ // Put the intersection point of the lines (x0, y0) -> (x1, y1)
+ // and (x0p, y0p) -> (x1p, y1p) in m[off] and m[off+1].
+ // If the lines are parallel, it will put a non finite number in m.
+ private void computeIntersection(final float x0, final float y0,
+ final float x1, final float y1,
+ final float x0p, final float y0p,
+ final float x1p, final float y1p,
+ final float[] m, int off)
{
float x10 = x1 - x0;
float y10 = y1 - y0;
float x10p = x1p - x0p;
float y10p = y1p - y0p;
- // if this is 0, the lines are parallel. If they go in the
- // same direction, there is no intersection so m[off] and
- // m[off+1] will contain infinity, so no miter will be drawn.
- // If they go in the same direction that means that the start of the
- // current segment and the end of the previous segment have the same
- // tangent, in which case this method won't even be involved in
- // miter drawing because it won't be called by drawMiter (because
- // (mx == omx && my == omy) will be true, and drawMiter will return
- // immediately).
float den = x10*y10p - x10p*y10;
float t = x10p*(y0-y0p) - y10p*(x0-x0p);
t /= den;
@@ -321,7 +315,8 @@ final class Stroker implements PathConsumer2D {
{
if ((mx == omx && my == omy) ||
(pdx == 0 && pdy == 0) ||
- (dx == 0 && dy == 0)) {
+ (dx == 0 && dy == 0))
+ {
return;
}
@@ -332,12 +327,17 @@ final class Stroker implements PathConsumer2D {
my = -my;
}
- computeMiter((x0 - pdx) + omx, (y0 - pdy) + omy, x0 + omx, y0 + omy,
- (dx + x0) + mx, (dy + y0) + my, x0 + mx, y0 + my,
- miter, 0);
+ computeIntersection((x0 - pdx) + omx, (y0 - pdy) + omy, x0 + omx, y0 + omy,
+ (dx + x0) + mx, (dy + y0) + my, x0 + mx, y0 + my,
+ miter, 0);
float lenSq = (miter[0]-x0)*(miter[0]-x0) + (miter[1]-y0)*(miter[1]-y0);
+ // If the lines are parallel, lenSq will be either NaN or +inf
+ // (actually, I'm not sure if the latter is possible. The important
+ // thing is that -inf is not possible, because lenSq is a square).
+ // For both of those values, the comparison below will fail and
+ // no miter will be drawn, which is correct.
if (lenSq < miterLimitSq) {
emitLineTo(miter[0], miter[1], rev);
}
@@ -566,8 +566,8 @@ final class Stroker implements PathConsumer2D {
// if p1 == p2 && p3 == p4: draw line from p1->p4, unless p1 == p4,
// in which case ignore if p1 == p2
- final boolean p1eqp2 = within(x1,y1,x2,y2, 6 * Math.ulp(y2));
- final boolean p3eqp4 = within(x3,y3,x4,y4, 6 * Math.ulp(y4));
+ final boolean p1eqp2 = within(x1,y1,x2,y2, 6 * ulp(y2));
+ final boolean p3eqp4 = within(x3,y3,x4,y4, 6 * ulp(y4));
if (p1eqp2 && p3eqp4) {
getLineOffsets(x1, y1, x4, y4, leftOff, rightOff);
return 4;
@@ -583,7 +583,7 @@ final class Stroker implements PathConsumer2D {
float dotsq = (dx1 * dx4 + dy1 * dy4);
dotsq = dotsq * dotsq;
float l1sq = dx1 * dx1 + dy1 * dy1, l4sq = dx4 * dx4 + dy4 * dy4;
- if (Helpers.within(dotsq, l1sq * l4sq, 4 * Math.ulp(dotsq))) {
+ if (Helpers.within(dotsq, l1sq * l4sq, 4 * ulp(dotsq))) {
getLineOffsets(x1, y1, x4, y4, leftOff, rightOff);
return 4;
}
@@ -693,8 +693,6 @@ final class Stroker implements PathConsumer2D {
return 8;
}
- // compute offset curves using bezier spline through t=0.5 (i.e.
- // ComputedCurve(0.5) == IdealParallelCurve(0.5))
// return the kind of curve in the right and left arrays.
private int computeOffsetQuad(float[] pts, final int off,
float[] leftOff, float[] rightOff)
@@ -703,58 +701,69 @@ final class Stroker implements PathConsumer2D {
final float x2 = pts[off + 2], y2 = pts[off + 3];
final float x3 = pts[off + 4], y3 = pts[off + 5];
- float dx3 = x3 - x2;
- float dy3 = y3 - y2;
- float dx1 = x2 - x1;
- float dy1 = y2 - y1;
+ final float dx3 = x3 - x2;
+ final float dy3 = y3 - y2;
+ final float dx1 = x2 - x1;
+ final float dy1 = y2 - y1;
- // if p1=p2 or p3=p4 it means that the derivative at the endpoint
- // vanishes, which creates problems with computeOffset. Usually
- // this happens when this stroker object is trying to winden
- // a curve with a cusp. What happens is that curveTo splits
- // the input curve at the cusp, and passes it to this function.
- // because of inaccuracies in the splitting, we consider points
- // equal if they're very close to each other.
-
- // if p1 == p2 && p3 == p4: draw line from p1->p4, unless p1 == p4,
- // in which case ignore.
- final boolean p1eqp2 = within(x1,y1,x2,y2, 6 * Math.ulp(y2));
- final boolean p2eqp3 = within(x2,y2,x3,y3, 6 * Math.ulp(y3));
- if (p1eqp2 || p2eqp3) {
- getLineOffsets(x1, y1, x3, y3, leftOff, rightOff);
- return 4;
- }
-
- // if p2-p1 and p4-p3 are parallel, that must mean this curve is a line
- float dotsq = (dx1 * dx3 + dy1 * dy3);
- dotsq = dotsq * dotsq;
- float l1sq = dx1 * dx1 + dy1 * dy1, l3sq = dx3 * dx3 + dy3 * dy3;
- if (Helpers.within(dotsq, l1sq * l3sq, 4 * Math.ulp(dotsq))) {
- getLineOffsets(x1, y1, x3, y3, leftOff, rightOff);
- return 4;
- }
-
- // this computes the offsets at t=0, 0.5, 1, using the property that
- // for any bezier curve the vectors p2-p1 and p4-p3 are parallel to
- // the (dx/dt, dy/dt) vectors at the endpoints.
+ // this computes the offsets at t = 0, 1
computeOffset(dx1, dy1, lineWidth2, offset[0]);
computeOffset(dx3, dy3, lineWidth2, offset[1]);
- float x1p = x1 + offset[0][0]; // start
- float y1p = y1 + offset[0][1]; // point
- float x3p = x3 + offset[1][0]; // end
- float y3p = y3 + offset[1][1]; // point
- computeMiter(x1p, y1p, x1p+dx1, y1p+dy1, x3p, y3p, x3p-dx3, y3p-dy3, leftOff, 2);
- leftOff[0] = x1p; leftOff[1] = y1p;
- leftOff[4] = x3p; leftOff[5] = y3p;
- x1p = x1 - offset[0][0]; y1p = y1 - offset[0][1];
- x3p = x3 - offset[1][0]; y3p = y3 - offset[1][1];
- computeMiter(x1p, y1p, x1p+dx1, y1p+dy1, x3p, y3p, x3p-dx3, y3p-dy3, rightOff, 2);
- rightOff[0] = x1p; rightOff[1] = y1p;
- rightOff[4] = x3p; rightOff[5] = y3p;
+ leftOff[0] = x1 + offset[0][0]; leftOff[1] = y1 + offset[0][1];
+ leftOff[4] = x3 + offset[1][0]; leftOff[5] = y3 + offset[1][1];
+ rightOff[0] = x1 - offset[0][0]; rightOff[1] = y1 - offset[0][1];
+ rightOff[4] = x3 - offset[1][0]; rightOff[5] = y3 - offset[1][1];
+
+ float x1p = leftOff[0]; // start
+ float y1p = leftOff[1]; // point
+ float x3p = leftOff[4]; // end
+ float y3p = leftOff[5]; // point
+
+ // Corner cases:
+ // 1. If the two control vectors are parallel, we'll end up with NaN's
+ // in leftOff (and rightOff in the body of the if below), so we'll
+ // do getLineOffsets, which is right.
+ // 2. If the first or second two points are equal, then (dx1,dy1)==(0,0)
+ // or (dx3,dy3)==(0,0), so (x1p, y1p)==(x1p+dx1, y1p+dy1)
+ // or (x3p, y3p)==(x3p-dx3, y3p-dy3), which means that
+ // computeIntersection will put NaN's in leftOff and right off, and
+ // we will do getLineOffsets, which is right.
+ computeIntersection(x1p, y1p, x1p+dx1, y1p+dy1, x3p, y3p, x3p-dx3, y3p-dy3, leftOff, 2);
+ float cx = leftOff[2];
+ float cy = leftOff[3];
+
+ if (!(isFinite(cx) && isFinite(cy))) {
+ // maybe the right path is not degenerate.
+ x1p = rightOff[0];
+ y1p = rightOff[1];
+ x3p = rightOff[4];
+ y3p = rightOff[5];
+ computeIntersection(x1p, y1p, x1p+dx1, y1p+dy1, x3p, y3p, x3p-dx3, y3p-dy3, rightOff, 2);
+ cx = rightOff[2];
+ cy = rightOff[3];
+ if (!(isFinite(cx) && isFinite(cy))) {
+ // both are degenerate. This curve is a line.
+ getLineOffsets(x1, y1, x3, y3, leftOff, rightOff);
+ return 4;
+ }
+ // {left,right}Off[0,1,4,5] are already set to the correct values.
+ leftOff[2] = 2*x2 - cx;
+ leftOff[3] = 2*y2 - cy;
+ return 6;
+ }
+
+ // rightOff[2,3] = (x2,y2) - ((left_x2, left_y2) - (x2, y2))
+ // == 2*(x2, y2) - (left_x2, left_y2)
+ rightOff[2] = 2*x2 - cx;
+ rightOff[3] = 2*y2 - cy;
return 6;
}
+ private static boolean isFinite(float x) {
+ return (Float.NEGATIVE_INFINITY < x && x < Float.POSITIVE_INFINITY);
+ }
+
// This is where the curve to be processed is put. We give it
// enough room to store 2 curves: one for the current subdivision, the
// other for the rest of the curve.
@@ -812,12 +821,12 @@ final class Stroker implements PathConsumer2D {
// if these vectors are too small, normalize them, to avoid future
// precision problems.
if (Math.abs(dxs) < 0.1f && Math.abs(dys) < 0.1f) {
- float len = (float)Math.sqrt(dxs*dxs + dys*dys);
+ float len = (float) sqrt(dxs*dxs + dys*dys);
dxs /= len;
dys /= len;
}
if (Math.abs(dxf) < 0.1f && Math.abs(dyf) < 0.1f) {
- float len = (float)Math.sqrt(dxf*dxf + dyf*dyf);
+ float len = (float) sqrt(dxf*dxf + dyf*dyf);
dxf /= len;
dyf /= len;
}
@@ -834,7 +843,6 @@ final class Stroker implements PathConsumer2D {
while(it.hasNext()) {
int curCurveOff = it.next();
- kind = 0;
switch (type) {
case 8:
kind = computeOffsetCubic(middle, curCurveOff, lp, rp);
@@ -843,24 +851,22 @@ final class Stroker implements PathConsumer2D {
kind = computeOffsetQuad(middle, curCurveOff, lp, rp);
break;
}
- if (kind != 0) {
- emitLineTo(lp[0], lp[1]);
- switch(kind) {
- case 8:
- emitCurveTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], lp[6], lp[7], false);
- emitCurveTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7], true);
- break;
- case 6:
- emitQuadTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], false);
- emitQuadTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], true);
- break;
- case 4:
- emitLineTo(lp[2], lp[3]);
- emitLineTo(rp[0], rp[1], true);
- break;
- }
- emitLineTo(rp[kind - 2], rp[kind - 1], true);
+ emitLineTo(lp[0], lp[1]);
+ switch(kind) {
+ case 8:
+ emitCurveTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], lp[6], lp[7], false);
+ emitCurveTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7], true);
+ break;
+ case 6:
+ emitQuadTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], false);
+ emitQuadTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], true);
+ break;
+ case 4:
+ emitLineTo(lp[2], lp[3]);
+ emitLineTo(rp[0], rp[1], true);
+ break;
}
+ emitLineTo(rp[kind - 2], rp[kind - 1], true);
}
this.cmx = (lp[kind - 2] - rp[kind - 2]) / 2;
@@ -887,7 +893,7 @@ final class Stroker implements PathConsumer2D {
// we rotate it so that the first vector in the control polygon is
// parallel to the x-axis. This will ensure that rotated quarter
// circles won't be subdivided.
- final float hypot = (float)Math.sqrt(x12 * x12 + y12 * y12);
+ final float hypot = (float) sqrt(x12 * x12 + y12 * y12);
final float cos = x12 / hypot;
final float sin = y12 / hypot;
final float x1 = cos * pts[0] + sin * pts[1];
@@ -976,12 +982,12 @@ final class Stroker implements PathConsumer2D {
// if these vectors are too small, normalize them, to avoid future
// precision problems.
if (Math.abs(dxs) < 0.1f && Math.abs(dys) < 0.1f) {
- float len = (float)Math.sqrt(dxs*dxs + dys*dys);
+ float len = (float) sqrt(dxs*dxs + dys*dys);
dxs /= len;
dys /= len;
}
if (Math.abs(dxf) < 0.1f && Math.abs(dyf) < 0.1f) {
- float len = (float)Math.sqrt(dxf*dxf + dyf*dyf);
+ float len = (float) sqrt(dxf*dxf + dyf*dyf);
dxf /= len;
dyf /= len;
}
@@ -999,20 +1005,18 @@ final class Stroker implements PathConsumer2D {
int curCurveOff = it.next();
kind = computeOffsetCubic(middle, curCurveOff, lp, rp);
- if (kind != 0) {
- emitLineTo(lp[0], lp[1]);
- switch(kind) {
- case 8:
- emitCurveTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], lp[6], lp[7], false);
- emitCurveTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7], true);
- break;
- case 4:
- emitLineTo(lp[2], lp[3]);
- emitLineTo(rp[0], rp[1], true);
- break;
- }
- emitLineTo(rp[kind - 2], rp[kind - 1], true);
+ emitLineTo(lp[0], lp[1]);
+ switch(kind) {
+ case 8:
+ emitCurveTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], lp[6], lp[7], false);
+ emitCurveTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7], true);
+ break;
+ case 4:
+ emitLineTo(lp[2], lp[3]);
+ emitLineTo(rp[0], rp[1], true);
+ break;
}
+ emitLineTo(rp[kind - 2], rp[kind - 1], true);
}
this.cmx = (lp[kind - 2] - rp[kind - 2]) / 2;
@@ -1050,12 +1054,12 @@ final class Stroker implements PathConsumer2D {
// if these vectors are too small, normalize them, to avoid future
// precision problems.
if (Math.abs(dxs) < 0.1f && Math.abs(dys) < 0.1f) {
- float len = (float)Math.sqrt(dxs*dxs + dys*dys);
+ float len = (float) sqrt(dxs*dxs + dys*dys);
dxs /= len;
dys /= len;
}
if (Math.abs(dxf) < 0.1f && Math.abs(dyf) < 0.1f) {
- float len = (float)Math.sqrt(dxf*dxf + dyf*dyf);
+ float len = (float) sqrt(dxf*dxf + dyf*dyf);
dxf /= len;
dyf /= len;
}
@@ -1073,20 +1077,18 @@ final class Stroker implements PathConsumer2D {
int curCurveOff = it.next();
kind = computeOffsetQuad(middle, curCurveOff, lp, rp);
- if (kind != 0) {
- emitLineTo(lp[0], lp[1]);
- switch(kind) {
- case 6:
- emitQuadTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], false);
- emitQuadTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], true);
- break;
- case 4:
- emitLineTo(lp[2], lp[3]);
- emitLineTo(rp[0], rp[1], true);
- break;
- }
- emitLineTo(rp[kind - 2], rp[kind - 1], true);
+ emitLineTo(lp[0], lp[1]);
+ switch(kind) {
+ case 6:
+ emitQuadTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], false);
+ emitQuadTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], true);
+ break;
+ case 4:
+ emitLineTo(lp[2], lp[3]);
+ emitLineTo(rp[0], rp[1], true);
+ break;
}
+ emitLineTo(rp[kind - 2], rp[kind - 1], true);
}
this.cmx = (lp[kind - 2] - rp[kind - 2]) / 2;
diff --git a/src/share/classes/sun/print/resources/serviceui_fr.properties b/src/share/classes/sun/print/resources/serviceui_fr.properties
index 7c64e8a413893d6498bffefe9bf4309048c04b45..a74d5677454b8eb8546fab456595b1a1a5d7eff1 100644
--- a/src/share/classes/sun/print/resources/serviceui_fr.properties
+++ b/src/share/classes/sun/print/resources/serviceui_fr.properties
@@ -49,7 +49,7 @@ label.source=Source :
label.source.mnemonic=C
label.status=Statut :
label.username=Nom utilisateur :
-label.username.mnemonic=U
+label.username.mnemonic=O
label.millimetres=(mm)
label.inches=(po)
label.topmargin=haut
@@ -62,7 +62,7 @@ label.rightmargin=droite
label.rightmargin.mnemonic=D
#
radiobutton.color=Couleur
-radiobutton.color.mnemonic=U
+radiobutton.color.mnemonic=C
radiobutton.draftq=Brouillon
radiobutton.draftq.mnemonic=L
radiobutton.duplex=Duplex
@@ -70,7 +70,7 @@ radiobutton.duplex.mnemonic=D
radiobutton.highq=Max.
radiobutton.highq.mnemonic=X
radiobutton.landscape=Paysage
-radiobutton.landscape.mnemonic=S
+radiobutton.landscape.mnemonic=Y
radiobutton.monochrome=Monochrome
radiobutton.monochrome.mnemonic=M
radiobutton.normalq=Normal
diff --git a/src/share/classes/sun/print/resources/serviceui_pt_BR.properties b/src/share/classes/sun/print/resources/serviceui_pt_BR.properties
index 7797a2a9c066138855384f28e6ca2fafc2565a84..d82178f3a4ecb88f58e51b5d4782512e3a3c9c62 100644
--- a/src/share/classes/sun/print/resources/serviceui_pt_BR.properties
+++ b/src/share/classes/sun/print/resources/serviceui_pt_BR.properties
@@ -15,10 +15,10 @@ button.cancel=Cancelar
button.ok=OK
button.print=Imprimir
button.properties=Propriedades...
-button.properties.mnemonic=R
+button.properties.mnemonic=D
#
checkbox.collate=Agrupar
-checkbox.collate.mnemonic=A
+checkbox.collate.mnemonic=R
checkbox.jobsheets=P\u00E1gina com Banner
checkbox.jobsheets.mnemonic=B
checkbox.printtofile=Imprimir em Arquivo
@@ -38,7 +38,7 @@ label.jobname.mnemonic=J
label.numcopies=N\u00FAmero de c\u00F3pias:
label.numcopies.mnemonic=O
label.priority=Prioridade:
-label.priority.mnemonic=R
+label.priority.mnemonic=P
label.psname=Nome:
label.psname.mnemonic=N
label.pstype=Tipo:
@@ -59,7 +59,7 @@ label.bottommargin.mnemonic=I
label.leftmargin=esquerda:
label.leftmargin.mnemonic=Q
label.rightmargin=direita
-label.rightmargin.mnemonic=R
+label.rightmargin.mnemonic=D
#
radiobutton.color=Cor
radiobutton.color.mnemonic=O
@@ -68,7 +68,7 @@ radiobutton.draftq.mnemonic=R
radiobutton.duplex=Duplex
radiobutton.duplex.mnemonic=D
radiobutton.highq=Alta
-radiobutton.highq.mnemonic=A
+radiobutton.highq.mnemonic=T
radiobutton.landscape=Paisagem
radiobutton.landscape.mnemonic=P
radiobutton.monochrome=Monocrom\u00E1tico
@@ -76,7 +76,7 @@ radiobutton.monochrome.mnemonic=M
radiobutton.normalq=Normal
radiobutton.normalq.mnemonic=N
radiobutton.oneside=Um Lado
-radiobutton.oneside.mnemonic=O
+radiobutton.oneside.mnemonic=L
radiobutton.portrait=Retrato
radiobutton.portrait.mnemonic=R
radiobutton.rangeall=Tudo
@@ -86,7 +86,7 @@ radiobutton.rangepages.mnemonic=P
radiobutton.revlandscape=Paisagem Invertida
radiobutton.revlandscape.mnemonic=N
radiobutton.revportrait=Retrato Invertido
-radiobutton.revportrait.mnemonic=I
+radiobutton.revportrait.mnemonic=E
radiobutton.tumble=Virar
radiobutton.tumble.mnemonic=V
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
@@ -96,7 +96,7 @@ tab.appearance.vkMnemonic=65
tab.general=Geral
tab.general.vkMnemonic=71
tab.pagesetup=Configura\u00E7\u00E3o de P\u00E1gina
-tab.pagesetup.vkMnemonic=80
+tab.pagesetup.vkMnemonic=67
#
error.pagerange=Faixa de p\u00E1ginas inv\u00E1lida; insira novamente os valores (por exemplo, 1-3,5,7-10)
error.destination=Nome de arquivo inv\u00E1lido; tente novamente
diff --git a/src/share/classes/sun/swing/FilePane.java b/src/share/classes/sun/swing/FilePane.java
index a5e7dffda321f16cf23bfc8e96aecb4ce30e37fd..5bf5c1f43b09d4b8d259db63f0dee879d7f6dbdb 100644
--- a/src/share/classes/sun/swing/FilePane.java
+++ b/src/share/classes/sun/swing/FilePane.java
@@ -763,7 +763,7 @@ public class FilePane extends JPanel implements PropertyChangeListener {
public void setValueAt(Object value, int row, int col) {
if (col == COLUMN_FILENAME) {
- JFileChooser chooser = getFileChooser();
+ final JFileChooser chooser = getFileChooser();
File f = (File)getValueAt(row, col);
if (f != null) {
String oldDisplayName = chooser.getName(f);
@@ -782,18 +782,25 @@ public class FilePane extends JPanel implements PropertyChangeListener {
// rename
FileSystemView fsv = chooser.getFileSystemView();
- File f2 = fsv.createFileObject(f.getParentFile(), newFileName);
+ final File f2 = fsv.createFileObject(f.getParentFile(), newFileName);
if (f2.exists()) {
JOptionPane.showMessageDialog(chooser, MessageFormat.format(renameErrorFileExistsText,
oldFileName), renameErrorTitleText, JOptionPane.ERROR_MESSAGE);
} else {
if (FilePane.this.getModel().renameFile(f, f2)) {
if (fsv.isParent(chooser.getCurrentDirectory(), f2)) {
- if (chooser.isMultiSelectionEnabled()) {
- chooser.setSelectedFiles(new File[]{f2});
- } else {
- chooser.setSelectedFile(f2);
- }
+ // The setSelectedFile method produces a new setValueAt invocation while the JTable
+ // is editing. Postpone file selection to be sure that edit mode of the JTable
+ // is completed
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ if (chooser.isMultiSelectionEnabled()) {
+ chooser.setSelectedFiles(new File[]{f2});
+ } else {
+ chooser.setSelectedFile(f2);
+ }
+ }
+ });
} else {
// Could be because of delay in updating Desktop folder
// chooser.setSelectedFile(null);
diff --git a/src/share/classes/sun/swing/WindowsPlacesBar.java b/src/share/classes/sun/swing/WindowsPlacesBar.java
index 9972b671d757f70f6a3af63ee6a275db45af2c71..a05259e5978c1b92fde30fbd6e68f8fd2cdafc2e 100644
--- a/src/share/classes/sun/swing/WindowsPlacesBar.java
+++ b/src/share/classes/sun/swing/WindowsPlacesBar.java
@@ -29,6 +29,8 @@ import java.awt.event.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import javax.swing.*;
import javax.swing.border.*;
@@ -79,7 +81,12 @@ public class WindowsPlacesBar extends JToolBar
setBackground(bgColor);
FileSystemView fsv = fc.getFileSystemView();
- files = (File[])ShellFolder.get("fileChooserShortcutPanelFolders");
+ files = AccessController.doPrivileged(new PrivilegedAction() {
+ public File[] run() {
+ return (File[]) ShellFolder.get("fileChooserShortcutPanelFolders");
+ }
+ });
+
buttons = new JToggleButton[files.length];
buttonGroup = new ButtonGroup();
for (int i = 0; i < files.length; i++) {
diff --git a/src/share/native/sun/awt/giflib/dgif_lib.c b/src/share/native/sun/awt/giflib/dgif_lib.c
index b566e7e1cc12afb5d74b3998283608cd40241a8a..742ae9c33358d789d161f7c8c85893b8e3184f90 100644
--- a/src/share/native/sun/awt/giflib/dgif_lib.c
+++ b/src/share/native/sun/awt/giflib/dgif_lib.c
@@ -70,7 +70,7 @@
/* avoid extra function call in case we use fread (TVT) */
#define READ(_gif,_buf,_len) \
(((GifFilePrivateType*)_gif->Private)->Read ? \
- ((GifFilePrivateType*)_gif->Private)->Read(_gif,_buf,_len) : \
+ (size_t)((GifFilePrivateType*)_gif->Private)->Read(_gif,_buf,_len) : \
fread(_buf,1,_len,((GifFilePrivateType*)_gif->Private)->File))
static int DGifGetWord(GifFileType *GifFile, int *Word);
diff --git a/src/share/native/sun/font/fontscalerdefs.h b/src/share/native/sun/font/fontscalerdefs.h
index 4e1bb99e9c3fd668cacad4c209095375d8b7bdcf..8f142752af9cd96fffd769a1accb5ae82e54c791 100644
--- a/src/share/native/sun/font/fontscalerdefs.h
+++ b/src/share/native/sun/font/fontscalerdefs.h
@@ -55,13 +55,15 @@ typedef Int32 hsFixed;
typedef Int32 hsFract;
typedef UInt32 Bool32;
+#ifndef __cplusplus
#ifndef false
- #define false 0
+ #define false 0
#endif
#ifndef true
#define true 1
#endif
+#endif
#define kPosInfinity32 (0x7fffffff)
#define kNegInfinity32 (0x80000000)
diff --git a/src/share/native/sun/font/layout/HangulLayoutEngine.cpp b/src/share/native/sun/font/layout/HangulLayoutEngine.cpp
index 806f2dc5813c75ba876b38e274fb9fab6f194a0d..adc30bd526d25ff20b01288adfd76aedb143970d 100644
--- a/src/share/native/sun/font/layout/HangulLayoutEngine.cpp
+++ b/src/share/native/sun/font/layout/HangulLayoutEngine.cpp
@@ -162,7 +162,7 @@ static le_int32 decompose(LEUnicode syllable, LEUnicode &lead, LEUnicode &vowel,
return 0;
}
- lead = LJMO_FIRST + (sIndex / HSYL_LVCNT);
+ lead = (LEUnicode)(LJMO_FIRST + (sIndex / HSYL_LVCNT));
vowel = VJMO_FIRST + (sIndex % HSYL_LVCNT) / TJMO_COUNT;
trail = TJMO_FIRST + (sIndex % TJMO_COUNT);
diff --git a/src/share/native/sun/font/layout/MPreFixups.cpp b/src/share/native/sun/font/layout/MPreFixups.cpp
index 673ea32ca16e2f153b9d00ffc814c990ae9d7f1e..254b3b01acee45da0e39d5b9422caa60d46101f0 100644
--- a/src/share/native/sun/font/layout/MPreFixups.cpp
+++ b/src/share/native/sun/font/layout/MPreFixups.cpp
@@ -65,9 +65,9 @@ void MPreFixups::add(le_int32 baseIndex, le_int32 mpreIndex)
}
}
-void MPreFixups::apply(LEGlyphStorage &glyphStorage, LEErrorCode& success)
+void MPreFixups::apply(LEGlyphStorage &glyphStorage, LEErrorCode& leSuccess)
{
- if (LE_FAILURE(success)) {
+ if (LE_FAILURE(leSuccess)) {
return;
}
diff --git a/src/solaris/classes/sun/awt/X11/XListPeer.java b/src/solaris/classes/sun/awt/X11/XListPeer.java
index c8799a1ad07845ad63ac2c37f4fe316466d219de..838899e49b8b57ff919bce60b4553dc6e90d4c3c 100644
--- a/src/solaris/classes/sun/awt/X11/XListPeer.java
+++ b/src/solaris/classes/sun/awt/X11/XListPeer.java
@@ -1479,16 +1479,19 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
int h = height - (SCROLLBAR_AREA + (2 * MARGIN));
hsb.setValue(hsb.getValue() + x);
+ int options = PAINT_ITEMS | PAINT_HSCROLL;
+
Rectangle source = null;
Point distance = null;
if (x < 0) {
source = new Rectangle(MARGIN + SPACE, MARGIN, w + x, h);
distance = new Point(-x, 0);
+ options |= COPY_AREA;
} else if (x > 0) {
source = new Rectangle(MARGIN + SPACE + x, MARGIN, w - x, h);
distance = new Point(-x, 0);
+ options |= COPY_AREA;
}
- int options = COPY_AREA | PAINT_ITEMS | PAINT_HSCROLL;
repaint(vsb.getValue(), lastItemDisplayed(), options, source, distance);
}
diff --git a/src/solaris/classes/sun/font/FcFontConfiguration.java b/src/solaris/classes/sun/font/FcFontConfiguration.java
index ce2c935ba71b27f2d45ba63a59a84489d28e256f..14d8e7ed2214af49ea83353059a73c8394d79c4f 100644
--- a/src/solaris/classes/sun/font/FcFontConfiguration.java
+++ b/src/solaris/classes/sun/font/FcFontConfiguration.java
@@ -256,9 +256,9 @@ public class FcFontConfiguration extends FontConfiguration {
}
if (installedFallbackFontFiles != null) {
- System.arraycopy(fileNames, index,
- installedFallbackFontFiles,
- 0, installedFallbackFontFiles.length);
+ System.arraycopy(installedFallbackFontFiles, 0,
+ fileNames, fcFonts.length,
+ installedFallbackFontFiles.length);
}
result[fontIndex * NUM_STYLES + styleIndex]
diff --git a/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c b/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c
index fb2ba3c5da36a940d8d7a7e741bdfac65b44cf85..0c5784bc4966f96ebc7dca2d0e7884394f8ba938 100644
--- a/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c
+++ b/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c
@@ -239,6 +239,13 @@ void DAUDIO_GetFormats(INT32 mixerIndex, INT32 deviceID, int isSource, void* cre
snd_pcm_close(handle);
}
+/** Workaround for cr 7033899, 7030629:
+ * dmix plugin doesn't like flush (snd_pcm_drop) when the buffer is empty
+ * (just opened, underruned or already flushed).
+ * Sometimes it causes PCM falls to -EBADFD error,
+ * sometimes causes bufferSize change.
+ * To prevent unnecessary flushes AlsaPcmInfo::isRunning & isFlushed are used.
+ */
/* ******* ALSA PCM INFO ******************** */
typedef struct tag_AlsaPcmInfo {
snd_pcm_t* handle;
@@ -248,6 +255,8 @@ typedef struct tag_AlsaPcmInfo {
int frameSize; // storage size in Bytes
unsigned int periods;
snd_pcm_uframes_t periodSize;
+ short int isRunning; // see comment above
+ short int isFlushed; // see comment above
#ifdef GET_POSITION_METHOD2
// to be used exclusively by getBytePosition!
snd_pcm_status_t* positionStatus;
@@ -432,6 +441,9 @@ void* DAUDIO_Open(INT32 mixerIndex, INT32 deviceID, int isSource,
return NULL;
}
memset(info, 0, sizeof(AlsaPcmInfo));
+ // initial values are: stopped, flushed
+ info->isRunning = 0;
+ info->isFlushed = 1;
ret = openPCMfromDeviceID(deviceID, &(info->handle), isSource, FALSE /* do open device*/);
if (ret == 0) {
@@ -587,6 +599,14 @@ int DAUDIO_Start(void* id, int isSource) {
|| (state == SND_PCM_STATE_RUNNING)
|| (state == SND_PCM_STATE_XRUN)
|| (state == SND_PCM_STATE_SUSPENDED);
+ if (ret) {
+ info->isRunning = 1;
+ // source line should keep isFlushed value until Write() is called;
+ // for target data line reset it right now.
+ if (!isSource) {
+ info->isFlushed = 0;
+ }
+ }
TRACE1("< DAUDIO_Start %s\n", ret?"success":"error");
return ret?TRUE:FALSE;
}
@@ -606,6 +626,7 @@ int DAUDIO_Stop(void* id, int isSource) {
ERROR1("ERROR in snd_pcm_pause: %s\n", snd_strerror(ret));
return FALSE;
}
+ info->isRunning = 0;
TRACE0("< DAUDIO_Stop success\n");
return TRUE;
}
@@ -651,8 +672,7 @@ int xrun_recovery(AlsaPcmInfo* info, int err) {
return -1;
}
return 1;
- }
- else if (err == -ESTRPIPE) {
+ } else if (err == -ESTRPIPE) {
TRACE0("xrun_recovery: suspended.\n");
ret = snd_pcm_resume(info->handle);
if (ret < 0) {
@@ -667,11 +687,11 @@ int xrun_recovery(AlsaPcmInfo* info, int err) {
return -1;
}
return 1;
- }
- else if (err == -EAGAIN) {
+ } else if (err == -EAGAIN) {
TRACE0("xrun_recovery: EAGAIN try again flag.\n");
return 0;
}
+
TRACE2("xrun_recovery: unexpected error %d: %s\n", err, snd_strerror(err));
return -1;
}
@@ -691,6 +711,7 @@ int DAUDIO_Write(void* id, char* data, int byteSize) {
TRACE0("< DAUDIO_Write returning -1\n");
return -1;
}
+
count = 2; // maximum number of trials to recover from underrun
//frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize);
frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize);
@@ -712,6 +733,12 @@ int DAUDIO_Write(void* id, char* data, int byteSize) {
}
} while (TRUE);
//ret = snd_pcm_frames_to_bytes(info->handle, writtenFrames);
+
+ if (writtenFrames > 0) {
+ // reset "flushed" flag
+ info->isFlushed = 0;
+ }
+
ret = (int) (writtenFrames * info->frameSize);
TRACE1("< DAUDIO_Write: returning %d bytes.\n", ret);
return ret;
@@ -736,6 +763,11 @@ int DAUDIO_Read(void* id, char* data, int byteSize) {
TRACE0("< DAUDIO_Read returning -1\n");
return -1;
}
+ if (!info->isRunning && info->isFlushed) {
+ // PCM has nothing to read
+ return 0;
+ }
+
count = 2; // maximum number of trials to recover from error
//frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize);
frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize);
@@ -784,12 +816,22 @@ int DAUDIO_Flush(void* id, int isSource) {
int ret;
TRACE0("DAUDIO_Flush\n");
+
+ if (info->isFlushed) {
+ // nothing to drop
+ return 1;
+ }
+
ret = snd_pcm_drop(info->handle);
if (ret != 0) {
ERROR1("ERROR in snd_pcm_drop: %s\n", snd_strerror(ret));
return FALSE;
}
- ret = DAUDIO_Start(id, isSource);
+
+ info->isFlushed = 1;
+ if (info->isRunning) {
+ ret = DAUDIO_Start(id, isSource);
+ }
return ret;
}
@@ -800,7 +842,7 @@ int DAUDIO_GetAvailable(void* id, int isSource) {
int ret;
state = snd_pcm_state(info->handle);
- if (state == SND_PCM_STATE_XRUN) {
+ if (info->isFlushed || state == SND_PCM_STATE_XRUN) {
// if in xrun state then we have the entire buffer available,
// not 0 as alsa reports
ret = info->bufferSizeInBytes;
@@ -841,7 +883,7 @@ INT64 DAUDIO_GetBytePosition(void* id, int isSource, INT64 javaBytePos) {
snd_pcm_state_t state;
state = snd_pcm_state(info->handle);
- if (state != SND_PCM_STATE_XRUN) {
+ if (!info->isFlushed && state != SND_PCM_STATE_XRUN) {
#ifdef GET_POSITION_METHOD2
snd_timestamp_t* ts;
snd_pcm_uframes_t framesAvail;
diff --git a/src/solaris/native/sun/awt/fontpath.c b/src/solaris/native/sun/awt/fontpath.c
index 68c352db16c61672b96aa45545b796865bc6f930..98d6f1419fc3e07060853ba2eb321df23f1106c1 100644
--- a/src/solaris/native/sun/awt/fontpath.c
+++ b/src/solaris/native/sun/awt/fontpath.c
@@ -1107,7 +1107,8 @@ Java_sun_font_FontConfigManager_getFontConfig
arrlen = (*env)->GetArrayLength(env, fcCompFontArray);
for (i=0; iNewString(env, lpelfe->elfFullName,
- wcslen((LPWSTR)lpelfe->elfFullName));
+ (jsize)wcslen((LPWSTR)lpelfe->elfFullName));
fullnameLC = (*env)->CallObjectMethod(env, fullname,
fmi->toLowerCaseMID, fmi->locale);
(*env)->CallBooleanMethod(env, fmi->list, fmi->addMID, fullname);
@@ -314,7 +314,7 @@ static int CALLBACK EnumFamilyNamesW(
GdiFontMapInfo *fmi = (GdiFontMapInfo*)lParam;
JNIEnv *env = fmi->env;
jstring familyLC;
- int slen;
+ size_t slen;
LOGFONTW lfw;
/* Both Vista and XP return DEVICE_FONTTYPE for OTF fonts */
@@ -336,7 +336,7 @@ static int CALLBACK EnumFamilyNamesW(
return 1;
}
slen = wcslen(lpelfe->elfLogFont.lfFaceName);
- fmi->family = (*env)->NewString(env,lpelfe->elfLogFont.lfFaceName, slen);
+ fmi->family = (*env)->NewString(env,lpelfe->elfLogFont.lfFaceName, (jsize)slen);
familyLC = (*env)->CallObjectMethod(env, fmi->family,
fmi->toLowerCaseMID, fmi->locale);
/* check if already seen this family with a different charset */
@@ -386,10 +386,10 @@ static int CALLBACK EnumFamilyNamesW(
static BOOL RegistryToBaseTTNameA(LPSTR name) {
static const char TTSUFFIX[] = " (TrueType)";
static const char OTSUFFIX[] = " (OpenType)";
- int TTSLEN = strlen(TTSUFFIX);
+ size_t TTSLEN = strlen(TTSUFFIX);
char *suffix;
- int len = strlen(name);
+ size_t len = strlen(name);
if (len == 0) {
return FALSE;
}
@@ -412,10 +412,10 @@ static BOOL RegistryToBaseTTNameA(LPSTR name) {
static BOOL RegistryToBaseTTNameW(LPWSTR name) {
static const wchar_t TTSUFFIX[] = L" (TrueType)";
static const wchar_t OTSUFFIX[] = L" (OpenType)";
- int TTSLEN = wcslen(TTSUFFIX);
+ size_t TTSLEN = wcslen(TTSUFFIX);
wchar_t *suffix;
- int len = wcslen(name);
+ size_t len = wcslen(name);
if (len == 0) {
return FALSE;
}
@@ -439,7 +439,7 @@ static void registerFontA(GdiFontMapInfo *fmi, jobject fontToFileMap,
LPSTR ptr1, ptr2;
jstring fontStr;
JNIEnv *env = fmi->env;
- int dslen = strlen(data);
+ size_t dslen = strlen(data);
jstring fileStr = JNU_NewStringPlatform(env, data);
/* TTC or ttc means it may be a collection. Need to parse out
@@ -488,8 +488,8 @@ static void registerFontW(GdiFontMapInfo *fmi, jobject fontToFileMap,
wchar_t *ptr1, *ptr2;
jstring fontStr;
JNIEnv *env = fmi->env;
- int dslen = wcslen(data);
- jstring fileStr = (*env)->NewString(env, data, dslen);
+ size_t dslen = wcslen(data);
+ jstring fileStr = (*env)->NewString(env, data, (jsize)dslen);
/* TTC or ttc means it may be a collection. Need to parse out
* multiple font face names separated by " & "
@@ -510,7 +510,7 @@ static void registerFontW(GdiFontMapInfo *fmi, jobject fontToFileMap,
while ((ptr2 = wcsstr(ptr1, L" & ")) != NULL) {
ptr1 = ptr2+3;
}
- fontStr = (*env)->NewString(env, ptr1, wcslen(ptr1));
+ fontStr = (*env)->NewString(env, ptr1, (jsize)wcslen(ptr1));
fontStr = (*env)->CallObjectMethod(env, fontStr,
fmi->toLowerCaseMID,
fmi->locale);
@@ -524,7 +524,7 @@ static void registerFontW(GdiFontMapInfo *fmi, jobject fontToFileMap,
}
}
} else {
- fontStr = (*env)->NewString(env, name, wcslen(name));
+ fontStr = (*env)->NewString(env, name, (jsize)wcslen(name));
fontStr = (*env)->CallObjectMethod(env, fontStr,
fmi->toLowerCaseMID, fmi->locale);
(*env)->CallObjectMethod(env, fontToFileMap, fmi->putMID,
diff --git a/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp b/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp
index a7da3f3b38c1d857447a0c0c83c6ba00496ff714..a563c78802b5af58678ec6b555ec1566a34d90f6 100644
--- a/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp
+++ b/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp
@@ -187,6 +187,7 @@ void D3DPipelineManager::NotifyAdapterEventListeners(UINT adapter,
}
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+ RETURN_IF_NULL(env);
pMgr = D3DPipelineManager::GetInstance();
RETURN_IF_NULL(pMgr);
diff --git a/src/windows/native/sun/security/mscapi/security.cpp b/src/windows/native/sun/security/mscapi/security.cpp
index 1a489d70ecae889b2cd862f621f49329a0ba78c1..49cbe81e418bddff9b89cdec4b8870d694cddc78 100644
--- a/src/windows/native/sun/security/mscapi/security.cpp
+++ b/src/windows/native/sun/security/mscapi/security.cpp
@@ -705,7 +705,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_mscapi_RSAKeyPairGenerator_generateR
HCRYPTPROV hCryptProv = NULL;
HCRYPTKEY hKeyPair;
DWORD dwFlags = (keySize << 16) | CRYPT_EXPORTABLE;
- jobject keypair;
+ jobject keypair = NULL;
const char* pszKeyContainerName = NULL; // UUID
__try
diff --git a/src/windows/native/sun/windows/ObjectList.cpp b/src/windows/native/sun/windows/ObjectList.cpp
index b0614e6b97f654396d6e4c940535d917785f58d9..601c42ce2e3664ce92d53d9884e466cda9f87f13 100644
--- a/src/windows/native/sun/windows/ObjectList.cpp
+++ b/src/windows/native/sun/windows/ObjectList.cpp
@@ -48,7 +48,7 @@ void AwtObjectList::Add(AwtObject* obj)
m_head = item;
}
-void AwtObjectList::Remove(AwtObject* obj)
+BOOL AwtObjectList::Remove(AwtObject* obj)
{
CriticalSection::Lock l(m_lock);
@@ -64,11 +64,14 @@ void AwtObjectList::Remove(AwtObject* obj)
}
DASSERT(item != NULL);
delete item;
- return;
+ return TRUE;
}
lastItem = item;
item = item->next;
}
+
+ return FALSE;
+
// DASSERT(FALSE); // should never get here...
// even if it does it shouldn't be fatal.
}
diff --git a/src/windows/native/sun/windows/ObjectList.h b/src/windows/native/sun/windows/ObjectList.h
index 9775d0c9f1e23e0d121da9b4a1cb15892c2b87a0..1e80732ca394b2b028edeb378f7f0c5882cef6b9 100644
--- a/src/windows/native/sun/windows/ObjectList.h
+++ b/src/windows/native/sun/windows/ObjectList.h
@@ -46,7 +46,7 @@ public:
AwtObjectList();
void Add(AwtObject* obj);
- void Remove(AwtObject* obj);
+ BOOL Remove(AwtObject* obj);
#ifdef DEBUG
/* Used for sanity checks only. */
AwtObject* LookUp(AwtObject* obj);
diff --git a/src/windows/native/sun/windows/awt_Clipboard.cpp b/src/windows/native/sun/windows/awt_Clipboard.cpp
index d978090b8b3838290f2b70b2c64a52dcdbd368f5..6cea4a715fb4cb10f45f6f3ca0910f1c1a496d7c 100644
--- a/src/windows/native/sun/windows/awt_Clipboard.cpp
+++ b/src/windows/native/sun/windows/awt_Clipboard.cpp
@@ -294,7 +294,7 @@ Java_sun_awt_windows_WClipboard_publishClipboardData(JNIEnv *env,
if (format == CF_HDROP) {
DROPFILES *dropfiles = (DROPFILES *)dataout;
dropfiles->pFiles = sizeof(DROPFILES);
- dropfiles->fWide = FALSE; // good guess!
+ dropfiles->fWide = TRUE; // we publish only Unicode
dataout += sizeof(DROPFILES);
}
diff --git a/src/windows/native/sun/windows/awt_Component.cpp b/src/windows/native/sun/windows/awt_Component.cpp
index fd75b8d52ee75fd5587764ee36e96cccf9e71676..024915fcffcf691044d3442edd6d57f8f302e9c1 100644
--- a/src/windows/native/sun/windows/awt_Component.cpp
+++ b/src/windows/native/sun/windows/awt_Component.cpp
@@ -549,8 +549,6 @@ AwtComponent::CreateHWnd(JNIEnv *env, LPCWSTR title,
m_hwnd = hwnd;
- ImmAssociateContext(NULL);
-
SetDrawState((jint)JAWT_LOCK_SURFACE_CHANGED |
(jint)JAWT_LOCK_BOUNDS_CHANGED |
(jint)JAWT_LOCK_CLIP_CHANGED);
@@ -1203,7 +1201,7 @@ void SpyWinMessage(HWND hwnd, UINT message, LPCTSTR szComment) {
WIN_MSG(WM_IME_COMPOSITIONFULL)
WIN_MSG(WM_IME_SELECT)
WIN_MSG(WM_IME_CHAR)
- FMT_MSG(0x0288, "WM_IME_REQUEST")
+ FMT_MSG(WM_IME_REQUEST)
WIN_MSG(WM_IME_KEYDOWN)
WIN_MSG(WM_IME_KEYUP)
FMT_MSG(0x02A1, "WM_MOUSEHOVER")
@@ -1733,7 +1731,7 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
case WM_IME_SELECT:
case WM_IME_KEYUP:
case WM_IME_KEYDOWN:
- case 0x0288: // WM_IME_REQUEST
+ case WM_IME_REQUEST:
CallProxyDefWindowProc(message, wParam, lParam, retValue, mr);
break;
case WM_CHAR:
@@ -1969,7 +1967,9 @@ MsgRouting AwtComponent::WmDestroy()
{
// fix for 6259348: we should enter the SyncCall critical section before
// disposing the native object, that is value 1 of lParam is intended for
- AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)this, (LPARAM)1);
+ if(m_peerObject != NULL) { // is not being terminating
+ AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)m_peerObject, (LPARAM)1);
+ }
return mrConsume;
}
@@ -2020,25 +2020,6 @@ MsgRouting AwtComponent::WmExitMenuLoop(BOOL isTrackPopupMenu)
MsgRouting AwtComponent::WmShowWindow(BOOL show, UINT status)
{
- // NULL-InputContext is associated to all window just after they created.
- // ( see CreateHWnd() )
- // But to TextField and TextArea on Win95, valid InputContext is associated
- // by system after that. This is not happen on NT4.0
- // For workaround, force context to NULL here.
-
- // Fix for 4730228
- // Check if we already have Java-associated input method
- HIMC context = 0;
- if (m_InputMethod != NULL) {
- // If so get the appropriate context from it and use it instead of empty context
- JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
- context = (HIMC)(UINT_PTR)(JNU_GetFieldByName(env, NULL, m_InputMethod, "context", "I").i);
- }
-
- if (ImmGetContext() != 0 && ImmGetContext() != context) {
- ImmAssociateContext(context);
- }
-
return mrDoDefault;
}
@@ -4655,10 +4636,6 @@ void* AwtComponent::SetNativeFocusOwner(void *self) {
ret:
if (c && ::IsWindow(c->GetHWnd())) {
sm_focusOwner = c->GetHWnd();
- AwtFrame *owner = (AwtFrame*)GetComponent(c->GetProxyToplevelContainer());
- if (owner) {
- owner->SetLastProxiedFocusOwner(sm_focusOwner);
- }
} else {
sm_focusOwner = NULL;
}
@@ -6534,8 +6511,7 @@ Java_sun_awt_windows_WComponentPeer__1dispose(JNIEnv *env, jobject self)
{
TRY_NO_HANG;
- PDATA pData = JNI_GET_PDATA(self);
- AwtObject::_Dispose(pData);
+ AwtObject::_Dispose(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/windows/native/sun/windows/awt_DnDDS.cpp b/src/windows/native/sun/windows/awt_DnDDS.cpp
index 1aea026c885a03fa64682f213251dda7a4a7218a..2d585e0330a05ba0fd16d23dd099df48e814264d 100644
--- a/src/windows/native/sun/windows/awt_DnDDS.cpp
+++ b/src/windows/native/sun/windows/awt_DnDDS.cpp
@@ -843,7 +843,7 @@ HRESULT __stdcall AwtDragSource::GetData(FORMATETC __RPC_FAR *pFormatEtc,
dropfiles->pt.x = m_dropPoint.x;
dropfiles->pt.y = m_dropPoint.y;
dropfiles->fNC = m_fNC;
- dropfiles->fWide = TRUE; // good guess!
+ dropfiles->fWide = TRUE; // we publish only Unicode
dataout += sizeof(DROPFILES);
}
diff --git a/src/windows/native/sun/windows/awt_Frame.cpp b/src/windows/native/sun/windows/awt_Frame.cpp
index 4d3374e573416e975252c2dddbdb020558cd3da3..6662d6d54c2f887fe92188b10ef58915418ca677 100644
--- a/src/windows/native/sun/windows/awt_Frame.cpp
+++ b/src/windows/native/sun/windows/awt_Frame.cpp
@@ -109,7 +109,7 @@ AwtFrame::AwtFrame() {
m_isMenuDropped = FALSE;
m_isInputMethodWindow = FALSE;
m_isUndecorated = FALSE;
- m_lastProxiedFocusOwner = NULL;
+ m_imeTargetComponent = NULL;
m_actualFocusedWindow = NULL;
m_iconic = FALSE;
m_zoomed = FALSE;
@@ -311,6 +311,8 @@ LRESULT AwtFrame::ProxyWindowProc(UINT message, WPARAM wParam, LPARAM lParam, Ms
LRESULT retValue = 0L;
AwtComponent *focusOwner = NULL;
+ AwtComponent *imeTargetComponent = NULL;
+
// IME and input language related messages need to be sent to a window
// which has the Java input focus
switch (message) {
@@ -323,15 +325,29 @@ LRESULT AwtFrame::ProxyWindowProc(UINT message, WPARAM wParam, LPARAM lParam, Ms
case WM_IME_COMPOSITIONFULL:
case WM_IME_SELECT:
case WM_IME_CHAR:
- case 0x0288: // WM_IME_REQUEST
+ case WM_IME_REQUEST:
case WM_IME_KEYDOWN:
case WM_IME_KEYUP:
case WM_INPUTLANGCHANGEREQUEST:
case WM_INPUTLANGCHANGE:
+ if (message == WM_IME_STARTCOMPOSITION) {
+ SetImeTargetComponent(sm_focusOwner);
+ }
+ imeTargetComponent = AwtComponent::GetComponent(GetImeTargetComponent());
+ if (imeTargetComponent != NULL &&
+ imeTargetComponent != this) // avoid recursive calls
+ {
+ retValue = imeTargetComponent->WindowProc(message, wParam, lParam);
+ mr = mrConsume;
+ }
+ if (message == WM_IME_ENDCOMPOSITION) {
+ SetImeTargetComponent(NULL);
+ }
+ break;
// TODO: when a Choice's list is dropped down and we're scrolling in
// the list WM_MOUSEWHEEL messages come to the poxy, not to the list. Why?
case WM_MOUSEWHEEL:
- focusOwner = AwtComponent::GetComponent(GetLastProxiedFocusOwner());
+ focusOwner = AwtComponent::GetComponent(sm_focusOwner);
if (focusOwner != NULL &&
focusOwner != this) // avoid recursive calls
{
@@ -340,12 +356,16 @@ LRESULT AwtFrame::ProxyWindowProc(UINT message, WPARAM wParam, LPARAM lParam, Ms
}
break;
case WM_SETFOCUS:
+ if (sm_inSynthesizeFocus) break; // pass it up the WindowProc chain
+
if (!sm_suppressFocusAndActivation && IsEmbeddedFrame()) {
AwtSetActiveWindow();
}
mr = mrConsume;
break;
case WM_KILLFOCUS:
+ if (sm_inSynthesizeFocus) break; // pass it up the WindowProc chain
+
if (!sm_suppressFocusAndActivation && IsEmbeddedFrame()) {
AwtWindow::SynthesizeWmActivate(FALSE, GetHWnd(), NULL);
diff --git a/src/windows/native/sun/windows/awt_Frame.h b/src/windows/native/sun/windows/awt_Frame.h
index 1adca139bf9abd39c21e0ebaa064d6ed15e40de8..f6d692b87eb359c9e1844a15751e3bb8b86d225b 100644
--- a/src/windows/native/sun/windows/awt_Frame.h
+++ b/src/windows/native/sun/windows/awt_Frame.h
@@ -150,8 +150,8 @@ public:
void CheckRetainActualFocusedWindow(HWND activatedOpositeHWnd);
BOOL CheckActivateActualFocusedWindow(HWND deactivatedOpositeHWnd);
- INLINE HWND GetLastProxiedFocusOwner() { return m_lastProxiedFocusOwner; }
- INLINE void SetLastProxiedFocusOwner(HWND hwnd) { m_lastProxiedFocusOwner = hwnd; }
+ INLINE HWND GetImeTargetComponent() { return m_imeTargetComponent; }
+ INLINE void SetImeTargetComponent(HWND hwnd) { m_imeTargetComponent = hwnd; }
protected:
/* The frame is undecorated. */
@@ -179,9 +179,8 @@ private:
/* The frame is an InputMethodWindow */
BOOL m_isInputMethodWindow;
- /* Retains the last/current sm_focusOwner proxied. Actually, it should be
- * a component of an owned window last/currently active. */
- HWND m_lastProxiedFocusOwner;
+ // retains the target component for the IME messages
+ HWND m_imeTargetComponent;
/*
* Fix for 4823903.
diff --git a/src/windows/native/sun/windows/awt_MenuItem.cpp b/src/windows/native/sun/windows/awt_MenuItem.cpp
index aeb1021262a4748310ced01ff8ec822a18513e68..97f3e2a7a21ddbc86a9372f4969348156688a038 100644
--- a/src/windows/native/sun/windows/awt_MenuItem.cpp
+++ b/src/windows/native/sun/windows/awt_MenuItem.cpp
@@ -974,8 +974,7 @@ Java_sun_awt_windows_WMenuItemPeer__1dispose(JNIEnv *env, jobject self)
{
TRY_NO_HANG;
- PDATA pData = JNI_GET_PDATA(self);
- AwtObject::_Dispose(pData);
+ AwtObject::_Dispose(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/windows/native/sun/windows/awt_Object.cpp b/src/windows/native/sun/windows/awt_Object.cpp
index b7afe1aa510658c9edd891c2934dfacab112cfda..54ec69a9a1960bb259493b357973991acdce7b82 100644
--- a/src/windows/native/sun/windows/awt_Object.cpp
+++ b/src/windows/native/sun/windows/awt_Object.cpp
@@ -60,11 +60,20 @@ AwtObject::~AwtObject()
void AwtObject::Dispose()
{
- theAwtObjectList.Remove(this);
+ AwtToolkit::GetInstance().PostMessage(WM_AWT_DELETEOBJECT, (WPARAM)this, (LPARAM)0);
+}
+
+void AwtObject::_Dispose(jobject self)
+{
+ TRY_NO_VERIFY;
+
+ CriticalSection::Lock l(AwtToolkit::GetInstance().GetSyncCS());
// value 0 of lParam means that we should not attempt to enter the
// SyncCall critical section, as it was entered someshere earlier
- AwtToolkit::GetInstance().PostMessage(WM_AWT_DELETEOBJECT, (WPARAM)this, (LPARAM)0);
+ AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)self, (LPARAM)0);
+
+ CATCH_BAD_ALLOC;
}
void AwtObject::_Dispose(PDATA pData)
@@ -73,14 +82,10 @@ void AwtObject::_Dispose(PDATA pData)
CriticalSection::Lock l(AwtToolkit::GetInstance().GetSyncCS());
- if (pData != NULL) {
- AwtObject *o = (AwtObject *)pData;
- AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)o, (LPARAM)0);
- }
+ AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSEPDATA, (WPARAM)pData, (LPARAM)0);
CATCH_BAD_ALLOC;
}
-
/*
* Return the peer associated with some target. This information is
* maintained in a hashtable at the java level.
diff --git a/src/windows/native/sun/windows/awt_Object.h b/src/windows/native/sun/windows/awt_Object.h
index 6cfb83ebcc550f7b4c2c991b72a53707d337ce8d..918e95d1c18e15ac5812ca0ac82ab68d14fd17a8 100644
--- a/src/windows/native/sun/windows/awt_Object.h
+++ b/src/windows/native/sun/windows/awt_Object.h
@@ -66,6 +66,10 @@ public:
// After this method has been called, this object must not be used in any way.
virtual void Dispose();
+ // Static method to be called from JNI methods to dispose AwtObject
+ // specified by jobject
+ static void _Dispose(jobject self);
+
// Static method to be called from JNI methods to dispose AwtObject
// specified by pData
static void _Dispose(PDATA pData);
diff --git a/src/windows/native/sun/windows/awt_Robot.cpp b/src/windows/native/sun/windows/awt_Robot.cpp
index cdee9cf600190e521e8cf872d3197fde4e520192..09e12debf3846fc94780d7b31088266703ff0b3a 100644
--- a/src/windows/native/sun/windows/awt_Robot.cpp
+++ b/src/windows/native/sun/windows/awt_Robot.cpp
@@ -353,8 +353,7 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WRobotPeer__1dispose(
{
TRY_NO_VERIFY;
- PDATA pData = JNI_GET_PDATA(self);
- AwtObject::_Dispose(pData);
+ AwtObject::_Dispose(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/windows/native/sun/windows/awt_TextComponent.cpp b/src/windows/native/sun/windows/awt_TextComponent.cpp
index c1fc17826b0ccd34630948e46623f6e9486416da..5e9a08f46ee0527552e9ffed5cd555ba4c48303c 100644
--- a/src/windows/native/sun/windows/awt_TextComponent.cpp
+++ b/src/windows/native/sun/windows/awt_TextComponent.cpp
@@ -191,8 +191,11 @@ void AwtTextComponent::SetCompositionWindow(RECT& rc)
{
HIMC hIMC = ImmGetContext();
// rc is not used for text component.
- COMPOSITIONFORM cf = { CFS_POINT, {0,0}, {0,0,0,0} };
+ COMPOSITIONFORM cf = { CFS_FORCE_POSITION, {0,0}, {0,0,0,0} };
GetCaretPos(&(cf.ptCurrentPos));
+ // the proxy is the native focus owner and it contains the composition window
+ // let's convert the position to a coordinate space relative to proxy
+ ::MapWindowPoints(GetHWnd(), GetProxyFocusOwner(), (LPPOINT)&cf.ptCurrentPos, 1);
ImmSetCompositionWindow(hIMC, &cf);
LOGFONT lf;
diff --git a/src/windows/native/sun/windows/awt_Toolkit.cpp b/src/windows/native/sun/windows/awt_Toolkit.cpp
index ca2bae8325a9c0d4878feb7aee5ccd1cceec6f6d..d010d6b130c9714c5670533ea0ffa9f2bd857415 100644
--- a/src/windows/native/sun/windows/awt_Toolkit.cpp
+++ b/src/windows/native/sun/windows/awt_Toolkit.cpp
@@ -740,18 +740,34 @@ LRESULT CALLBACK AwtToolkit::WndProc(HWND hWnd, UINT message,
canDispose = syncCS.TryEnter();
}
if (canDispose) {
- AwtObject *o = (AwtObject *)wParam;
- o->Dispose();
- if (shouldEnterCriticalSection) {
- syncCS.Leave();
+ if(wParam != NULL) {
+ AwtObject *o = (AwtObject *) JNI_GET_PDATA((jobject)wParam);
+ if(o != NULL && theAwtObjectList.Remove(o)) {
+ o->Dispose();
+ }
+ if (shouldEnterCriticalSection) {
+ syncCS.Leave();
+ }
}
} else {
AwtToolkit::GetInstance().PostMessage(WM_AWT_DISPOSE, wParam, lParam);
}
return 0;
}
+ case WM_AWT_DISPOSEPDATA: {
+ /*
+ * NOTE: synchronization routine (like in WM_AWT_DISPOSE) was omitted because
+ * this handler is called ONLY while disposing Cursor and Font objects where
+ * synchronization takes place.
+ */
+ AwtObject *o = (AwtObject *) wParam;
+ if(o != NULL && theAwtObjectList.Remove(o)) {
+ o->Dispose();
+ }
+ return 0;
+ }
case WM_AWT_DELETEOBJECT: {
- AwtObject *p = (AwtObject *)wParam;
+ AwtObject *p = (AwtObject *) wParam;
if (p->CanBeDeleted()) {
// all the messages for this component are processed, so
// it can be deleted
diff --git a/src/windows/native/sun/windows/awt_TrayIcon.cpp b/src/windows/native/sun/windows/awt_TrayIcon.cpp
index 4156c9cfec16b695bd9abe9c839a97174f726e2e..c2682b3b11364d675ffb1c02884a4d1733667dc8 100644
--- a/src/windows/native/sun/windows/awt_TrayIcon.cpp
+++ b/src/windows/native/sun/windows/awt_TrayIcon.cpp
@@ -926,8 +926,7 @@ Java_sun_awt_windows_WTrayIconPeer__1dispose(JNIEnv *env, jobject self)
{
TRY;
- PDATA pData = JNI_GET_PDATA(self);
- AwtObject::_Dispose(pData);
+ AwtObject::_Dispose(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/windows/native/sun/windows/awtmsg.h b/src/windows/native/sun/windows/awtmsg.h
index 898471b4923e8ae1613b8c859c954c7536987f39..05733c7a6f0efe9a934c8c91606905c11e55ffa6 100644
--- a/src/windows/native/sun/windows/awtmsg.h
+++ b/src/windows/native/sun/windows/awtmsg.h
@@ -219,6 +219,7 @@ enum {
WM_AWT_ENDCOMPOSITION,
WM_AWT_DISPOSE,
+ WM_AWT_DISPOSEPDATA,
WM_AWT_DELETEOBJECT,
WM_AWT_SETCONVERSIONSTATUS,
WM_AWT_GETCONVERSIONSTATUS,
diff --git a/test/java/awt/Component/Revalidate/Revalidate.java b/test/java/awt/Component/Revalidate/Revalidate.java
new file mode 100644
index 0000000000000000000000000000000000000000..670c374f87d4d151c30041c9cecff0ce16ec5c6a
--- /dev/null
+++ b/test/java/awt/Component/Revalidate/Revalidate.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2011, 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 7036669
+ @summary Test Component.revalidate() method
+ @author anthony.petrov@oracle.com: area=awt.component
+ @run main Revalidate
+*/
+
+import java.awt.*;
+
+public class Revalidate {
+ private static Frame frame = new Frame();
+ private static Panel panel = new Panel() {
+ @Override
+ public boolean isValidateRoot() {
+ return true;
+ }
+ };
+ private static Button button = new Button("Test");
+
+ private static void sleep() {
+ try { Thread.sleep(500); } catch (Exception e) {}
+ }
+
+ private static void printState(String str) {
+ System.out.println(str + " isValid state: ");
+ System.out.println(" frame: " + frame.isValid());
+ System.out.println(" panel: " + panel.isValid());
+ System.out.println(" button: " + button.isValid());
+ }
+
+ private static void fail(String msg) {
+ frame.dispose();
+ throw new RuntimeException(msg);
+ }
+
+ private static void check(String n, Component c, boolean v) {
+ if (c.isValid() != v) {
+ fail(n + ".isValid() = " + c.isValid() + "; expected: " + v);
+ }
+ }
+ private static void check(String str, boolean f, boolean p, boolean b) {
+ printState(str);
+
+ check("frame", frame, f);
+ check("panel", panel, p);
+ check("button", button, b);
+ }
+
+ public static void main(String[] args) {
+ // setup
+ frame.add(panel);
+ panel.add(button);
+ frame.setBounds(200, 200, 300, 200);
+ frame.setVisible(true);
+ sleep();
+ check("Upon showing", true, true, true);
+
+ button.setBounds(1, 1, 30, 30);
+ sleep();
+ check("button.setBounds():", true, false, false);
+
+ button.revalidate();
+ sleep();
+ check("button.revalidate():", true, true, true);
+
+ button.setBounds(1, 1, 30, 30);
+ sleep();
+ check("button.setBounds():", true, false, false);
+
+ panel.revalidate();
+ sleep();
+ // because the panel's validate root is actually OK
+ check("panel.revalidate():", true, false, false);
+
+ button.revalidate();
+ sleep();
+ check("button.revalidate():", true, true, true);
+
+ panel.setBounds(2, 2, 125, 130);
+ sleep();
+ check("panel.setBounds():", false, false, true);
+
+ button.revalidate();
+ sleep();
+ check("button.revalidate():", false, true, true);
+
+ panel.setBounds(3, 3, 152, 121);
+ sleep();
+ check("panel.setBounds():", false, false, true);
+
+ panel.revalidate();
+ sleep();
+ check("panel.revalidate():", true, true, true);
+
+ // cleanup
+ frame.dispose();
+ }
+}
diff --git a/test/java/awt/Graphics2D/MTGraphicsAccessTest/MTGraphicsAccessTest.java b/test/java/awt/Graphics2D/MTGraphicsAccessTest/MTGraphicsAccessTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..569af1f3aaf7a955417a7b19380064bb8ce054f1
--- /dev/null
+++ b/test/java/awt/Graphics2D/MTGraphicsAccessTest/MTGraphicsAccessTest.java
@@ -0,0 +1,361 @@
+/*
+ * Copyright (c) 2010, 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 5089429 6982632
+ @summary Checks that we don't crash if rendering operations and state
+ changes are performed on a graphics context from different threads.
+
+ @author Dmitri.Trembovetski@sun.com area=Graphics
+ @run main MTGraphicsAccessTest
+ */
+
+import java.awt.*;
+import java.awt.image.*;
+import java.awt.geom.*;
+
+public class MTGraphicsAccessTest {
+
+ // in seconds
+ static final long STANDALONE_RUN_TIME = 20;
+ static final long JTREG_RUN_TIME = 7;
+
+ static boolean standaloneMode;
+ static boolean allowExceptions = true;
+ static long testRunTime;
+
+ volatile boolean done;
+ volatile int stillRunning;
+ volatile int numexceptions;
+
+ Graphics2D sharedGraphics;
+ BufferedImage sharedBI =
+ new BufferedImage(50, 50, BufferedImage.TYPE_INT_RGB);
+
+ static final Paint colors[] = {
+ Color.red,
+ new Color(0x7f, 0xff, 0x00, 0x7f),
+ new GradientPaint(0, 0, Color.red,
+ 50, 50, new Color(0x7f, 0xff, 0x00, 0x7f)),
+ };
+ static final Font fonts[] = {
+ new Font("Dialog", Font.PLAIN, 12),
+ new Font("Dialog", Font.BOLD, 16),
+ new Font("Dialog", Font.ITALIC, 18),
+ };
+ static final AlphaComposite comps[] = {
+ AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1.0f),
+ AlphaComposite.Src,
+ AlphaComposite.Xor,
+ AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f),
+ null,
+ };
+ static final Stroke strokes[] = {
+ new BasicStroke(),
+ new BasicStroke(0.0f),
+ new BasicStroke(2.0f),
+ new BasicStroke(2.0f, BasicStroke.CAP_ROUND,
+ BasicStroke.JOIN_BEVEL),
+ new BasicStroke(5.0f, BasicStroke.CAP_SQUARE,
+ BasicStroke.JOIN_ROUND),
+ new BasicStroke(0.0f, BasicStroke.CAP_ROUND,
+ BasicStroke.JOIN_ROUND, 0,
+ new float[]{0,6,0,6}, 0),
+ };
+ static final AffineTransform transforms[] = {
+ new AffineTransform(),
+ AffineTransform.getRotateInstance(10.0),
+ AffineTransform.getShearInstance(10.0, 4.0),
+ AffineTransform.getScaleInstance(1.1, 1.2),
+ AffineTransform.getScaleInstance(3.0, 2.0),
+ };
+
+ public MTGraphicsAccessTest() {
+ BufferedImage bi =
+ new BufferedImage(50, 50, BufferedImage.TYPE_INT_RGB);
+ sharedGraphics = (Graphics2D)bi.getGraphics();
+
+ done = false;
+ numexceptions = 0;
+
+ for (int i = 0; i < (standaloneMode ? stateChangers.length : 3); i++) {
+ (new TesterThread(stateChangers[i])).start();
+ }
+ for (int i = 0; i < (standaloneMode ? renderTests.length : 5); i++) {
+ (new TesterThread(renderTests[i])).start();
+ }
+
+ mysleep(testRunTime);
+ done = true;
+ while (stillRunning > 0) { mysleep(500); }
+
+ if (numexceptions == 0) {
+ System.err.println("Test passed");
+ } else if (!allowExceptions) {
+ throw new RuntimeException("Test failed with "+
+ numexceptions+" exceptions");
+ } else {
+ System.err.println("Test finished with "+
+ numexceptions+" exceptions");
+ }
+ }
+
+ private void mysleep(long time) {
+ try {
+ // add +/-5ms variance to increase randomness
+ Thread.sleep(time + (long)(5 - Math.random()*10));
+ } catch (InterruptedException e) {};
+ }
+
+ public static void usage(String message) {
+ if (message != null) {
+ System.err.println(message);
+ }
+ System.err.println("Usage: MTGraphicsAccessTest [-full] "+
+ "[-time N/forever] [-help]");
+ System.err.println(" -full: run full suite of tests "+
+ "(default: limited number of tests is run)");
+ System.err.println(" -time N: test duration in seconds/forever"+
+ " (default: "+JTREG_RUN_TIME+"s for the short suite, "+
+ STANDALONE_RUN_TIME+"s for the full suite)");
+ System.err.println(" -help: print this help page");
+ System.exit(1);
+ }
+
+ public static void main(String[] args) {
+ boolean testRunSet = false;
+ for (int i = 0; i < args.length; i++) {
+ if ("-full".equals(args[i])) {
+ standaloneMode = true;
+ System.err.println("Running complete list of tests");
+ } else if ("-noexc".equals(args[i])) {
+ allowExceptions = false;
+ } else if ("-time".equals(args[i])) {
+ try {
+ String time = args[++i];
+ if ("forever".equals(time)) {
+ testRunTime = (Long.MAX_VALUE - 20)/1000;
+ } else {
+ testRunTime = 1000*Integer.parseInt(time);
+ }
+ testRunSet = true;
+ } catch (NumberFormatException e) {
+ usage("Can't parse number of seconds: " + args[i]);
+ } catch (ArrayIndexOutOfBoundsException e1) {
+ usage("Missing the 'seconds' argument for -time parameter");
+ }
+ } else if ("-help".equals(args[i])) {
+ usage(null);
+ } else {
+ usage("Unknown argument:" + args[i]);
+ }
+ }
+
+ if (!testRunSet) {
+ testRunTime = 1000 *
+ (standaloneMode ? STANDALONE_RUN_TIME : JTREG_RUN_TIME);
+ }
+
+ System.err.println("Approximate test run time: "+
+ testRunTime/1000+" seconds");
+
+ new MTGraphicsAccessTest();
+ }
+
+ class TesterThread extends Thread {
+ Runnable testRunnable;
+
+ public TesterThread(Runnable testRunnable) {
+ stillRunning++;
+ this.testRunnable = testRunnable;
+ }
+
+ public void run() {
+ try {
+ while (!done) {
+ try {
+ testRunnable.run();
+ yield();
+ } catch (Throwable t) {
+ numexceptions++;
+ t.printStackTrace();
+ }
+ }
+ } finally {
+ stillRunning--;
+ }
+ }
+ }
+
+ final Runnable stateChangers[] = {
+ new Runnable() {
+ public void run() {
+ sharedGraphics.setClip(10, 10, 30, 30);
+ mysleep(10);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.setClip(10, 10, 30, 30);
+ mysleep(10);
+ }
+ },
+ new Runnable() {
+ int c = 0;
+ public void run() {
+ sharedGraphics.setPaint(colors[c++ % colors.length]);
+ mysleep(10);
+ }
+ },
+ new Runnable() {
+ boolean AA = false;
+ public void run() {
+ if (AA) {
+ sharedGraphics.setRenderingHint(
+ RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+ } else {
+ sharedGraphics.setRenderingHint(
+ RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_OFF);
+ }
+ AA = !AA;
+ mysleep(10);
+ }
+ },
+ new Runnable() {
+ int t = 0;
+ public void run() {
+ sharedGraphics.setTransform(
+ transforms[t++ % transforms.length]);
+ mysleep(10);
+ }
+ },
+ new Runnable() {
+ int c = 0;
+ public void run() {
+ AlphaComposite comp = comps[c++ % comps.length];
+ if (comp == null) {
+ sharedGraphics.setXORMode(Color.green);
+ } else {
+ sharedGraphics.setComposite(comp);
+ }
+ mysleep(10);
+ }
+ },
+ new Runnable() {
+ int s = 0;
+ public void run() {
+ sharedGraphics.setStroke(strokes[s++ % strokes.length]);
+ mysleep(10);
+ }
+ },
+ new Runnable() {
+ int f = 0;
+ public void run() {
+ sharedGraphics.setFont(fonts[f++ % fonts.length]);
+ mysleep(10);
+ }
+ },
+ };
+
+ final Runnable renderTests[] = {
+ new Runnable() {
+ public void run() {
+ sharedGraphics.drawLine(10, 10, 30, 30);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.drawLine(10, 10, 30, 30);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.drawRect(10, 10, 30, 30);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.fillRect(10, 10, 30, 30);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.drawString("Stuff", 10, 10);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.draw3DRect(10, 10, 30, 30, true);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.drawImage(sharedBI, 10, 10, null);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.fill3DRect(10, 10, 30, 30, false);
+ }
+ },
+ // REMIND: copyArea doesn't work when transform is set..
+ // new Runnable() {
+ // public void run() {
+ // sharedGraphics.copyArea(10, 10, 30, 30, 20, 20);
+ // }
+ // },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.drawRoundRect(10, 10, 30, 30, 20, 20);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.fillRoundRect(10, 10, 30, 30, 20, 20);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.drawArc(10, 10, 30, 30, 0, 90);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.fillArc(10, 10, 30, 30, 0, 90);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.drawOval(10, 10, 30, 30);
+ }
+ },
+ new Runnable() {
+ public void run() {
+ sharedGraphics.fillOval(10, 10, 30, 30);
+ }
+ }
+ };
+}
diff --git a/test/java/awt/List/ScrollOutside/ScrollOut.java b/test/java/awt/List/ScrollOutside/ScrollOut.java
new file mode 100644
index 0000000000000000000000000000000000000000..21b8f848229215c47c7bd2fa00b92974ad5aa4f4
--- /dev/null
+++ b/test/java/awt/List/ScrollOutside/ScrollOut.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2011 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 7036733
+ @summary Regression : NullPointerException when scrolling horizontally on AWT List
+ @author Andrei Dmitriev area=awt-list
+ @library ../../regtesthelpers
+ @build Util
+ @run main ScrollOut
+*/
+
+import java.awt.*;
+import java.awt.event.*;
+import sun.awt.SunToolkit;
+import test.java.awt.regtesthelpers.Util;
+
+public class ScrollOut
+{
+ public static final void main(String args[])
+ {
+ final Frame frame = new Frame();
+ final List list = new List();
+ Robot robot = null;
+
+ for (int i = 0; i < 5; i++){
+ list.add("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
+ }
+
+ frame.add(list);
+
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+
+ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+ try{
+ robot = new Robot();
+ }catch(AWTException e){
+ throw new RuntimeException(e);
+ }
+
+ //Drag from center to the outside on left
+ Point from = new Point(list.getLocationOnScreen().x + list.getWidth()/2,
+ list.getLocationOnScreen().y + list.getHeight()/2);
+ Point to = new Point(list.getLocationOnScreen().x - 30,
+ from.y);
+
+ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+ Util.drag(robot, from, to, InputEvent.BUTTON1_MASK);
+
+ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+ //Drag from center to the outside on up
+ to = new Point(from.x,
+ list.getLocationOnScreen().y - 50);
+
+ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+ Util.drag(robot, from, to, InputEvent.BUTTON1_MASK);
+
+ }//End init()
+}
diff --git a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java
index 6ec02ffbf45ae71e71f7678f4a8224fc849ebd88..e5533b4189137f125cac1c997dccd5c1c610e566 100644
--- a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java
+++ b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2011 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
@@ -50,6 +50,11 @@ import test.java.awt.regtesthelpers.Sysout;
public class InfiniteRecursion {
final static Robot robot = Util.createRobot();
final static int MOVE_COUNT = 5;
+
+ //*2 for both rotation directions,
+ //*2 as Java sends the wheel event to every for nested component in hierarchy under cursor
+ final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2;
+
static int actualEvents = 0;
public static void main(String []s)
@@ -96,8 +101,10 @@ public class InfiniteRecursion {
Util.waitForIdle(robot);
- if (actualEvents != MOVE_COUNT * 2) {
- AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents);
+ //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents
+ //result in a single wheel rotation.
+ if (actualEvents != EXPECTED_COUNT) {
+ AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents);
}
}
}
diff --git a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java
index 3ed18f0e4a2b2ac259496291eea748780fd97429..733af38731d1c2c37cac5cf288dba10e3e5fc4fa 100644
--- a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java
+++ b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2011 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
@@ -50,6 +50,9 @@ import test.java.awt.regtesthelpers.Sysout;
public class InfiniteRecursion_1 {
final static Robot robot = Util.createRobot();
final static int MOVE_COUNT = 5;
+ //*2 for both rotation directions,
+ //*2 as Java sends the wheel event to every for nested component in hierarchy under cursor
+ final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2;
static int actualEvents = 0;
public static void main(String []s)
@@ -95,8 +98,10 @@ public class InfiniteRecursion_1 {
}
Util.waitForIdle(robot);
- if (actualEvents != MOVE_COUNT * 2) {
- AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents);
+ //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents
+ //result in a single wheel rotation.
+ if (actualEvents != EXPECTED_COUNT) {
+ AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents);
}
}
}
diff --git a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java
index 4aecedeb83382c98623c3ed4a402267a281f414a..944440886710dbfde1db9008b9aada157b1ed33f 100644
--- a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java
+++ b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2011 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
@@ -56,6 +56,9 @@ import java.applet.Applet;
public class InfiniteRecursion_2 extends Applet {
final static Robot robot = Util.createRobot();
final static int MOVE_COUNT = 5;
+ //*2 for both rotation directions,
+ //*2 as Java sends the wheel event to every for nested component in hierarchy under cursor
+ final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2;
static int actualEvents = 0;
public void init()
@@ -107,8 +110,10 @@ public class InfiniteRecursion_2 extends Applet {
}
Util.waitForIdle(robot);
- if (actualEvents != MOVE_COUNT * 2) {
- AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents);
+ //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents
+ //result in a single wheel rotation.
+ if (actualEvents != EXPECTED_COUNT) {
+ AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents);
}
}// start()
}
diff --git a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
index 2804b14ce7ed63de306bc80932e96e7032f709fc..c12636acdc57bc4280f2111681b438048196f9b4 100644
--- a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
+++ b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2011 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
@@ -50,6 +50,9 @@ import java.applet.Applet;
public class InfiniteRecursion_3 extends Applet {
final static Robot robot = Util.createRobot();
final static int MOVE_COUNT = 5;
+ //*2 for both rotation directions,
+ //*2 as Java sends the wheel event to every for nested component in hierarchy under cursor
+ final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2;
static int actualEvents = 0;
public void init()
@@ -91,8 +94,10 @@ public class InfiniteRecursion_3 extends Applet {
}
Util.waitForIdle(robot);
- if (actualEvents != MOVE_COUNT * 2) {
- AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents);
+ //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents
+ //result in a single wheel rotation.
+ if (actualEvents != EXPECTED_COUNT) {
+ AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents);
}
}// start()
}
diff --git a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java
index 600e0fa5af30f5f1fcfc4b92b395911e78636304..2fbb3d2e2b0c500475b34980736708891288c66a 100644
--- a/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java
+++ b/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2011 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
@@ -47,6 +47,8 @@ import test.java.awt.regtesthelpers.Sysout;
public class InfiniteRecursion_4 {
final static Robot robot = Util.createRobot();
final static int MOVE_COUNT = 5;
+ //*2 for both rotation directions over a single frame without any siblings
+ final static int EXPECTED_COUNT = MOVE_COUNT * 2;
static int actualEvents = 0;
public static void main(String []s)
@@ -80,8 +82,10 @@ public class InfiniteRecursion_4 {
}
Util.waitForIdle(robot);
- if (actualEvents != MOVE_COUNT * 2) {
- AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents);
+ //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents
+ //result in a single wheel rotation.
+ if (actualEvents != EXPECTED_COUNT) {
+ AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents);
}
}
}
diff --git a/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java b/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java
new file mode 100644
index 0000000000000000000000000000000000000000..d4acc95ef2b39f8067c358278973110ecc0c3d23
--- /dev/null
+++ b/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2011, 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 6799551
+ @library ../../regtesthelpers
+ @build Util Sysout
+ @summary Extended key codes for small letters undefined
+ @author Andrei Dmitriev: area=awt.keyboard
+ @run main EqualKeyCode
+*/
+
+
+import sun.awt.*;
+import java.awt.*;
+import test.java.awt.regtesthelpers.Util;
+import test.java.awt.regtesthelpers.Sysout;
+
+public class EqualKeyCode {
+
+ final static String LETTERS = "abcdefghijklmnopqrstuvwxyz";
+
+ public static void main(String []s) {
+ for (int i = 0; i < LETTERS.length(); i++){
+ char cSmall = LETTERS.charAt(i);
+ char cLarge = Character.toUpperCase(cSmall);
+
+ int iSmall = ExtendedKeyCodes.getExtendedKeyCodeForChar(cSmall);
+ int iLarge = ExtendedKeyCodes.getExtendedKeyCodeForChar(cLarge);
+
+ System.out.print(" " + cSmall + ":" + iSmall + " ---- ");
+ System.out.println(" " + cLarge + " : " + iLarge);
+ if (ExtendedKeyCodes.getExtendedKeyCodeForChar(cSmall) !=
+ ExtendedKeyCodes.getExtendedKeyCodeForChar(cLarge))
+ {
+ throw new RuntimeException("ExtendedKeyCode doesn't exist or doesn't match between capital and small letters.");
+ }
+ }
+ }
+}
diff --git a/test/javax/swing/JFileChooser/7036025/bug7036025.java b/test/javax/swing/JFileChooser/7036025/bug7036025.java
new file mode 100644
index 0000000000000000000000000000000000000000..dd7b003a01f9c59c59137787d668f9f59025a439
--- /dev/null
+++ b/test/javax/swing/JFileChooser/7036025/bug7036025.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2011, 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 7036025
+ @summary java.security.AccessControlException when creating JFileChooser in signed applet
+ @author Pavel Porvatov
+ @run main/othervm/policy=security.policy bug7036025
+*/
+
+import javax.swing.*;
+import java.io.File;
+
+public class bug7036025 {
+ public static final String DIR = "c:/temp";
+
+ public static void main(String[] args) throws Exception {
+ String systemLookAndFeelClassName = UIManager.getSystemLookAndFeelClassName();
+
+ if (!systemLookAndFeelClassName.toLowerCase().contains("windows")) {
+ System.out.println("The test is only for Windows OS.");
+
+ return;
+ }
+
+ File file = new File(DIR);
+
+ if (!file.exists()) {
+ if (!file.mkdir()) {
+ throw new RuntimeException("Cannot create " + DIR);
+ }
+
+ file.deleteOnExit();
+ }
+
+ UIManager.setLookAndFeel(systemLookAndFeelClassName);
+
+ new JFileChooser(file);
+
+ System.out.println("Test passed for LookAndFeel " + UIManager.getLookAndFeel().getName());
+ }
+}
diff --git a/test/javax/swing/JFileChooser/7036025/security.policy b/test/javax/swing/JFileChooser/7036025/security.policy
new file mode 100644
index 0000000000000000000000000000000000000000..57e0bd2af52160e07b3f99c351cc7b46a81b252f
--- /dev/null
+++ b/test/javax/swing/JFileChooser/7036025/security.policy
@@ -0,0 +1,5 @@
+grant {
+ permission java.io.FilePermission "C:\\temp\\*", "read";
+ permission java.io.FilePermission "C:\\temp", "read,write,delete";
+ permission java.util.PropertyPermission "*", "read";
+};
diff --git a/test/javax/swing/JLabel/6596966/bug6596966.java b/test/javax/swing/JLabel/6596966/bug6596966.java
index 5cf0110f70008f7289fc777f9152fcd8581a8ff5..5e94459bcb721dc845dca7ebe604eae9cdc9d080 100644
--- a/test/javax/swing/JLabel/6596966/bug6596966.java
+++ b/test/javax/swing/JLabel/6596966/bug6596966.java
@@ -24,13 +24,13 @@
/* @test
@bug 6596966
@summary Some JFileChooser mnemonics do not work with sticky keys
- * @library ../../regtesthelpers
- * @build Util
@run main bug6596966
@author Pavel Porvatov
*/
+import sun.awt.SunToolkit;
+
import javax.swing.*;
import java.awt.*;
import java.awt.event.KeyEvent;
@@ -44,6 +44,7 @@ public class bug6596966 {
public static void main(String[] args) throws Exception {
Robot robot = new Robot();
+ SunToolkit toolkit = (SunToolkit) SunToolkit.getDefaultToolkit();
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
@@ -68,17 +69,17 @@ public class bug6596966 {
}
});
- Util.blockTillDisplayed(frame);
+ toolkit.realSync();
robot.keyPress(KeyEvent.VK_ALT);
robot.keyPress(KeyEvent.VK_L);
- robot.waitForIdle();
+ toolkit.realSync();
- Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new KeyEvent(label, KeyEvent.KEY_RELEASED,
+ toolkit.getSystemEventQueue().postEvent(new KeyEvent(label, KeyEvent.KEY_RELEASED,
EventQueue.getMostRecentEventTime(), 0, KeyEvent.VK_L, 'L'));
- robot.waitForIdle();
+ toolkit.realSync();
try {
SwingUtilities.invokeAndWait(new Runnable() {
diff --git a/test/sun/java2d/pipe/Test7027667.java b/test/sun/java2d/pipe/Test7027667.java
index 08f478f60b132937fca5175bd87b99925606216b..e30c72c0504421020dd365a6510ea75630e29f66 100644
--- a/test/sun/java2d/pipe/Test7027667.java
+++ b/test/sun/java2d/pipe/Test7027667.java
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 7027667, 7023591
+ * @bug 7027667 7023591 7037091
*
* @summary Verifies that aa clipped rectangles are drawn, not filled.
*
diff --git a/test/sun/java2d/pisces/Test7036754.java b/test/sun/java2d/pisces/Test7036754.java
new file mode 100644
index 0000000000000000000000000000000000000000..1dd39ddc8b94a520c104b1cb4b3726eab9403c6a
--- /dev/null
+++ b/test/sun/java2d/pisces/Test7036754.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2011, 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 7036754
+ *
+ * @summary Verifies that there are no non-finite numbers when stroking
+ * certain quadratic curves.
+ *
+ * @author Jim Graham
+ * @run main Test7036754
+ */
+
+import java.awt.*;
+import java.awt.geom.*;
+
+public class Test7036754 {
+ public static void main(String argv[]) {
+ Shape s = new QuadCurve2D.Float(839.24677f, 508.97888f,
+ 839.2953f, 508.97122f,
+ 839.3438f, 508.96353f);
+ s = new BasicStroke(10f).createStrokedShape(s);
+ float nsegs[] = {2, 2, 4, 6, 0};
+ float coords[] = new float[6];
+ PathIterator pi = s.getPathIterator(null);
+ while (!pi.isDone()) {
+ int type = pi.currentSegment(coords);
+ for (int i = 0; i < nsegs[type]; i++) {
+ float c = coords[i];
+ if (Float.isNaN(c) || Float.isInfinite(c)) {
+ throw new RuntimeException("bad value in stroke");
+ }
+ }
+ pi.next();
+ }
+ }
+}