--- a/jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java Wed Jun 11 17:23:56 2014 +0400
+++ b/jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java Thu Jun 05 13:59:01 2014 -0700
@@ -172,7 +172,7 @@
int max = getMaxConfigs(screen);
int defaultPixID = getDefaultPixID(screen);
- Vector v = new Vector( max );
+ Vector<GraphicsConfiguration> v = new Vector<>( max );
if (defaultPixID == 0) {
// Workaround for failing GDI calls
defaultConfig = Win32GraphicsConfig.getConfig(this,
@@ -437,7 +437,7 @@
protected native void configDisplayMode(int screen, WindowPeer w, int width,
int height, int bitDepth,
int refreshRate);
- protected native void enumDisplayModes(int screen, ArrayList modes);
+ protected native void enumDisplayModes(int screen, ArrayList<DisplayMode> modes);
@Override
public synchronized DisplayMode getDisplayMode() {
@@ -447,12 +447,12 @@
@Override
public synchronized DisplayMode[] getDisplayModes() {
- ArrayList modes = new ArrayList();
+ ArrayList<DisplayMode> modes = new ArrayList<>();
enumDisplayModes(screen, modes);
int listSize = modes.size();
DisplayMode[] retArray = new DisplayMode[listSize];
for (int i = 0; i < listSize; i++) {
- retArray[i] = (DisplayMode)modes.get(i);
+ retArray[i] = modes.get(i);
}
return retArray;
}