infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-14 20:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Phil Race 2014-02-21 10:03:49 -08:00
commit f00ad07a65
10 changed files with 395 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2014, 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
@ -583,7 +583,12 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
// setVisible could have changed the native maximized state
deliverZoom(true);
} else {
switch (((Frame)target).getExtendedState()) {
int frameState = ((Frame)target).getExtendedState();
if ((frameState & Frame.ICONIFIED) != 0) {
// Treat all state bit masks with ICONIFIED bit as ICONIFIED state.
frameState = Frame.ICONIFIED;
}
switch (frameState) {
case Frame.ICONIFIED:
CWrapper.NSWindow.miniaturize(nsWindowPtr);
break;
@ -784,6 +789,10 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
if (prevWindowState == windowState) return;
final long nsWindowPtr = getNSWindowPtr();
if ((windowState & Frame.ICONIFIED) != 0) {
// Treat all state bit masks with ICONIFIED bit as ICONIFIED state.
windowState = Frame.ICONIFIED;
}
switch (windowState) {
case Frame.ICONIFIED:
if (prevWindowState == Frame.MAXIMIZED_BOTH) {

52
jdk/src/share/classes/java/beans/Introspector.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2014, 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
@ -729,22 +729,38 @@ public class Introspector {
if (igpd != null && ispd != null) {
// Complete indexed properties set
// Merge any classic property descriptors
if (gpd != null) {
PropertyDescriptor tpd = mergePropertyDescriptor(igpd, gpd);
if (tpd instanceof IndexedPropertyDescriptor) {
igpd = (IndexedPropertyDescriptor)tpd;
}
}
if (spd != null) {
PropertyDescriptor tpd = mergePropertyDescriptor(ispd, spd);
if (tpd instanceof IndexedPropertyDescriptor) {
ispd = (IndexedPropertyDescriptor)tpd;
}
if ((gpd == spd) || (gpd == null)) {
pd = spd;
} else if (spd == null) {
pd = gpd;
} else if (spd instanceof IndexedPropertyDescriptor) {
pd = mergePropertyWithIndexedProperty(gpd, (IndexedPropertyDescriptor) spd);
} else if (gpd instanceof IndexedPropertyDescriptor) {
pd = mergePropertyWithIndexedProperty(spd, (IndexedPropertyDescriptor) gpd);
} else {
pd = mergePropertyDescriptor(gpd, spd);
}
if (igpd == ispd) {
pd = igpd;
ipd = igpd;
} else {
pd = mergePropertyDescriptor(igpd, ispd);
ipd = mergePropertyDescriptor(igpd, ispd);
}
if (pd == null) {
pd = ipd;
} else {
Class<?> propType = pd.getPropertyType();
Class<?> ipropType = ipd.getIndexedPropertyType();
if (propType.isArray() && propType.getComponentType() == ipropType) {
pd = pd.getClass0().isAssignableFrom(ipd.getClass0())
? new IndexedPropertyDescriptor(pd, ipd)
: new IndexedPropertyDescriptor(ipd, pd);
} else if (pd.getClass0().isAssignableFrom(ipd.getClass0())) {
pd = pd.getClass0().isAssignableFrom(ipd.getClass0())
? new PropertyDescriptor(pd, ipd)
: new PropertyDescriptor(ipd, pd);
} else {
pd = ipd;
}
}
} else if (gpd != null && spd != null) {
if (igpd != null) {
@ -848,6 +864,12 @@ public class Introspector {
} else {
result = new IndexedPropertyDescriptor(ipd, pd);
}
} else if ((ipd.getReadMethod() == null) && (ipd.getWriteMethod() == null)) {
if (pd.getClass0().isAssignableFrom(ipd.getClass0())) {
result = new PropertyDescriptor(pd, ipd);
} else {
result = new PropertyDescriptor(ipd, pd);
}
} else {
// Cannot merge the pd because of type mismatch
// Return the most specific pd
@ -899,7 +921,7 @@ public class Introspector {
}
// Handle regular ipd merge
private PropertyDescriptor mergePropertyDescriptor(IndexedPropertyDescriptor ipd1,
private IndexedPropertyDescriptor mergePropertyDescriptor(IndexedPropertyDescriptor ipd1,
IndexedPropertyDescriptor ipd2) {
if (ipd1.getClass0().isAssignableFrom(ipd2.getClass0())) {
return new IndexedPropertyDescriptor(ipd1, ipd2);

3
jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
View File

@ -109,8 +109,7 @@ public class BasicOptionPaneUI extends OptionPaneUI {
static {
newline = java.security.AccessController.doPrivileged(
new GetPropertyAction("line.separator"));
newline = System.lineSeparator();
if (newline == null) {
newline = "\n";
}

5
jdk/src/share/classes/javax/swing/text/AbstractWriter.java
View File

@ -141,10 +141,7 @@ public abstract class AbstractWriter {
setLineSeparator((String)docNewline);
}
else {
String newline = null;
try {
newline = System.getProperty("line.separator");
} catch (SecurityException se) {}
String newline = System.lineSeparator();
if (newline == null) {
// Should not get here, but if we do it means we could not
// find a newline string, use \n in this case.

4
jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java
View File

@ -317,9 +317,7 @@ public class DefaultEditorKit extends EditorKit {
int offs = pos;
Object endOfLineProperty = doc.getProperty(EndOfLineStringProperty);
if (endOfLineProperty == null) {
try {
endOfLineProperty = System.getProperty("line.separator");
} catch (SecurityException se) { }
endOfLineProperty = System.lineSeparator();
}
String endOfLine;
if (endOfLineProperty instanceof String) {

3
jdk/src/share/classes/sun/font/CompositeFont.java
View File

@ -447,8 +447,7 @@ public final class CompositeFont extends Font2D {
}
public String toString() {
String ls = java.security.AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("line.separator"));
String ls = System.lineSeparator();
String componentsStr = "";
for (int i=0; i<numSlots; i++) {
componentsStr += " Slot["+i+"]="+getSlotFont(i)+ls;

3
jdk/src/solaris/classes/sun/awt/X11/XAWTFormatter.java
View File

@ -43,8 +43,7 @@ public class XAWTFormatter extends java.util.logging.Formatter {
// Line separator string. This is the value of the line.separator
// property at the moment that the SimpleFormatter was created.
private String lineSeparator = java.security.AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("line.separator"));
private String lineSeparator = System.lineSeparator();
boolean displayFullRecord = false;
boolean useANSI = false;

103
jdk/test/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java Normal file
View File

@ -0,0 +1,103 @@
/*
* Copyright (c) 2014, 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 8032078
@summary Frame.setExtendedState throws RuntimeException, if
windowState=ICONIFIED|MAXIMIZED_BOTH, on OS X
@author Anton Litvinov
*/
import java.awt.*;
import sun.awt.SunToolkit;
public class ExceptionOnSetExtendedStateTest {
private static final int[] frameStates = { Frame.NORMAL, Frame.ICONIFIED, Frame.MAXIMIZED_BOTH };
private static final SunToolkit toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
private static boolean validatePlatform() {
String osName = System.getProperty("os.name");
if (osName == null) {
throw new RuntimeException("Name of the current OS could not be retrieved.");
}
return osName.startsWith("Mac");
}
private static void testStateChange(int oldState, int newState, boolean decoratedFrame) {
System.out.println(String.format(
"testStateChange: oldState='%d', newState='%d', decoratedFrame='%b'",
oldState, newState, decoratedFrame));
Frame frame = new Frame("ExceptionOnSetExtendedStateTest");
frame.setSize(200, 200);
frame.setUndecorated(!decoratedFrame);
frame.setVisible(true);
toolkit.realSync();
frame.setExtendedState(oldState);
sleep(1000);
frame.setExtendedState(newState);
boolean stateWasNotChanged = true;
int currentState = 0;
for (int i = 0; (i < 3) && stateWasNotChanged; i++) {
sleep(1000);
currentState = frame.getExtendedState();
if ((currentState == newState) ||
(((newState & Frame.ICONIFIED) != 0) && ((currentState & Frame.ICONIFIED) != 0))) {
stateWasNotChanged = false;
}
}
frame.dispose();
if (stateWasNotChanged) {
throw new RuntimeException(String.format(
"Frame state was not changed. currentState='%d'", currentState));
}
}
private static void sleep(int millis) {
try {
Thread.sleep(millis);
} catch (Exception e) {
e.printStackTrace();
}
}
public static void main(String[] args) {
if (!validatePlatform()) {
System.out.println("This test is only for OS X.");
return;
}
// Verify that changing states of decorated/undecorated frame to/from supported states
// and the state bit mask ICONIFIED | MAXIMIZED_BOTH does not raise RuntimeException.
for (int i = 0; i < frameStates.length; i++) {
testStateChange(frameStates[i], Frame.ICONIFIED | Frame.MAXIMIZED_BOTH, true);
testStateChange(frameStates[i], Frame.ICONIFIED | Frame.MAXIMIZED_BOTH, false);
testStateChange(Frame.ICONIFIED | Frame.MAXIMIZED_BOTH, frameStates[i], true);
testStateChange(Frame.ICONIFIED | Frame.MAXIMIZED_BOTH, frameStates[i], false);
}
}
}

9
jdk/test/java/beans/Introspector/Test4168833.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, 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
@ -23,10 +23,11 @@
/*
* @test
* @bug 4168833
* @bug 4168833 8034085
* @summary Tests that Introspector does not create IndexedPropertyDescriptor
* from non-indexed PropertyDescriptor
* @author Mark Davidson
* @author Sergey Malenkov
*/
import java.awt.Color;
@ -42,10 +43,6 @@ import java.beans.PropertyDescriptor;
*/
public class Test4168833 {
public static void main(String[] args) throws Exception {
IndexedPropertyDescriptor ipd = BeanUtils.getIndexedPropertyDescriptor(Base.class, "prop");
if (!ipd.getIndexedPropertyType().equals(Dimension.class)) {
error(ipd, "Base.prop property should a Dimension");
}
// When the Sub class is introspected,
// the property type should be color.
// The complete "classic" set of properties

236
jdk/test/java/beans/Introspector/Test8034085.java Normal file
View File

@ -0,0 +1,236 @@
/*
* Copyright (c) 2014, 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.
*/
import java.awt.Window;
import java.beans.IndexedPropertyDescriptor;
import java.beans.PropertyDescriptor;
/*
* @test
* @bug 8034085
* @summary Tests that Introspector ignores indexed getter and setter for incorrect types
* @author Sergey Malenkov
*/
public class Test8034085 {
public static final StringBuilder ERROR = new StringBuilder();
public static void main(String[] args) {
test(Window.class, false, true, false, false);
test(Bean0000.class, false, false, false, false);
test(Bean0001.class, false, false, false, true);
test(Bean0010.class, false, false, true, false);
test(Bean0011.class, false, false, true, true);
test(Bean0100.class, false, true, false, false);
test(Bean0101.class, false, true, false, false);
test(Bean0110.class, false, true, false, false);
test(Bean0111.class, false, true, false, false);
test(Bean1000.class, true, false, false, false);
test(Bean1001.class, true, false, false, false);
test(Bean1010.class, true, false, false, false);
test(Bean1011.class, true, false, false, false);
test(Bean1100.class, true, true, false, false);
test(Bean1101.class, true, true, false, false);
test(Bean1110.class, true, true, false, false);
test(Bean1111.class, true, true, false, false);
if (0 < ERROR.length()) {
throw new Error(ERROR.toString());
}
}
private static void test(Class<?> type, boolean read, boolean write, boolean readIndexed, boolean writeIndexed) {
PropertyDescriptor pd = BeanUtils.findPropertyDescriptor(type, "size");
if (pd != null) {
test(type, "read", read, null != pd.getReadMethod());
test(type, "write", write, null != pd.getWriteMethod());
if (pd instanceof IndexedPropertyDescriptor) {
IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
test(type, "indexed read", readIndexed, null != ipd.getIndexedReadMethod());
test(type, "indexed write", writeIndexed, null != ipd.getIndexedWriteMethod());
} else if (readIndexed || writeIndexed) {
error(type, "indexed property does not exist");
}
} else if (read || write || readIndexed || writeIndexed) {
error(type, "property does not exist");
}
}
private static void test(Class<?> type, String name, boolean expected, boolean actual) {
if (expected && !actual) {
error(type, name + " method does not exist");
} else if (!expected && actual) {
error(type, name + " method is not expected");
}
}
private static void error(Class<?> type, String message) {
ERROR.append("\n\t\t").append(type.getSimpleName()).append(".size: ").append(message);
}
public static class Bean0000 {
}
public static class Bean0001 {
public void setSize(int index, int value) {
}
}
public static class Bean0010 {
public int getSize(int index) {
return 0;
}
}
public static class Bean0011 {
public int getSize(int index) {
return 0;
}
public void setSize(int index, int value) {
}
}
public static class Bean0100 {
public void setSize(int value) {
}
}
public static class Bean0101 {
public void setSize(int value) {
}
public void setSize(int index, int value) {
}
}
public static class Bean0110 {
public void setSize(int value) {
}
public int getSize(int index) {
return 0;
}
}
public static class Bean0111 {
public void setSize(int value) {
}
public int getSize(int index) {
return 0;
}
public void setSize(int index, int value) {
}
}
public static class Bean1000 {
public int getSize() {
return 0;
}
}
public static class Bean1001 {
public int getSize() {
return 0;
}
public void setSize(int index, int value) {
}
}
public static class Bean1010 {
public int getSize() {
return 0;
}
public int getSize(int index) {
return 0;
}
}
public static class Bean1011 {
public int getSize() {
return 0;
}
public int getSize(int index) {
return 0;
}
public void setSize(int index, int value) {
}
}
public static class Bean1100 {
public int getSize() {
return 0;
}
public void setSize(int value) {
}
}
public static class Bean1101 {
public int getSize() {
return 0;
}
public void setSize(int value) {
}
public void setSize(int index, int value) {
}
}
public static class Bean1110 {
public int getSize() {
return 0;
}
public void setSize(int value) {
}
public int getSize(int index) {
return 0;
}
}
public static class Bean1111 {
public int getSize() {
return 0;
}
public void setSize(int value) {
}
public int getSize(int index) {
return 0;
}
public void setSize(int index, int value) {
}
}
}